Merge branch 'master' of http://git.ycjcjy.com/nanyang/farmer_client

lib/widgets/Modal.dart

@@ -1,3 +1,5 @@
+import 'dart:ffi';
+
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
@@ -9,26 +11,37 @@ typedef ModalFunc = dynamic Function();
 /// func 函数如果返回 bool 值, 则只有 true 的情况下才默认关闭弹窗
 /// 如果返回 Future , 则只有正常结束的时候 才关闭弹窗
 /// 其余情况, 都默认关闭弹窗
-void _handleFunc(ModalFunc? func) {
+void _handleFunc(ModalFunc? func, bool lazy) {
+  // 是否立即关闭
+  _close (bool canClose) {
+    if (canClose) {
+      _closeModal();
+    }
+  };
+
+  // 如果 lazy 是 true 则不会立即关闭
+  _close(!lazy);
+
   if (null != func) {
     dynamic res = func();
     if (res.runtimeType == bool) {
-      if (res) {
-        _closeModal();
+      if (res && lazy) {
+        _close(lazy);
       }
     } else if (res is Future) {
-      res.then((_) => _closeModal());
+      res.then((_) => _close(lazy));
     } else {
-      _closeModal();
+      _close(lazy);
     }
   } else {
-    _closeModal();
+    _close(lazy);
   }
 }
 
 /// 打开一个 dialog
 void showDialog(
     {required String title,
+      lazy = false,
     String? message,
     Widget? content,
     ModalFunc? onConfirm,
@@ -38,14 +51,15 @@ void showDialog(
     title: title,
     message: message,
     content: content,
-    onConfirm: () => _handleFunc(onConfirm),
-    onCancel: () => _handleFunc(onCancel),
+    onConfirm: () => _handleFunc(onConfirm, lazy),
+    onCancel: () => _handleFunc(onCancel, lazy),
   ));
 }
 
 /// 打开一个 alert
 void showAlert(
     {required String title,
+      bool lazy = false,
     String? message,
     Widget? content,
     ModalFunc? onConfirm}) {
@@ -54,7 +68,7 @@ void showAlert(
     title: title,
     message: message,
     content: content,
-    onConfirm: () => _handleFunc(onConfirm),
+    onConfirm: () => _handleFunc(onConfirm, lazy),
   ));
 }
 

pubspec.lock

@@ -185,7 +185,7 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_easyloading
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.3"
   flutter_easyrefresh:
@@ -225,7 +225,7 @@ packages:
     dependency: transitive
     description:
       name: flutter_spinkit
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "5.1.0"
   flutter_test: