优化Excel数据导入后的展示

lib/components/table/table.dart

@@ -33,6 +33,8 @@ class VitalTable<T> extends StatefulWidget {
     this.selectedTextStyle,
     this.noDataHintText,
     this.currectSelected,
+    this.checkCellWidth = 90,
+    this.cellPadding = _cellPadding,
   })  : assert(() {
           if (showSelect == true && selecteds == null) {
             throw FlutterError(
@@ -42,6 +44,10 @@ class VitalTable<T> extends StatefulWidget {
         }()),
         super(key: key);
 
+  final double checkCellWidth;
+
+  final EdgeInsets? cellPadding;
+
   ///无数据提示
   final String? noDataHintText;
 
@@ -222,7 +228,7 @@ class _VitalTableState<T> extends State<VitalTable<T>> {
           final child = column.headerRender != null
               ? column.headerRender!()
               : Container(
-                  padding: _cellPadding,
+                  padding: widget.cellPadding,
                   alignment: headerAlignSwitch(column.textAlign),
                   child: Wrap(
                     crossAxisAlignment: WrapCrossAlignment.center,
@@ -408,7 +414,7 @@ class _VitalTableState<T> extends State<VitalTable<T>> {
     required ValueChanged<bool> onChanged,
   }) {
     return Container(
-      width: 90,
+      width: widget.checkCellWidth,
       alignment: Alignment.center,
       child: Checkbox(
         activeColor: Theme.of(context).primaryColor,

lib/managers/excel_data_manager.dart

@@ -107,42 +107,56 @@ class ExcelDataManager implements IExcelDataManager {
 
   @override
   Future<List<ExcelDataRecord>> ExcelDataConvert(
-      List<List<Data?>> rows, String key) async {
+      List<List<Data?>> rows, String templateKey) async {
     ///首行是标题
     rows.removeAt(0);
     List<ExcelDataRecord> records = [];
-    var json = await Get.find<ITemplateManager>().getTemplateByKey(key);
+    var json = await Get.find<ITemplateManager>().getTemplateByKey(templateKey);
     List<dynamic> items = jsonDecode(json);
+    List<String> keys = [];
+    if (templateKey.contains("BloodRoutine")) {
+      keys = _bloodRoutineKeys;
+    } else if (templateKey.contains("Biochemical")) {
+      keys = _biochemicalKeys;
+    }
     for (List<Data?> rowData in rows) {
       List<ExcelDataItem> csvDatas = [];
       for (var item in items) {
         try {
           if (item is Map) {
-            int column = item["column"];
             String key = item["key"];
-            String des = item["des"];
-            String unit = item["unit"];
-            String identifier = item["identifier"];
-            String referenceRange = item["referenceRange"];
-            String value = "";
-            if (key == "sampleBarcode") {
-              print("sampleBarcode");
-            }
-            if (rowData.length >= column + 1) {
-              Data? data = rowData[column];
-              if (data == null) {
-                continue;
-              } else {
-                value = data.value.toString();
+
+            ///过滤不需要展示的数据
+            if (keys.contains(key) ||
+                key == "sampleBarcode" ||
+                key == "patientName" ||
+                key == "samplingTime") {
+              int column = item["column"];
+              String des = item["des"];
+              String unit = item["unit"];
+              String identifier = item["identifier"];
+              String referenceRange = item["referenceRange"];
+              String value = "";
+              if (key == "sampleBarcode") {
+                print("sampleBarcode");
+              }
+              if (rowData.length >= column + 1) {
+                Data? data = rowData[column];
+                if (data == null) {
+                  continue;
+                } else {
+                  value = data.value.toString();
+                }
+
+                csvDatas.add(ExcelDataItem(
+                  key: key,
+                  value: value,
+                  des: des,
+                  unit: unit,
+                  identifier: identifier,
+                  referenceRange: referenceRange,
+                ));
               }
-              csvDatas.add(ExcelDataItem(
-                key: key,
-                value: value,
-                des: des,
-                unit: unit,
-                identifier: identifier,
-                referenceRange: referenceRange,
-              ));
             }
           }
         } catch (e) {

lib/pages/patient/csv_datas/excel_datas_view.dart

@@ -4,8 +4,12 @@ import 'package:get/get.dart';
 import 'package:vitalapp/architecture/utils/prompt_box.dart';
 import 'package:vitalapp/components/appbar.dart';
 import 'package:vitalapp/components/search_input.dart';
+import 'package:vitalapp/components/table/table.dart';
+import 'package:vitalapp/components/table/table_column.dart';
 import 'package:vitalapp/managers/interfaces/excelData.dart';
 import 'package:vitalapp/managers/interfaces/models/excel_data.dart';
+import 'package:vitalapp/pages/widgets/overflow_tooltip_wrapper.dart';
+import 'package:vitalapp/pages/widgets/text_tooltip.dart';
 
 class ExcelDatasView extends StatefulWidget {
   final List<ExcelDataRecord> records;
@@ -23,7 +27,7 @@ class ExcelDatasViewState extends State<ExcelDatasView> {
   final _searchController = TextEditingController();
   List<ExcelDataRecord> _pendingUploadDatas = [];
   List<ExcelDataRecord> _errorDatas = [];
-  List<String> _selectedCsvDataCodes = [];
+  List<int> _selecteds = [];
   bool _isShowErrorData = false;
   bool _isSelectedAll = true;
 
@@ -63,8 +67,12 @@ class ExcelDatasViewState extends State<ExcelDatasView> {
           if (!_isShowErrorData)
             TextButton.icon(
               onPressed: () async {
+                List<ExcelDataRecord>  pendingUploadDatas = [];
+                for(int i in _selecteds){
+                  pendingUploadDatas.add(_pendingUploadDatas[i]);
+                }
                 var result = await Get.find<IExcelDataManager>()
-                    .uploadDatas(_pendingUploadDatas, widget.templateKey);
+                    .uploadDatas(pendingUploadDatas, widget.templateKey);
                 if (result) {
                   PromptBox.toast('上传成功');
                   Get.back();
@@ -93,93 +101,21 @@ class ExcelDatasViewState extends State<ExcelDatasView> {
           margin: EdgeInsets.symmetric(vertical: 10),
         ),
         Expanded(
-          child: ListView(
-            children: [
-              if (_isShowErrorData) ...[
-                ..._errorDatas.map((e) => _buildRecord(e)),
-              ] else ...[
-                ..._pendingUploadDatas.map((e) => _buildRecord(e)),
-              ],
-            ],
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildRecord(ExcelDataRecord e) {
-    List<ExcelDataItem> csvDatas = e.excelDatas;
-    List<Widget> children = [];
-    for (var c in csvDatas) {
-      children.add(_buildItem(c));
-    }
-    var code = csvDatas
-            .firstWhereOrNull((element) => element.key == "sampleBarcode")
-            ?.value ??
-        '';
-    return Container(
-      padding: EdgeInsets.only(left: 10),
-      width: MediaQuery.of(context).size.width,
-      child: Row(
-        children: [
-          if (!_isShowErrorData)
-            Checkbox(
-              value: _selectedCsvDataCodes.contains(code),
-              onChanged: (v) {
-                if (_selectedCsvDataCodes.contains(code)) {
-                  _selectedCsvDataCodes.remove(code);
-                } else {
-                  _selectedCsvDataCodes.add(code);
-                }
-                setState(() {});
-              },
-            ),
-          Expanded(
-            child: Wrap(
-              children: children,
+          child: VitalTable<ExcelDataRecord>(
+            source: _isShowErrorData ? _errorDatas : _pendingUploadDatas,
+            columns: _buildColumns(),
+            headerTextStyle: const TextStyle(
+              fontSize: 12,
             ),
+            autoHeight: false,
+            showSelect: !_isShowErrorData,
+            onRowSelected: (value, index, selectedIndexs) {
+              _selecteds.add(index);
+            },
+            selecteds: _selecteds,
+            checkCellWidth: 40,
+            cellPadding: EdgeInsets.symmetric(vertical: 2, horizontal: 1),
           ),
-        ],
-      ),
-      decoration: BoxDecoration(
-          border: Border(
-        bottom: BorderSide(
-          color: Colors.grey[300]!, // 边框颜色
-          width: 1.0, // 边框宽度
-        ),
-      )),
-    );
-  }
-
-  Widget _buildItem(ExcelDataItem c) {
-    if (c.value.isEmpty) {
-      return SizedBox();
-    }
-    String value = c.value;
-    if (c.unit.isNotNullOrEmpty) {
-      value += " " + c.unit!;
-    }
-    String title = c.des ?? '';
-    if (title.isNotEmpty) {
-      title += ":";
-    }
-    return Row(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        Text(
-          title,
-          style: TextStyle(fontWeight: FontWeight.bold),
-        ),
-        SizedBox(
-          width: 3,
-        ),
-        Text(
-          value,
-          maxLines: 2,
-          style: TextStyle(fontSize: value.length > 40 ? 13 : 14),
-        ),
-        SizedBox(
-          width: 15,
         ),
       ],
     );
@@ -189,18 +125,6 @@ class ExcelDatasViewState extends State<ExcelDatasView> {
     return Row(
       children: [
         SizedBox(width: 10),
-        if (!_isShowErrorData)
-          Checkbox(
-            value: _isSelectedAll,
-            onChanged: (v) {
-              _isSelectedAll = !_isSelectedAll;
-              _selectedCsvDataCodes.clear();
-              if (_isSelectedAll) {
-                _selectedAll();
-              }
-              setState(() {});
-            },
-          ),
         _buildSearchInput(),
         SizedBox(width: 20),
         _buildTips(),
@@ -222,12 +146,10 @@ class ExcelDatasViewState extends State<ExcelDatasView> {
   }
 
   void _selectedAll() {
+    int index = 0;
     for (var data in _pendingUploadDatas) {
-      var code = data.excelDatas
-              .firstWhereOrNull((element) => element.key == "sampleBarcode")
-              ?.value ??
-          '';
-      _selectedCsvDataCodes.add(code);
+      _selecteds.add(index);
+      index++;
     }
   }
 
@@ -278,14 +200,11 @@ class ExcelDatasViewState extends State<ExcelDatasView> {
                     false)
                 .toList();
             if (_isSelectedAll) {
-              _selectedCsvDataCodes.clear();
+              _selecteds.clear();
+              int index = 0;
               for (var data in _pendingUploadDatas) {
-                var code = data.excelDatas
-                        .firstWhereOrNull(
-                            (element) => element.key == "sampleBarcode")
-                        ?.value ??
-                    '';
-                _selectedCsvDataCodes.add(code);
+                _selecteds.add(index);
+                index++;
               }
             }
           }
@@ -316,4 +235,33 @@ class ExcelDatasViewState extends State<ExcelDatasView> {
       ),
     );
   }
+
+  List<TableColumn<ExcelDataRecord>> _buildColumns() {
+    if (widget.records.isEmpty) {
+      return [];
+    }
+    ExcelDataRecord firstRecord = widget.records.first;
+    var items = firstRecord.excelDatas;
+    var textStyle = TextStyle(
+      fontSize: 12,
+      overflow: TextOverflow.ellipsis,
+      fontFamily: "NotoSansSC",
+    );
+    return [
+      ...items.map(
+        (e) => TableColumn<ExcelDataRecord>(
+          headerText: e.des,
+          flex: (e.key == "sampleBarcode" || e.key == "samplingTime") ? 6 : 5,
+          render: (rowData, index) => Center(
+            child: Text(
+              rowData.excelDatas
+                  .firstWhere((element) => element.key == e.key)
+                  .value,
+              style: textStyle,
+            ),
+          ),
+        ),
+      )
+    ];
+  }
 }