修改多选弹窗;

lib/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -6,7 +6,6 @@ import 'package:lszlgl/main.dart';
 import 'package:lszlgl/utils/input_formatter.dart';
 import 'package:lszlgl/utils/location_utils.dart';
 import 'package:lszlgl/widget/button.dart';
-import 'package:lszlgl/widget/menu_dialog.dart';
 import '../../../base/base_lifecycle_state.dart';
 import '../../../model/rsp/dict_rsp.dart';
 import '../../../model/rsp/sample_task_rsp.dart';
@@ -50,11 +49,11 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
 
   final name = null.notifier<String?>();
 
-  late List<CardMenuData> personList;
+  List<CardMenuData> personList = [];
 
   /// 获取行政区划列表
-  Future<List<CardMenuData>?> getDistrictList(num level, {num? id}) async {
-    MyNavigator.showLoading();
+  Future<List<CardMenuData>?> getDistrictList(num level, {num? id, bool showLoading = true}) async {
+    if (showLoading) MyNavigator.showLoading();
     try {
       var rsp = await MyApi.get().districtList(level, id: id);
       List<CardMenuData> list = (rsp.data ?? []).map((e) => CardMenuData(e.uname, e.id)).toList();
@@ -63,12 +62,12 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
       } else if (level == 5) {
         cunList.value = list;
       }
-      MyNavigator.dismissLoading();
+      if (showLoading) MyNavigator.dismissLoading();
       return list;
     } catch (e) {
       logger.e(e);
     }
-    MyNavigator.dismissLoading();
+    if (showLoading) MyNavigator.dismissLoading();
     return null;
   }
 
@@ -113,30 +112,26 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
   }
 
   /// 获取编辑数据
-  void getEditData() {
-    // 市
-    if (data?.shengXzqh != null) {
-      getDistrictList(2, id: data?.shengXzqh);
-    }
-    // 区
-    if (data?.shiXzqh != null) {
-      getDistrictList(3, id: data?.shiXzqh);
-    }
+  void getEditData() async {
+    MyNavigator.showLoading();
     // 县
     if (data?.quXzqh != null) {
-      getDistrictList(4, id: data?.quXzqh);
+      await getDistrictList(4, id: data?.quXzqh, showLoading: false);
     }
     // 村
     if (data?.xiangXzqh != null) {
-      getDistrictList(5, id: data?.xiangXzqh);
+      await getDistrictList(5, id: data?.xiangXzqh, showLoading: false);
     }
+    MyNavigator.dismissLoading();
   }
 
   void getPersonData() async {
     try {
       // 获取扦样人员列表
       var rsp = await MyApi.get().getPersonMenu(data?.jhcyjg ?? 29964);
-      personList = (rsp.data ?? []).map((e) => CardMenuData(e.name, e.id)).toList();
+      personList
+        ..clear()
+        ..addAll((rsp.data ?? []).map((e) => CardMenuData(e.name, e.id)).toList());
       // 选中扦样人员
       var nameList = data?.name?.split(',');
       if (nameList != null) {
@@ -191,44 +186,50 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
       cun.value = null;
       cunList.value = [];
 
+      MyNavigator.showLoading();
       bool stepSuccess = false;
       // 省
-      var provinceList = await getDistrictList(1);
-      if (provinceList == null) return;
-      for (CardMenuData item in provinceList) {
-        if (item.name == province) {
-          data?.shengXzqh = item.value;
-          sheng.value = item;
-          stepSuccess = true;
-          break;
-        }
-      }
-      if (!stepSuccess) return;
-      stepSuccess = false;
-      // 市
-      var cityList = await getDistrictList(2, id: data?.shengXzqh);
-      if (cityList == null) return;
-      for (CardMenuData item in cityList) {
-        if (item.name == city) {
-          data?.shiXzqh = item.value;
-          shi.value = item;
-          stepSuccess = true;
-          break;
+      var provinceList = await getDistrictList(1, showLoading: false);
+      if (provinceList != null) {
+        for (CardMenuData item in provinceList) {
+          if (item.name == province) {
+            data?.shengXzqh = item.value;
+            sheng.value = item;
+            stepSuccess = true;
+            break;
+          }
         }
-      }
-      if (!stepSuccess) return;
-      stepSuccess = false;
-      // 区
-      var districtList = await getDistrictList(3, id: data?.shiXzqh);
-      if (districtList == null) return;
-      for (CardMenuData item in districtList) {
-        if (item.name == district) {
-          data?.quXzqh = item.value;
-          qu.value = item;
-          getDistrictList(4, id: item.value);
-          break;
+        if (stepSuccess) {
+          stepSuccess = false;
+          // 市
+          var cityList = await getDistrictList(2, id: data?.shengXzqh, showLoading: false);
+          if (cityList == null) return;
+          for (CardMenuData item in cityList) {
+            if (item.name == city) {
+              data?.shiXzqh = item.value;
+              shi.value = item;
+              stepSuccess = true;
+              break;
+            }
+          }
+          if (stepSuccess) {
+            stepSuccess = false;
+            // 区
+            var districtList = await getDistrictList(3, id: data?.shiXzqh, showLoading: false);
+            if (districtList == null) return;
+            for (CardMenuData item in districtList) {
+              if (item.name == district) {
+                data?.quXzqh = item.value;
+                qu.value = item;
+                getDistrictList(4, id: item.value, showLoading: false);
+                break;
+              }
+            }
+          }
         }
       }
+      MyNavigator.dismissLoading();
+
       String jwd = '$lon，$lat';
       qyddjwd.value = jwd;
       data?.qyddjwd = jwd;
@@ -238,9 +239,7 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     }
   }
 
-  void showPersonMenu() async {
-    List<CardMenuData>? selectList = await showMenuDialog(personList, selectCountMax: 3, isScrollControlled: true);
-    if (selectList == null) return;
+  void personSelCallback(List<CardMenuData> selectList) async {
     if (selectList.isEmpty) {
       data?.dgryName = null;
       name.value = null;
@@ -304,15 +303,7 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
       children: [
         CardItemWidget('扦样任务单号', rightText: data?.qyrwdh, bottomLine: true),
         CardItemWidget('扦样单位', rightText: data?.dwmc, bottomLine: true),
-        name.builder(
-          (v) => CardItemWidget(
-            '扦样人员',
-            rightText: v,
-            bottomLine: true,
-            trailing: isDetail || v != null ? null : Image.asset(imgItemArrowDown, width: 20),
-            onTap: isDetail ? null : showPersonMenu,
-          ),
-        ),
+        name.builder((v) => CardWidgets.buildMenuDialog(isDetail, '扦样人员', v, personList, personSelCallback, multiple: true)),
         CardItemWidget('监测类别', rightText: DictService.getLabel(DictType.jclb, value: data?.jclb), bottomLine: true),
         sheng.builder((v) => CardItemWidget('省份', rightText: v?.name, bottomLine: true)),
         shi.builder((v) => CardItemWidget('市区', rightText: v?.name, bottomLine: true)),

lib/widget/card_item.dart

@@ -5,6 +5,7 @@ import 'package:lszlgl/ext/value_notifier_ext.dart';
 
 import '../config/pics.dart';
 import '../router/my_navigator.dart';
+import 'menu_dialog.dart';
 
 class CardItemWidget extends StatelessWidget {
   /// 标题文本
@@ -354,6 +355,37 @@ class CardWidgets {
     });
   }
 
+  static Widget buildMenuDialog(
+    bool isDetail,
+    String title,
+    String? value,
+    List<CardMenuData>? list,
+    void Function(List<CardMenuData>)? onSelectTap, {
+    bool multiple = false,
+    String? hint,
+    Widget? trailing,
+  }) {
+    return CardItemWidget(
+      title,
+      rightText: value,
+      bottomLine: true,
+      hint: hint,
+      trailing: isDetail || value != null ? null : trailing ?? Image.asset(imgItemArrowDown, width: 20),
+      onTap: isDetail
+          ? null
+          : () async {
+              List<CardMenuData>? selectList = await showMenuDialog(
+                list,
+                title: title,
+                multiple: multiple,
+                selectCountMax: 3,
+              );
+              if (selectList == null) return;
+              onSelectTap?.call(selectList);
+            },
+    );
+  }
+
   static Widget buildMenu(
     bool isDetail,
     String title,

lib/widget/menu_dialog.dart

@@ -5,19 +5,28 @@ import 'package:lszlgl/widget/button.dart';
 import '../config/colors.dart';
 import 'card_item.dart';
 
+/// 弹出菜单选项弹框
+/// * [list] 选项列表数据源
+/// * [title] 标题
+/// * [multiple] 多选,默认单选
+/// * [selectCountMax] 最大选择数量
+/// * [backgroundColor] 背景颜色
+/// * [borderRadius] 圆角
+/// * [constraints] 尺寸约束
+/// * [isScrollControlled] 高度自适应, 默认true
+/// * [isDismissible] 点击空白处关闭
+/// * [enableDrag] 拖动关闭
 Future<T?> showMenuDialog<T>(
   List<CardMenuData>? list, {
+  String? title,
+  bool multiple = false,
   int? selectCountMax,
   Color? backgroundColor = Colors.white,
   BorderRadiusGeometry? borderRadius,
   BoxConstraints? constraints,
-  bool isScrollControlled = false,
+  bool isScrollControlled = true,
   bool isDismissible = true,
   bool enableDrag = true,
-  bool useSafeArea = false,
-  RouteSettings? routeSettings,
-  AnimationController? animationCtrl,
-  Offset? anchorPoint,
 }) {
   return showModalBottomSheet(
     context: MyNavigator.navigator.currentState!.context,
@@ -25,12 +34,11 @@ Future<T?> showMenuDialog<T>(
     isScrollControlled: isScrollControlled,
     isDismissible: isDismissible,
     enableDrag: enableDrag,
-    useSafeArea: useSafeArea,
-    routeSettings: routeSettings,
-    transitionAnimationController: animationCtrl,
-    anchorPoint: anchorPoint,
+    useSafeArea: true,
     builder: (_) => MenuDialog(
       list: list,
+      title: title,
+      multiple: multiple,
       selectCountMax: selectCountMax,
       backgroundColor: backgroundColor,
     ),
@@ -38,24 +46,28 @@ Future<T?> showMenuDialog<T>(
 }
 
 class MenuDialog extends StatelessWidget {
-  final List<CardMenuData>? list;
+  final List<CardMenuData> list;
+  final String? title;
+  final bool multiple;
   final int? selectCountMax;
   final Color? backgroundColor;
   final BorderRadiusGeometry? borderRadius;
-
   final ValueNotifier<int> selectCount;
 
   MenuDialog({
     super.key,
-    this.list,
+    List<CardMenuData>? list,
+    this.title,
+    required this.multiple,
     this.selectCountMax,
     this.backgroundColor,
     this.borderRadius,
-  }) : selectCount = (list ?? []).where((e) => e.select).length.notifier<int>();
+  })  : list = list ?? [],
+        selectCount = (list ?? []).where((e) => e.select).length.notifier<int>();
 
   void onEnterClick() {
-    if (list == null) return;
-    List<CardMenuData> selectList = list!.where((item) => item.select).toList();
+    if (list.isEmpty) return;
+    List<CardMenuData> selectList = list.where((item) => item.select).toList();
     MyNavigator.pop(selectList);
   }
 
@@ -71,42 +83,77 @@ class MenuDialog extends StatelessWidget {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           buildTitle(),
-          Flexible(
-            child: SingleChildScrollView(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: List.generate(list?.length ?? 0, buildItem).toList(),
-              ),
-            ),
-          ),
+          buildList(),
           buildButton(),
+          const SizedBox(width: double.infinity, height: 24),
         ],
       ),
     );
   }
 
   Widget buildTitle() {
-    return const Padding(
-      padding: EdgeInsets.only(left: 24, top: 16, bottom: 16),
-      child: Text(
-        '请选择：',
-        style: TextStyle(color: Color(0xFF333333), fontSize: 16, fontWeight: FontWeight.w500),
+    return Padding(
+      padding: const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24),
+      child: Row(
+        children: [
+          Expanded(
+            child: Text(
+              '请选择${title ?? ''}：',
+              style: const TextStyle(color: Color(0xFF333333), fontSize: 16, fontWeight: FontWeight.w500),
+            ),
+          ),
+          MyButton('关闭', alignment: null, onTap: () => MyNavigator.pop()),
+        ],
+      ),
+    );
+  }
+
+  Widget buildList() {
+    if (list.isEmpty) {
+      return Container(
+        alignment: Alignment.center,
+        padding: const EdgeInsets.symmetric(vertical: 24),
+        child: const Text(
+          '没有选项数据',
+          style: TextStyle(fontSize: 16, color: MyColor.c_666666),
+        ),
+      );
+    }
+    return Flexible(
+      child: SingleChildScrollView(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: List.generate(list.length, buildItem).toList(),
+        ),
       ),
     );
   }
 
   Widget buildItem(int index) {
-    var item = list![index];
+    var item = list[index];
     return StatefulBuilder(builder: (_, setState) {
       return GestureDetector(
         behavior: HitTestBehavior.opaque,
         onTap: () {
-          if (!item.select && selectCountMax != null && selectCountMax == selectCount.value) {
-            MyNavigator.showToast('选中不能超过$selectCountMax个');
-            return;
+          if (multiple) {
+            if (!item.select && selectCountMax != null && selectCountMax == selectCount.value) {
+              MyNavigator.showToast('选中不能超过$selectCountMax个');
+              return;
+            }
+            item.select = !item.select;
+            setState(() {});
+          } else {
+            // 取消之前选择
+            for (var value in list) {
+              if (value.select) {
+                value.select = false;
+                break;
+              }
+            }
+            // 选中当前项
+            item.select = true;
+            onEnterClick();
           }
-          item.select = !item.select;
-          setState(() {});
         },
         child: Column(
           mainAxisSize: MainAxisSize.min,
@@ -124,7 +171,7 @@ class MenuDialog extends StatelessWidget {
                 ),
               ),
             ),
-            index < list!.length - 1
+            index < list.length - 1
                 ? const Divider(
                     color: Color(0xFFF3F3F3),
                     height: 0,
@@ -140,8 +187,9 @@ class MenuDialog extends StatelessWidget {
   }
 
   Widget buildButton() {
+    if (!multiple || list.isEmpty) return const SizedBox.shrink();
     return Padding(
-      padding: const EdgeInsets.only(bottom: 16, top: 16),
+      padding: const EdgeInsets.only(top: 16),
       child: Row(
         children: [
           const Spacer(),