Parcourir la source

布局结构调整

loki.wu il y a 2 ans
Parent
commit
904ef2aab1

Fichier diff supprimé car celui-ci est trop grand
+ 226 - 428
assets/single_image.json


+ 18 - 35
lib/main.dart

@@ -1,11 +1,13 @@
 import 'dart:convert';
 
+import 'package:fis_lib_report/converts/event_type.dart';
 import 'package:fis_lib_report/converts/pt_to_px_converter.dart';
 import 'package:fis_lib_report/pages/block_element_page.dart';
 import 'package:fis_lib_report/pages/components/vid_image.dart';
 import 'package:fis_lib_report/report/interfaces/block_element.dart';
 import 'package:fis_lib_report/report/report_template_document.dart';
 import 'package:fis_lib_report/report/rt_thickness.dart';
+import 'package:fis_lib_report/report_edit.dart';
 import 'package:fis_lib_report/report_info/report_info.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -57,12 +59,19 @@ class _MyHomePageState extends State<MyHomePage> {
   List<IBlockElement> _footer = [];
   double _baseFontSize = 9.0;
   double _footerDistance = 34.0;
+  String _jsonStr = '';
   double _footerHeight = 0;
   EdgeInsetsGeometry _padding = EdgeInsets.all(PtToPxConverter.ptToPx(56.83));
+  late FEventHandler<String> onSelect;
 
   @override
   initState() {
-    _intitTemplate();
+    onSelect = FEventHandler<String>();
+    rootBundle.loadString('assets/default.json').then((jsonStr) {
+      setState(() {
+        _jsonStr = jsonStr;
+      });
+    });
     super.initState();
   }
 
@@ -75,41 +84,15 @@ class _MyHomePageState extends State<MyHomePage> {
       'http://192.168.6.117:9001/Flyinsono-BJ-1300984704.VCS.AP-BeiJing/compress%E4%B9%B3%E8%85%BAVideo.VID',
       'http://192.168.6.117:9001/Flyinsono-BJ-1300984704.VCS.AP-BeiJing/compress%E9%A2%88%E5%8A%A8%E8%84%89%E6%A8%AA%E5%88%87.VID'
     ];
-    Future.delayed(
-      const Duration(milliseconds: 300),
-      () {
-        final listHeight =
-            context.findRenderObject()!.semanticBounds.size.height;
-        ReportInfo.instance.currentHeight = listHeight;
-        ReportInfo.instance.heightChange(listHeight);
-      },
-    );
+
     return Scaffold(
       body: Row(
         children: [
-          Container(
-            decoration: _buildDecoration(),
-            padding: _padding,
-            alignment: Alignment.center,
-            height: _height,
-            width: _width,
-            child: ListView(
-              // mainAxisAlignment: MainAxisAlignment.center,
-              // crossAxisAlignment: CrossAxisAlignment.center,
-              // mainAxisSize: MainAxisSize.min,
-              children: [
-                ..._header.map((head) {
-                  return BlockElementPage(element: head);
-                }),
-                ..._blocks.map((block) {
-                  return BlockElementPage(element: block);
-                }),
-                const SizedBox(height: 10),
-                ..._footer.map((footer) {
-                  return BlockElementPage(element: footer);
-                }),
-              ],
-            ),
+          ReportEditPage(
+            reporter: 'Loki',
+            reportDate: '2022-06-20',
+            jsonStr: _jsonStr,
+            onSelect: onSelect,
           ),
           const SizedBox(width: 40),
           Container(
@@ -117,7 +100,7 @@ class _MyHomePageState extends State<MyHomePage> {
               padding: _padding,
               alignment: Alignment.center,
               height: _height,
-              width: _width,
+              width: _width - 50,
               child: Wrap(
                 children: [
                   ...demoImags.map((element) {
@@ -125,7 +108,7 @@ class _MyHomePageState extends State<MyHomePage> {
                       cursor: SystemMouseCursors.click,
                       child: GestureDetector(
                         onTap: () {
-                          ReportInfo.instance.getSelectedInputImage(element);
+                          onSelect.emit(this, element);
                         },
                         child: Container(
                           margin: const EdgeInsets.all(15),

+ 4 - 3
lib/pages/components/RDateTime.dart → lib/pages/components/datetime.dart

@@ -11,15 +11,15 @@ class RDateTime extends StatefulWidget {
   RDateTime(this.dateTimeElement);
   @override
   State<StatefulWidget> createState() {
-    return _RDateTimeState(dateTimeElement);
+    return _RDateTimeState();
   }
 }
 
 class _RDateTimeState extends State<RDateTime> {
-  final DateTimeElement dateTimeElement;
+  late final DateTimeElement dateTimeElement;
   DateTime selectedDate = DateTime.now();
 
-  _RDateTimeState(this.dateTimeElement);
+  _RDateTimeState();
 
   String _dateTime = '';
   double _fontSize = 15.0;
@@ -31,6 +31,7 @@ class _RDateTimeState extends State<RDateTime> {
 
   @override
   initState() {
+    dateTimeElement = widget.dateTimeElement;
     final currentDateTime = DateTime.now();
     final timestamp = currentDateTime.millisecondsSinceEpoch;
     _dateTime = currentDateTime.toString().substring(0, 10);

+ 4 - 3
lib/pages/components/input_image.dart

@@ -17,14 +17,14 @@ class RInputImage extends StatefulWidget {
   RInputImage(this.inputImage);
   @override
   State<StatefulWidget> createState() {
-    return _RInputImageState(inputImage);
+    return _RInputImageState();
   }
 }
 
 class _RInputImageState extends State<RInputImage> {
-  final InputImage inputImage;
+  late final InputImage inputImage;
   InputImageInfo? inputImageInfo;
-  _RInputImageState(this.inputImage);
+  _RInputImageState();
   Color _borderColor = Colors.grey;
   bool _isSelected = false;
   bool _hasImageBorder = false;
@@ -34,6 +34,7 @@ class _RInputImageState extends State<RInputImage> {
 
   @override
   initState() {
+    inputImage = widget.inputImage;
     _hasImageBorder = inputImage.hasImageBorder!;
 
     final element = ReportInfo.instance.getElementInfo(inputImage);

+ 10 - 3
lib/pages/components/input_imageList.dart

@@ -14,14 +14,13 @@ class RInputImageList extends StatefulWidget {
   RInputImageList(this.inputImageList);
   @override
   State<StatefulWidget> createState() {
-    return _RInputImageListState(inputImageList);
+    return _RInputImageListState();
   }
 }
 
 class _RInputImageListState extends State<RInputImageList> {
-  final InputImageList inputImageList;
+  late final InputImageList inputImageList;
   InputImageListInfo? inputImageListInfo;
-  _RInputImageListState(this.inputImageList);
   Color _borderColor = Colors.grey;
   bool _isSelected = false;
   bool _hasImageBorder = false;
@@ -32,6 +31,7 @@ class _RInputImageListState extends State<RInputImageList> {
 
   @override
   initState() {
+    inputImageList = widget.inputImageList;
     _hasImageBorder = inputImageList.hasImageBorder!;
     _height = PtToPxConverter.ptToPx(inputImageList.imageHeight) + 6;
     final element = ReportInfo.instance.getBlockElement(inputImageList);
@@ -118,6 +118,13 @@ class _RInputImageListState extends State<RInputImageList> {
         },
       );
     }
+
     return const Text('请点击此处后选择右侧图片');
   }
+
+  @override
+  void dispose() {
+    inputImageListInfo!.onSelect!.dispose();
+    super.dispose();
+  }
 }

+ 5 - 4
lib/pages/components/input_text.dart

@@ -14,13 +14,13 @@ class RInputText extends StatefulWidget {
 
   @override
   State<StatefulWidget> createState() {
-    return _RInputTextState(inputText: inputText);
+    return _RInputTextState();
   }
 }
 
 class _RInputTextState extends State<RInputText> {
-  _RInputTextState({required this.inputText});
-  final InputText inputText;
+  _RInputTextState();
+  late final InputText inputText;
   final _controller = TextEditingController();
   final _focusNode = FocusNode();
   double? _lineWidth = 136.0;
@@ -35,6 +35,7 @@ class _RInputTextState extends State<RInputText> {
 
   @override
   initState() {
+    inputText = widget.inputText;
     final inputTextInfo = ReportInfo.instance.getElementInfo(inputText);
     _inputTextInfo = inputTextInfo as InputTextInfo;
     if (inputText.isReadOnly!) {
@@ -74,7 +75,7 @@ class _RInputTextState extends State<RInputText> {
     );
     return Container(
       width: PtToPxConverter.ptToPx(_lineWidth!),
-      height: _textWrap! ? _height! * 4 : (_height! + 2),
+      height: _textWrap! ? _height! * 4 : (_height!),
       padding: EdgeInsets.only(top: _textWrap! ? 10 : 5, right: 5, left: 5),
       decoration: BoxDecoration(
         border: Border.all(

+ 5 - 3
lib/pages/components/line.dart

@@ -12,16 +12,18 @@ class RLine extends StatefulWidget {
 
   @override
   State<StatefulWidget> createState() {
-    return _LineState(line);
+    return _LineState();
   }
 }
 
 class _LineState extends State<RLine> {
-  final Line line;
-  _LineState(this.line);
+  late final Line line;
+  _LineState();
 
   @override
   initState() {
+    line = widget.line;
+
     ///TODO(Loki):设置虚线or实线
     final borderStyle = line.borderStyle;
 

+ 4 - 3
lib/pages/components/multi_selected.dart

@@ -17,13 +17,13 @@ class RMultiSelected extends StatefulWidget {
   RMultiSelected(this.multiSelected);
   @override
   State<StatefulWidget> createState() {
-    return _RRMultiSelectedState(multiSelected);
+    return _RRMultiSelectedState();
   }
 }
 
 class _RRMultiSelectedState extends State<RMultiSelected> {
-  MultiSelected multiSelected;
-  _RRMultiSelectedState(this.multiSelected);
+  late MultiSelected multiSelected;
+  _RRMultiSelectedState();
   final String _value = '';
   String? _selectedItemView = '';
   List<String>? _items = [];
@@ -34,6 +34,7 @@ class _RRMultiSelectedState extends State<RMultiSelected> {
   TextStyle _textStyle = TextStyle();
   @override
   initState() {
+    multiSelected = widget.multiSelected;
     final selectInfo = ReportInfo.instance.getElementInfo(multiSelected);
     if (selectInfo != null) {
       _mulitiSelectedInfo = selectInfo as MulitiSelectedInfo;

+ 4 - 3
lib/pages/components/single_select.dart

@@ -11,18 +11,19 @@ class RSingleSelected extends StatefulWidget {
   RSingleSelected(this.singleSelected);
   @override
   State<StatefulWidget> createState() {
-    return _RSingleSelectState(singleSelected);
+    return _RSingleSelectState();
   }
 }
 
 class _RSingleSelectState extends State<RSingleSelected> {
-  SingleSelected singleSelected;
-  _RSingleSelectState(this.singleSelected);
+  late SingleSelected singleSelected;
+  _RSingleSelectState();
   String _value = '';
   List<String>? _items = [];
   SingleSelectedInfo? _singleSelectedInfo;
   @override
   initState() {
+    singleSelected = widget.singleSelected;
     final selectInfo = ReportInfo.instance.getElementInfo(singleSelected);
     if (selectInfo != null) {
       _singleSelectedInfo = selectInfo as SingleSelectedInfo;

+ 6 - 5
lib/pages/components/static_text.dart

@@ -9,18 +9,18 @@ import 'package:flutter/material.dart';
 
 class RStaticText extends StatefulWidget {
   RStaticText(this.staticText);
-  final StaticText? staticText;
+  final StaticText staticText;
 
   @override
   State<StatefulWidget> createState() {
-    return _RStaticTextState(staticText!);
+    return _RStaticTextState();
   }
 }
 
 class _RStaticTextState extends State<RStaticText> {
-  final StaticText staticText;
+  late final StaticText staticText;
 
-  _RStaticTextState(this.staticText);
+  _RStaticTextState();
 
   double _fontSize = 15.0;
   TextStyle _style = const TextStyle();
@@ -29,6 +29,7 @@ class _RStaticTextState extends State<RStaticText> {
   EdgeInsets _margin = const EdgeInsets.all(0);
   @override
   initState() {
+    staticText = widget.staticText;
     _fontSize = staticText.fontSize ?? 15.0;
     //TODO(Loki):常规模板暂未设置fontStyles,后续再支持
     //final fontStyles = staticText.fontStyles;
@@ -65,7 +66,7 @@ class _RStaticTextState extends State<RStaticText> {
     return Container(
       margin: _margin,
       child: Text(
-        _syncText(text),
+        (text),
         style: _style,
       ),
     );

+ 1 - 1
lib/pages/paragraph_page.dart

@@ -1,5 +1,5 @@
 import 'package:fis_lib_report/converts/alignment_convert.dart';
-import 'package:fis_lib_report/pages/components/RDateTime.dart';
+import 'package:fis_lib_report/pages/components/datetime.dart';
 import 'package:fis_lib_report/pages/components/input_image.dart';
 import 'package:fis_lib_report/pages/components/input_imageList.dart';
 import 'package:fis_lib_report/pages/components/input_text.dart';

+ 3 - 3
lib/pages/rt_table.dart

@@ -65,9 +65,9 @@ class _RTTableState extends State<RTTablePage> {
             widget.element.rowDefinitions![cellPostion.row!].height ?? 0.0;
         if (cellPostion.rowSpan! > 1) {
           for (int i = 1; i < cellPostion.rowSpan!; i++) {
-            height +=
-                widget.element.rowDefinitions![cellPostion.row! + i].height ??
-                    0.0;
+            height += widget
+                    .element.rowDefinitions![cellPostion.row! + i - 1].height ??
+                0.0;
           }
         }
 

+ 4 - 2
lib/report/interfaces/grid.dart

@@ -18,8 +18,10 @@ class RTRowDefinition {
   RTRowDefinition.fromJson(Map<String, dynamic> json) {
     minHeight = json['MinHeight'];
     height = json['Height'];
-    type = WidthTypeEnum.values
-        .firstWhere((element) => element.name == json['Type']);
+    if (json['Type'] != null) {
+      type = WidthTypeEnum.values
+          .firstWhere((element) => element.name == json['Type']);
+    }
   }
 }
 

+ 17 - 16
lib/report/report_template_document.dart

@@ -142,15 +142,15 @@ class ReportTemplateDocument implements IReportTemplateDocument {
       baseFontSize = json['BaseFontSize'];
       invertColor = json['InvertColor'];
       version = json['Version'];
-      pagePadding = RTThickness.fromJson(json['PagePadding']);
-      pageSize = RTPageSize.fromJson(json['PageSize']);
+      pagePadding = RTThickness.fromJson(json['PagePadding'] ?? {});
+      pageSize = RTPageSize.fromJson(json['PageSize'] ?? {});
       Map jsonTags = json['Tags'];
       if (jsonTags.length > 0) {
         //TODO(Loki):tags convert
       } else {
         tags = {};
       }
-      Map<dynamic, dynamic> jsonLanguages = json['CustomizeTranslation'];
+      Map<dynamic, dynamic> jsonLanguages = json['CustomizeTranslation'] ?? {};
       jsonLanguages.forEach((key, value) {
         if (value is Map<dynamic, dynamic>) {
           if (value.isNotEmpty) {
@@ -173,7 +173,7 @@ class ReportTemplateDocument implements IReportTemplateDocument {
   void _initBlocks(Map<String, dynamic> json) {
     List<dynamic> jsonBlocks = json['Blocks'];
     if (jsonBlocks.isNotEmpty) {
-      jsonBlocks.forEach((block) {
+      for (var block in jsonBlocks) {
         final type = block['ElementType'];
         final jsonType = ElementType.fromJson(type);
         final name = jsonType.name;
@@ -187,7 +187,7 @@ class ReportTemplateDocument implements IReportTemplateDocument {
           final inputImageList = InputImageList.fromJson(block);
           blocks!.add(inputImageList);
         }
-      });
+      }
     }
     List<dynamic> jsonHeads = json['Header'];
     if (jsonHeads.isNotEmpty) {
@@ -195,7 +195,7 @@ class ReportTemplateDocument implements IReportTemplateDocument {
     }
     List<dynamic> jsonFooter = json['Footer'];
     if (jsonFooter.isNotEmpty) {
-      jsonFooter.forEach((block) {
+      for (var block in jsonFooter) {
         final type = block['ElementType'];
         final jsonType = ElementType.fromJson(type);
         final name = jsonType.name;
@@ -206,29 +206,30 @@ class ReportTemplateDocument implements IReportTemplateDocument {
           final paragraph = Paragraph.fromJson(block);
           footer!.add(paragraph);
         }
-      });
+      }
     }
   }
 
   void _initComments(Map<String, dynamic> json) {
     List<String> tempComments = [];
-    List<dynamic> jsonCustomizeComments = json['CustomizeComments'];
-    jsonCustomizeComments.forEach((element) {
+    List<dynamic> jsonCustomizeComments = json['CustomizeComments'] ?? [];
+    for (var element in jsonCustomizeComments) {
       tempComments.add(element.toString());
-    });
+    }
     customizeComments = tempComments.toSet();
     tempComments.clear();
 
-    List<dynamic> jsonReportComments = json['CustomizeReportComments'];
-    jsonReportComments.forEach((element) {
+    List<dynamic> jsonReportComments = json['CustomizeReportComments'] ?? [];
+    for (var element in jsonReportComments) {
       tempComments.add(element.toString());
-    });
+    }
     customizeReportComments = tempComments.toSet();
     tempComments.clear();
-    List<dynamic> jsonCustomizeCalculations = json['CustomizeCalculations'];
-    jsonCustomizeCalculations.forEach((element) {
+    List<dynamic> jsonCustomizeCalculations =
+        json['CustomizeCalculations'] ?? [];
+    for (var element in jsonCustomizeCalculations) {
       tempComments.add(element.toString());
-    });
+    }
     customizeCalculations = tempComments.toSet();
   }
 }

+ 8 - 4
lib/report/rt_Cell.dart

@@ -24,10 +24,14 @@ class RTCell extends Element implements ICell {
   RTCell.fromJson(Map<String, dynamic> json) : super.fromJson(json) {
     final jsonBackground = json['Background'];
     background = RTColor.fromJson(jsonBackground);
-    heightType = WidthTypeEnum.values
-        .firstWhere((element) => element.name == json['HeightType']);
-    widthType = WidthTypeEnum.values
-        .firstWhere((element) => element.name == json['WidthType']);
+    if (json['HeightType'] != null) {
+      heightType = WidthTypeEnum.values
+          .firstWhere((element) => element.name == json['HeightType']);
+    }
+    if (json['WidthType'] != null) {
+      widthType = WidthTypeEnum.values
+          .firstWhere((element) => element.name == json['WidthType']);
+    }
     List<dynamic> jsonBlocks = json['Blocks'];
     jsonBlocks.forEach((map) {
       final jsonType = map['ElementType'];

+ 2 - 2
lib/report/rt_grid.dart

@@ -47,7 +47,7 @@ class RTGrid extends Element implements IGrid {
   RTGrid.fromJson(Map<String, dynamic> json) : super.fromJson(json) {
     horizontalAlignment = HorizontalLayout.Left;
 
-    List<dynamic> jsonColumnDefinitions = json["ColumnDefinitions"];
+    List<dynamic> jsonColumnDefinitions = json["ColumnDefinitions"] ?? [];
     jsonColumnDefinitions.forEach((map) {
       if (map is Map<String, dynamic>) {
         final rtcolumn = RTColumnDefinition.fromJson(map);
@@ -62,7 +62,7 @@ class RTGrid extends Element implements IGrid {
     isMergeCell = json['IsMergeCell'];
     mergeDeleteStartColumnIndex = json['MergeDeleteStartColumnIndex'];
     mergeDeleteEndColumnIndex = json['MergeDeleteEndColumnIndex'];
-    List<dynamic> jsonRowDefinitions = json['RowDefinitions'];
+    List<dynamic> jsonRowDefinitions = json['RowDefinitions'] ?? [];
     jsonRowDefinitions.forEach((map) {
       if (map is Map<String, dynamic>) {
         final rtRow = RTRowDefinition.fromJson(map);

+ 132 - 0
lib/report_edit.dart

@@ -0,0 +1,132 @@
+import 'dart:convert';
+
+import 'package:fis_lib_report/converts/event_type.dart';
+import 'package:fis_lib_report/converts/pt_to_px_converter.dart';
+import 'package:fis_lib_report/pages/block_element_page.dart';
+import 'package:fis_lib_report/report/interfaces/block_element.dart';
+import 'package:fis_lib_report/report/report_template_document.dart';
+import 'package:fis_lib_report/report/rt_thickness.dart';
+import 'package:fis_lib_report/report_info/report_info.dart';
+import 'package:flutter/material.dart';
+
+class ReportEditPage extends StatefulWidget {
+  const ReportEditPage({
+    Key? key,
+    required this.reporter,
+    required this.jsonStr,
+    required this.reportDate,
+    required this.onSelect,
+  }) : super(key: key);
+
+  final FEventHandler<String> onSelect;
+  final String reporter;
+  final String jsonStr;
+  final String reportDate;
+
+  @override
+  State<ReportEditPage> createState() => _ReportEditPageState();
+}
+
+class _ReportEditPageState extends State<ReportEditPage> {
+  ReportTemplateDocument _reportTemplate = ReportTemplateDocument();
+  double _height = 0;
+  double _width = 0;
+  List<IBlockElement> _blocks = [];
+  List<IBlockElement> _header = [];
+  List<IBlockElement> _footer = [];
+  double _baseFontSize = 9.0;
+  double _footerDistance = 34.0;
+  double _footerHeight = 0;
+  EdgeInsetsGeometry _padding = EdgeInsets.all(PtToPxConverter.ptToPx(56.83));
+  bool isInit = false;
+
+  @override
+  initState() {
+    _intitTemplate();
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (widget.jsonStr.isEmpty) {
+      return const SizedBox();
+    }
+    if (!isInit) {
+      _intitTemplate();
+    }
+    return Container(
+      decoration: _buildDecoration(),
+      padding: _padding,
+      alignment: Alignment.center,
+      height: _height,
+      width: _width,
+      child: ListView(
+        // mainAxisAlignment: MainAxisAlignment.center,
+        // crossAxisAlignment: CrossAxisAlignment.center,
+        // mainAxisSize: MainAxisSize.min,
+        children: [
+          ..._header.map((head) {
+            return BlockElementPage(element: head);
+          }),
+          ..._blocks.map((block) {
+            return BlockElementPage(element: block);
+          }),
+          const SizedBox(height: 10),
+          ..._footer.map((footer) {
+            return BlockElementPage(element: footer);
+          }),
+        ],
+      ),
+    );
+  }
+
+  BoxDecoration _buildDecoration() {
+    return BoxDecoration(
+        border: Border.all(
+          width: 0.5,
+          color: const Color.fromARGB(255, 83, 83, 83),
+        ),
+        color: Colors.white);
+  }
+
+  void _intitTemplate() {
+    if (widget.jsonStr.isEmpty) {
+      return;
+    }
+    final reportMap = jsonDecode(widget.jsonStr);
+    final template = ReportTemplateDocument.fromJson(reportMap);
+    _reportTemplate = template;
+    ReportInfo.instance.init(_reportTemplate);
+    setState(() {
+      _initPage();
+    });
+    widget.onSelect.addListener((sender, e) {
+      ReportInfo.instance.selectedInputImage(e);
+    });
+    isInit = true;
+  }
+
+  void _initPage() {
+    try {
+      _height = PtToPxConverter.ptToPx(_reportTemplate.pageSize!.height);
+      _width = PtToPxConverter.ptToPx(_reportTemplate.pageSize!.width);
+      _baseFontSize = PtToPxConverter.ptToPx(_reportTemplate.baseFontSize);
+      _footerDistance = PtToPxConverter.ptToPx(_reportTemplate.footerDistance);
+      _footerHeight = PtToPxConverter.ptToPx(_reportTemplate.footerHeight);
+      final pagePadding =
+          _reportTemplate.pagePadding ?? RTThickness.uniform(56);
+      _padding = EdgeInsets.only(
+        left: PtToPxConverter.ptToPx(pagePadding.left),
+        right: PtToPxConverter.ptToPx(pagePadding.right),
+        top: PtToPxConverter.ptToPx(pagePadding.top),
+        bottom: PtToPxConverter.ptToPx(pagePadding.bottom),
+      );
+      _footer = _reportTemplate.footer ?? [];
+      _blocks = _reportTemplate.blocks ?? [];
+      _header = _reportTemplate.header ?? [];
+    } catch (e) {
+      _height = 841.8897637795275;
+      _width = 595.275590551181;
+    }
+  }
+}

+ 1 - 3
lib/report_info/report_info.dart

@@ -1,9 +1,7 @@
 import 'package:fis_lib_report/converts/event_type.dart';
 import 'package:fis_lib_report/report/element_tag.dart';
 import 'package:fis_lib_report/report/element_type.dart';
-import 'package:fis_lib_report/report/inputImage.dart';
 import 'package:fis_lib_report/report/inputImageList.dart';
-import 'package:fis_lib_report/report/inputText.dart';
 import 'package:fis_lib_report/report/interfaces/block_element.dart';
 import 'package:fis_lib_report/report/interfaces/element.dart';
 import 'package:fis_lib_report/report/paragraph.dart';
@@ -116,7 +114,7 @@ class ReportInfo {
     }
   }
 
-  void getSelectedInputImage(String imageUrl) {
+  void selectedInputImage(String imageUrl) {
     for (var element in headers) {
       if (_checkImageisSelected(element, imageUrl)) {
         return;

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff