报告库UI优化

lib/main.dart

@@ -38,7 +38,7 @@ class MyApp extends StatelessWidget {
         // is not restarted.
         primarySwatch: Colors.blue,
       ),
-      home: MyHomePage(title: 'Flutter Demo Home Page'),
+      home: const MyHomePage(title: 'Flutter Demo Home Page'),
     );
   }
 }
@@ -103,154 +103,167 @@ class _MyHomePageState extends State<MyHomePage> {
 
   @override
   Widget build(BuildContext context) {
-    return FutureBuilder(
+    return FutureBuilder<bool>(
         future: _loadi18nBook(),
-        builder: (c, a) {
+        builder: (c, snapshot) {
+          if (snapshot.connectionState != ConnectionState.done ||
+              snapshot.data == null) {
+            return const FCenter(
+              child: FSizedBox(
+                width: 20,
+                height: 20,
+                child: FCircularProgressIndicator(),
+              ),
+            );
+          }
           return Scaffold(
             backgroundColor: Colors.white,
-            body: Row(
-              children: [
-                if (_jsonStr.isNotEmpty && _demoImags.isNotEmpty)
-                  Expanded(
+            body: SizedBox(
+              child: Row(
+                children: [
+                  if (_jsonStr.isNotEmpty && _demoImags.isNotEmpty)
+                    Expanded(
                       child: ListView(
-                    shrinkWrap: true,
-                    children: [
-                      FReportEditPage(
-                        reporter: 'Loki',
-                        reportDate: DateTime.now(),
-                        jsonStr: _jsonStr,
-                        onSelect: onSelect,
-                        revoke: i18nBook.common.revoke.t,
-                        selectEntry: i18nBook.remedical.selectWord.t,
-                        selectImageHint:
-                            i18nBook.remedical.clickAndSelectImage.t,
+                        shrinkWrap: true,
+                        children: [
+                          FReportEditPage(
+                            reporter: 'Loki',
+                            reportDate: DateTime.now(),
+                            jsonStr: _jsonStr,
+                            onSelect: onSelect,
+                            revoke: i18nBook.common.revoke.t,
+                            selectEntry: i18nBook.remedical.selectWord.t,
+                            selectImageHint:
+                                i18nBook.remedical.clickAndSelectImage.t,
+                          ),
+                        ],
                       ),
-                    ],
-                  )),
-                const SizedBox(width: 40),
-                Container(
-                    decoration: _buildDecoration(),
-                    padding: _padding,
-                    alignment: Alignment.center,
-                    height: 800,
-                    width: 600,
-                    child: ListView(
-                      shrinkWrap: true,
-                      children: [
-                        Wrap(
-                          children: [
-                            ..._demoImags.map((element) {
-                              return Container(
-                                width: 150,
-                                height: 100,
-                                margin: const EdgeInsets.all(15),
-                                child: FContentImage(
-                                  fileDataType: RemedicalFileDataTypeEnum.Image,
-                                  terminalImage: TerminalImage(
-                                    coverImageUrl: element,
-                                    previewUrl: element,
-                                    imageUrl: element,
-                                  ),
-                                  onTap: () => onSelect.emit(this, element),
-                                ),
-                              );
-                            })
-                          ],
-                        ),
-                      ],
-                    )),
-                SizedBox(
-                  width: 400,
-                  child: Wrap(
-                    children: [
-                      MaterialButton(
-                          child: const Text('北京同仁堂'),
-                          onPressed: () {
-                            FReportInfo.instance.reload(
-                                '北京同仁堂',
-                                DateTime.now(),
-                                _aiJson,
-                                onSelect,
-                                i18nBook.common.revoke.t,
-                                i18nBook.remedical.selectWord.t,
-                                i18nBook.remedical.clickAndSelectImage.t);
-                          }),
-                      MaterialButton(
-                          child: const Text('testDefault'),
-                          onPressed: () {
-                            FReportInfo.instance.reload(
-                                '海孚结构化颈动脉',
-                                DateTime.now(),
-                                _jsonStr,
-                                onSelect,
-                                i18nBook.common.revoke.t,
-                                i18nBook.remedical.selectWord.t,
-                                i18nBook.remedical.clickAndSelectImage.t);
-                          }),
-                      MaterialButton(
-                          child: const Text('testPet'),
-                          onPressed: () {
-                            FReportInfo.instance.reload(
-                                '北京养老院模板',
-                                DateTime.now(),
-                                _petStr,
-                                onSelect,
-                                i18nBook.common.revoke.t,
-                                i18nBook.remedical.selectWord.t,
-                                i18nBook.remedical.clickAndSelectImage.t);
-                          }),
-                      MaterialButton(
-                          child: const Text('onClose'),
-                          onPressed: () {
-                            FReportInfo.instance.onClose.emit(this, null);
-                          }),
-                      MaterialButton(
-                          child: const Text('open'),
-                          onPressed: () {
-                            setState(() {});
-                          }),
-                      MaterialButton(
-                          child: const Text('testCustomTemplate'),
-                          onPressed: () {
-                            FReportInfo.instance.reload(
-                                'testCustomTemplate',
-                                DateTime.now(),
-                                _testStr,
-                                onSelect,
-                                i18nBook.common.revoke.t,
-                                i18nBook.remedical.selectWord.t,
-                                '');
-                          }),
-                      MaterialButton(
-                          child: const Text('海弗'),
-                          onPressed: () {
-                            final reportMap = jsonDecode(_reportInfoStr);
-                            FReportInfo.instance.fromJson(reportMap);
-                          }),
-                      MaterialButton(
-                          child: const Text('testToJson'),
-                          onPressed: () {
-                            FReportInfo.instance.toJson();
-                            final items = FReportInfo.instance.jsonItems;
-                            final json = jsonEncode(items);
-                            print(json);
-                          }),
-                      MaterialButton(
-                          child: const Text('testDiagnostic'),
-                          onPressed: () {
-                            FReportInfo.instance.insertDiagnostic(
-                                '主动脉极度扩张，主动脉窦扩张形成主动脉窦瘤，主动脉瓣呈囊袋状。 心底短轴显示主动脉瓣的对合不良。 多普勒超声显示舒张期返流束，起自主动脉瓣射向左心室达心尖部。 二尖瓣与主动脉瓣均脱垂。左心室扩张，呈容量负荷过重。左心功能正常。',
-                                '符合冠心病间隔梗塞后的超声表现并伴室壁瘤形成，左心功能不全');
-                          }),
-                      MaterialButton(
-                          child: const Text('setMockDatas'),
-                          onPressed: () {
-                            FReportInfo.instance.setMockDatas.emit(this, '');
-                          }),
-                    ],
-                  ),
-                ),
-              ],
+                    ),
+                  const SizedBox(width: 40),
+                  // Container(
+                  //     decoration: _buildDecoration(),
+                  //     padding: _padding,
+                  //     alignment: Alignment.center,
+                  //     height: 800,
+                  //     width: 600,
+                  //     child: ListView(
+                  //       shrinkWrap: true,
+                  //       children: [
+                  //         Wrap(
+                  //           children: [
+                  //             ..._demoImags.map((element) {
+                  //               return Container(
+                  //                 width: 150,
+                  //                 height: 100,
+                  //                 margin: const EdgeInsets.all(15),
+                  //                 child: FContentImage(
+                  //                   fileDataType: RemedicalFileDataTypeEnum.Image,
+                  //                   terminalImage: TerminalImage(
+                  //                     coverImageUrl: element,
+                  //                     previewUrl: element,
+                  //                     imageUrl: element,
+                  //                   ),
+                  //                   onTap: () => onSelect.emit(this, element),
+                  //                 ),
+                  //               );
+                  //             })
+                  //           ],
+                  //         ),
+                  //       ],
+                  //     )),
+                  // SizedBox(
+                  //   width: 400,
+                  //   child: Wrap(
+                  //     children: [
+                  //       MaterialButton(
+                  //           child: const Text('北京同仁堂'),
+                  //           onPressed: () {
+                  //             FReportInfo.instance.reload(
+                  //                 '北京同仁堂',
+                  //                 DateTime.now(),
+                  //                 _aiJson,
+                  //                 onSelect,
+                  //                 i18nBook.common.revoke.t,
+                  //                 i18nBook.remedical.selectWord.t,
+                  //                 i18nBook.remedical.clickAndSelectImage.t);
+                  //           }),
+                  //       MaterialButton(
+                  //           child: const Text('testDefault'),
+                  //           onPressed: () {
+                  //             FReportInfo.instance.reload(
+                  //                 '海孚结构化颈动脉',
+                  //                 DateTime.now(),
+                  //                 _jsonStr,
+                  //                 onSelect,
+                  //                 i18nBook.common.revoke.t,
+                  //                 i18nBook.remedical.selectWord.t,
+                  //                 i18nBook.remedical.clickAndSelectImage.t);
+                  //           }),
+                  //       MaterialButton(
+                  //           child: const Text('testPet'),
+                  //           onPressed: () {
+                  //             FReportInfo.instance.reload(
+                  //                 '北京养老院模板',
+                  //                 DateTime.now(),
+                  //                 _petStr,
+                  //                 onSelect,
+                  //                 i18nBook.common.revoke.t,
+                  //                 i18nBook.remedical.selectWord.t,
+                  //                 i18nBook.remedical.clickAndSelectImage.t);
+                  //           }),
+                  //       MaterialButton(
+                  //           child: const Text('onClose'),
+                  //           onPressed: () {
+                  //             FReportInfo.instance.onClose.emit(this, null);
+                  //           }),
+                  //       MaterialButton(
+                  //           child: const Text('open'),
+                  //           onPressed: () {
+                  //             setState(() {});
+                  //           }),
+                  //       MaterialButton(
+                  //           child: const Text('testCustomTemplate'),
+                  //           onPressed: () {
+                  //             FReportInfo.instance.reload(
+                  //                 'testCustomTemplate',
+                  //                 DateTime.now(),
+                  //                 _testStr,
+                  //                 onSelect,
+                  //                 i18nBook.common.revoke.t,
+                  //                 i18nBook.remedical.selectWord.t,
+                  //                 '');
+                  //           }),
+                  //       MaterialButton(
+                  //           child: const Text('海弗'),
+                  //           onPressed: () {
+                  //             final reportMap = jsonDecode(_reportInfoStr);
+                  //             FReportInfo.instance.fromJson(reportMap);
+                  //           }),
+                  //       MaterialButton(
+                  //           child: const Text('testToJson'),
+                  //           onPressed: () {
+                  //             FReportInfo.instance.toJson();
+                  //             final items = FReportInfo.instance.jsonItems;
+                  //             final json = jsonEncode(items);
+                  //             print(json);
+                  //           }),
+                  //       MaterialButton(
+                  //           child: const Text('testDiagnostic'),
+                  //           onPressed: () {
+                  //             FReportInfo.instance.insertDiagnostic(
+                  //                 '主动脉极度扩张，主动脉窦扩张形成主动脉窦瘤，主动脉瓣呈囊袋状。 心底短轴显示主动脉瓣的对合不良。 多普勒超声显示舒张期返流束，起自主动脉瓣射向左心室达心尖部。 二尖瓣与主动脉瓣均脱垂。左心室扩张，呈容量负荷过重。左心功能正常。',
+                  //                 '符合冠心病间隔梗塞后的超声表现并伴室壁瘤形成，左心功能不全');
+                  //           }),
+                  //       MaterialButton(
+                  //           child: const Text('setMockDatas'),
+                  //           onPressed: () {
+                  //             FReportInfo.instance.setMockDatas.emit(this, '');
+                  //           }),
+                  //     ],
+                  //   ),
+                  // ),
+                ],
+              ),
             ),
           );
         });
@@ -265,24 +278,28 @@ class _MyHomePageState extends State<MyHomePage> {
         color: Colors.white);
   }
 
-  Future<void> _loadi18nBook() async {
+  Future<bool> _loadi18nBook() async {
     var theme = AppTheme();
     try {
       await FTheme.init(theme);
     } catch (e) {
-      FTheme.ins.switchTheme('lightness');
+      await FTheme.ins.switchTheme('lightness');
     }
-    FTheme.ins.switchTheme('lightness', true);
+    await FTheme.ins.switchTheme('lightness', true);
     if (_isInitI18nbopok) {
-      return;
+      return true;
     }
 
     const curLocale = Locale('zh', 'CN');
     var bookOptions = [
       FTrKeybookOption.ChineseOption,
     ];
-    await FI18n.init((locale) => locale, bookOptions);
-    await FI18n.load(curLocale);
+    try {
+      await FI18n.init((locale) => locale, bookOptions);
+      await FI18n.load(curLocale);
+    } catch (e) {}
+
     _isInitI18nbopok = true;
+    return true;
   }
 }

lib/pages/components/datetime.dart

@@ -26,7 +26,7 @@ class _FDateTimeState extends State<FDateTime> {
   _FDateTimeState();
 
   String _dateTimeStr = '';
-  double _fontSize = 15.0;
+  double _fontSize = 14.0;
   double _width = 0;
   TextStyle _style = const TextStyle();
   Color _fontColor = Colors.black;
@@ -45,6 +45,7 @@ class _FDateTimeState extends State<FDateTime> {
     _initDatas();
     return FContainer(
         margin: _margin,
+        constraints: const BoxConstraints(minHeight: 24),
         padding: const EdgeInsets.symmetric(horizontal: 4),
         height: _fontSize + 10,
         decoration: BoxDecoration(

lib/pages/components/input_text.dart

@@ -67,6 +67,7 @@ class _FInputTextState extends FState<FInputText> {
         FContainer(
           width: _lineWidth,
           height: _textWrap ? null : _allHeight,
+          alignment: Alignment.center,
           child: FShortcuts(
             shortcuts: {
               LogicalKeySet(LogicalKeyboardKey.tab): AutoJumpIntent(),
@@ -102,7 +103,8 @@ class _FInputTextState extends FState<FInputText> {
         if (_textWrap) ...[
           const FSizedBox(height: 3),
         ],
-        if (_inputTextInfo!.tag != null &&
+        if (_inputTextInfo != null &&
+            _inputTextInfo!.tag != null &&
             _inputTextInfo!.tag!.elementTagType ==
                 ElementTagType.DiagnosticEntry) ...[
           FAlign(
@@ -150,7 +152,7 @@ class _FInputTextState extends FState<FInputText> {
 
   @override
   void dispose() {
-    _inputTextInfo!.onTextChange.dispose();
+    _inputTextInfo?.onTextChange.dispose();
     _controller.dispose();
     super.dispose();
   }

lib/pages/components/multi_selected.dart

@@ -173,7 +173,8 @@ class _RRMultiSelectedState extends State<FMultiSelected> {
     if (multiSelected.items!.isNotEmpty) {
       _items = multiSelected.items!;
     }
-    if (_mulitiSelectedInfo!.selectedItems != _selectedItems) {
+    if (_mulitiSelectedInfo != null &&
+        _mulitiSelectedInfo!.selectedItems != _selectedItems) {
       _selectedItems = _mulitiSelectedInfo!.selectedItems;
       _getSelectedItems();
     }

lib/pages/components/static_text.dart

@@ -89,14 +89,13 @@ class _FStaticTextState extends State<FStaticText> {
         width = width - 2;
       }
     }
+
     return FColumn(
-      mainAxisAlignment: MainAxisAlignment.spaceAround,
+      mainAxisAlignment: MainAxisAlignment.center,
       crossAxisAlignment: aliment,
-      mainAxisSize: MainAxisSize.min,
       children: [
         FContainer(
           margin: _margin,
-          constraints: const BoxConstraints(minHeight: 24),
           width: width,
           child: containsSpace
               ? FRow(mainAxisSize: MainAxisSize.min, children: emptySpaces)

lib/pages/rt_cell.dart

@@ -1,12 +1,16 @@
 import 'package:fis_lib_report/pages/paragraph_page.dart';
+import 'package:fis_lib_report/pages/rt_table.dart';
 import 'package:fis_lib_report/report/element_type.dart';
 import 'package:fis_lib_report/report/interfaces/block_element.dart';
 import 'package:fis_lib_report/report/paragraph.dart';
 import 'package:fis_lib_report/report/rt_Cell.dart';
+import 'package:fis_lib_report/report/rt_table.dart';
 import 'package:fis_ui/index.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
+import 'helper.dart';
+
 class FRTCellPage extends StatefulWidget implements FWidget {
   final double? width;
   const FRTCellPage({required this.cell, this.width, Key? key})
@@ -33,21 +37,30 @@ class _RTCellState extends State<FRTCellPage> {
     _blocks = widget.cell.blocks;
     return _blocks!.isEmpty
         ? FContainer(
-            height: 24,
+            constraints: const BoxConstraints(minHeight: 24),
             width: widget.width,
           )
         : FWrap(
-            alignment: WrapAlignment.start,
+            alignment: WrapAlignment.center,
+            runAlignment: WrapAlignment.center,
             runSpacing: 2,
             children: [
               ..._blocks!.map((e) {
                 if (e.elementType!.name == ElementType.paragraph.name) {
                   final paragraph = e as Paragraph;
-                  return FSizedBox(
+                  return FContainer(
                     width: widget.width,
+                    alignment: Alignment.center,
                     child: FParagraphPage(paragraph: paragraph),
                   );
+                } else if (e.elementType!.name == ElementType.rtTable.name) {
+                  final table = e as RTTable;
+                  return FSizedBox(
+                    width: widget.width,
+                    child: FRTTablePage(element: table),
+                  );
                 }
+
                 return FContainer();
               }),
             ],

lib/pages/rt_table.dart

@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:fis_lib_report/converts/alignment_convert.dart';
 import 'package:fis_lib_report/converts/color_convert.dart';
 import 'package:fis_lib_report/converts/pt_to_px_converter.dart';
@@ -32,6 +34,7 @@ class _RTTableState extends State<FRTTablePage> {
   int? _columnCount;
   int? _rowCount;
   double _width = 0;
+  double _height = 0;
 
   @override
   initState() {
@@ -46,7 +49,7 @@ class _RTTableState extends State<FRTTablePage> {
 
     ///这个children 用于普通RTTable
     List<FWidget> children = [];
-    for (int i = 0; i < _rowCount! - 1; i++) {
+    for (int i = 0; i < _rowCount!; i++) {
       final rowChildren =
           _cells!.keys.where((element) => element.row! == i).toList();
 
@@ -63,7 +66,6 @@ class _RTTableState extends State<FRTTablePage> {
         FWidget childrenItem = _buildChildrenItem(cellPostion, rowItems, i);
         gridList[cellPostion] = childrenItem;
         rowNormalChildren.add(FContainer(
-          //  margin: const EdgeInsets.symmetric(vertical: 2),
           child: childrenItem,
         ));
       }
@@ -73,47 +75,88 @@ class _RTTableState extends State<FRTTablePage> {
         ),
       );
     }
+
     var columnCount = _columnCount ?? 3;
+    if (_width <= 0) {
+      initCells();
+    }
+    // var keys = gridList.keys.toList();
+    // keys.sort(((a, b) {
+    //   return a.row!.compareTo(b.row!);
+    // }));
+    // List<CellPostion> sortKeys = [];
+    // for (int i = 0; i < _rowCount! - 1; i++) {
+    //   final columnItems = keys.where((element) => element.row == i).toList();
+    //   columnItems.sort((a, b) => a.column!.compareTo(b.column!));
+    //   sortKeys.addAll(columnItems);
+    // }
+    // print('sssssstart:');
+    // if (_columnCount! == 12) {
+    //   for (var s in sortKeys) {
+    //     print('row:${s.row},column:${s.column}');
+    //   }
+    // }
+    // print('eeeeeeeend');
+    const int expansionFactor = 1000;
+    Widget table = StaggeredGrid.count(
+      ///水平方向
+      crossAxisCount: columnCount * expansionFactor,
+      mainAxisSpacing: 0,
+      children: gridList.keys.map((e) {
+        if (gridList.keys.length == 24) {
+          print('');
+        }
+        var currentItemWidth =
+            widget.element.columnDefinitions![e.column!].width ?? 0;
+        if (e.columnSpan! > 1) {
+          for (int i = e.column! + 1; i < e.column! + e.columnSpan!; i++) {
+            currentItemWidth += widget.element.columnDefinitions![i].width ?? 0;
+          }
+        }
+        var currentItemHeight =
+            widget.element.rowDefinitions![e.row!].height ?? 0;
+
+        if (e.rowSpan! > 1 &&
+            e.row! + 1 < widget.element.rowDefinitions!.length) {
+          for (int i = e.row! + 1; i < e.row! + e.rowSpan!; i++) {
+            var targetHeight = widget.element.rowDefinitions![i].height ?? 0;
+            currentItemHeight += targetHeight;
+          }
+        }
+        double currentColumnRatio = 0;
+        double currentRowRatio = 0;
+        if (_width > 0) {
+          currentColumnRatio =
+              currentItemWidth / _width * expansionFactor * columnCount;
+        } else {
+          currentColumnRatio = e.columnSpan! * expansionFactor.toDouble();
+        }
+
+        if (_height > 0) {
+          currentRowRatio =
+              currentItemHeight / _width * expansionFactor * columnCount;
+        } else {
+          currentRowRatio = e.rowSpan!.toDouble() * expansionFactor;
+        }
+
+        print('width:$currentColumnRatio,currentRowRatio:$currentRowRatio');
+        return StaggeredGridTile.count(
+          ///水平方向
+          crossAxisCellCount: currentColumnRatio.toInt(),
+
+          ///竖直方向
+          mainAxisCellCount: currentRowRatio,
+          child: Container(
+            child: gridList[e]!,
+          ),
+        );
+      }).toList(),
+    );
+
     return Container(
       alignment: AlignmentConvert.horizontalConvert(
           widget.element.horizontalAlignment),
-      child: ![12, 8, 6].contains(columnCount)
-          ? FColumn(
-              mainAxisAlignment: AlignmentConvert.horizontalToMainConvert(
-                  widget.element.horizontalAlignment),
-              children: children,
-            )
-          : StaggeredGrid.count(
-              crossAxisCount: columnCount * 100,
-              mainAxisSpacing: 0,
-              children: gridList.keys.map((e) {
-                var mainAxisCellCount = e.rowSpan! * 100;
-                if (columnCount == 8) {
-                  mainAxisCellCount = e.rowSpan! * 30;
-                } else if (columnCount == 6) {
-                  mainAxisCellCount = e.rowSpan! * 25;
-                } else {
-                  if (e.row == 5) {
-                    mainAxisCellCount = e.rowSpan! * 160;
-                  } else if (e.row == 6) {
-                    mainAxisCellCount = e.rowSpan! * 120;
-                  } else if (e.row == 9) {
-                    mainAxisCellCount = e.rowSpan! * 160;
-                  } else if (e.row == 10) {
-                    mainAxisCellCount = e.rowSpan! * 220;
-                  }
-                }
-
-                return StaggeredGridTile.count(
-                  ///水平方向
-                  crossAxisCellCount: e.columnSpan! * 100,
-
-                  ///竖直方向
-                  mainAxisCellCount: mainAxisCellCount,
-                  child: gridList[e]!,
-                );
-              }).toList(),
-            ),
+      child: table,
     );
   }
 
@@ -124,11 +167,15 @@ class _RTTableState extends State<FRTTablePage> {
     // +1 为列数
     _columnCount = cellPostions.first.column! + 1;
     _values = _cells!.values.toList();
-    for (int i = 0; i < _columnCount! - 1; i++) {
+    for (int i = 0; i < _columnCount!; i++) {
       _width += widget.element.columnDefinitions![i].width!;
     }
-
-    _rowCount = widget.element.rowDefinitions!.length + 1;
+    cellPostions.sort(((a, b) => (b.row!).compareTo(a.row!)));
+    // +1 为行数
+    _rowCount = cellPostions.first.row! + 1;
+    for (int i = 0; i < _rowCount!; i++) {
+      _height += widget.element.rowDefinitions![i].height!;
+    }
   }
 
   FWidget _buildChildrenItem(
@@ -189,9 +236,6 @@ class _RTTableState extends State<FRTTablePage> {
 
     var realWidth = PtToPxConverter.ptToPx(width);
     var realHeight = PtToPxConverter.ptToPx(height);
-    if (width > 180 && width < 184) {
-      print('realWidth$realWidth');
-    }
     FWidget cellItem = FContainer(
       decoration: BoxDecoration(
         color: ColorConvert.colorConvert(background),
@@ -222,7 +266,7 @@ class _RTTableState extends State<FRTTablePage> {
               color: ColorConvert.colorConvert(borders.bottom.color)),
         ),
       ),
-      //   height: realHeight,
+      //height: realHeight,
       width: realWidth,
       child: FRTCellPage(
         cell: rtCell,
@@ -252,3 +296,10 @@ class _RTTableState extends State<FRTTablePage> {
     return row;
   }
 }
+
+class Element {
+  int row;
+  int column;
+
+  Element(this.row, this.column);
+}

lib/report/interfaces/grid.dart

@@ -16,8 +16,10 @@ class RTRowDefinition {
   WidthTypeEnum? type;
 
   RTRowDefinition.fromJson(Map<String, dynamic> json) {
-    minHeight = json['MinHeight'];
-    height = json['Height'];
+    var targetMinHeight = json['MinHeight'];
+    minHeight = targetMinHeight < 26 ? 26 : targetMinHeight;
+    var targetHeight = json['Height'];
+    height = targetHeight < 28 ? 28 : targetHeight;
     if (json['Type'] != null) {
       type = WidthTypeEnum.values
           .firstWhere((element) => element.name == json['Type']);

lib/report/report_template_document.dart

@@ -154,7 +154,8 @@ class ReportTemplateDocument implements IReportTemplateDocument {
       jsonLanguages.forEach((key, value) {
         if (value is Map<dynamic, dynamic>) {
           if (value.isNotEmpty) {
-            customizeTranslation[key] = value as Map<String, String>;
+            customizeTranslation[key] = value.map(
+                (key, value) => MapEntry(key.toString(), value.toString()));
           } else {
             customizeTranslation[key] = {};
           }

lib/report/rt_Cell.dart

@@ -7,6 +7,8 @@ import 'package:fis_lib_report/report/interfaces/element.dart';
 import 'package:fis_lib_report/report/paragraph.dart';
 import 'package:fis_lib_report/report/rt_color.dart';
 
+import 'rt_table.dart';
+
 class RTCell extends Element implements ICell {
   @override
   RTColor? background;
@@ -39,9 +41,13 @@ class RTCell extends Element implements ICell {
     for (var map in jsonBlocks) {
       final jsonType = map['ElementType'];
       final type = ElementType.fromJson(jsonType);
-      if (type.name == ElementType.paragraph.name) {
+      final typeName = type.name;
+      if (typeName == ElementType.paragraph.name) {
         final block = Paragraph.fromJson(map, parent: this);
         blocks!.add(block);
+      } else if (typeName == ElementType.rtTable.name) {
+        final block = RTTable.fromJson(map);
+        blocks!.add(block);
       }
     }
     final jsonBorders = json['Borders'];

lib/report_edit.dart

@@ -101,6 +101,7 @@ class _FReportEditPageState extends State<FReportEditPage> {
             ..._footer.map((footer) {
               return FContainer(
                 margin: margin,
+                constraints: const BoxConstraints(minHeight: 24),
                 child: FBlockElementPage(element: footer),
               );
             }),
@@ -133,8 +134,7 @@ class _FReportEditPageState extends State<FReportEditPage> {
     final reportMap = jsonDecode(jsonStr);
 
     setState(() {
-      final template = ReportTemplateDocument.fromJson(reportMap);
-      _reportTemplate = template;
+      _reportTemplate = ReportTemplateDocument.fromJson(reportMap);
       FReportInfo.instance.init(
         _reportTemplate,
         reportDate,

lib/report_info/element_tag_names.dart

@@ -46,4 +46,48 @@ class TagNames {
 
   ///种类
   static const String SPECIES = "Species";
+
+  ///颈动脉相关
+
+  ///颈动脉内径右侧
+  static const String RIGHTCAROTIAAD = 'RightCarotidAD';
+
+  ///颈动脉内径左侧
+  static const String LEFTCAROTIDAD = 'LeftCarotidAD';
+
+  ///内中膜厚度右侧
+  static const String RIGHTIMT = 'RightIMT';
+
+  ///内中膜厚度左侧
+  static const String LEFTIMT = 'LeftIMT';
+
+  ///超声所见右侧
+  static const String RIGHTCONCLUSION = 'RightConclusion';
+
+  ///超声所见左侧
+  static const String LEFTCONCLUSION = 'LeftConclusion';
+
+  ///右侧斑块位置
+  static const String RIGHTPLAQUEPOSITION = "RightPlaquePosition";
+
+  ///左侧斑块位置
+  static const String LEFTPLAQUEPOSITION = "LeftPlaquePosition";
+
+  ///右侧斑块大小
+  static const String RIGHTPLAQUETHICK = "RightPlaqueThick";
+
+  ///左侧斑块大小
+  static const String LEFTPLAQUETHICK = "LeftPlaqueThick";
+
+  ///左侧斑块回声
+  static const String LEFTPLAQUEECHO = "LeftPlaqueEcho";
+
+  ///右侧斑块回声
+  static const String RIGHTPLAQUEECHO = "RightPlaqueEcho";
+
+  ///管腔狭窄率右侧
+  static const String RIGHTSTENOSISRATE = "RightStenosisRate";
+
+  ///管腔狭窄率左侧
+  static const String LEFTSTENOSISRATE = "LeftStenosisRate";
 }