From 2d3d56ff801b73afdb779267004d740f9beafe57 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 31 十月 2023 16:09:44 +0800
Subject: [PATCH] 2023.10.31

---
 src/composables/formConfirm.js |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/composables/formConfirm.js b/src/composables/formConfirm.js
index 43b3d35..f036d0b 100644
--- a/src/composables/formConfirm.js
+++ b/src/composables/formConfirm.js
@@ -75,9 +75,10 @@
 
   // 娓呯┖琛ㄥ崟
   const clear = function () {
+    formRef.value.clearValidate();
     edit.value = false;
     isReset = true;
-    formObj.value = {}
+    formObj.value = {};
   };
 
   // 鎻愪氦鎴愬姛鍚�
@@ -94,9 +95,9 @@
           confirmMsg: submit.msg,
           confirmTitle: submit.title,
           onConfirm: async () => {
-            await submit.do();
-            submited();
-            return;
+            return submit.do().then(() => {
+              submited();
+            });
           }
         });
       }
@@ -116,6 +117,7 @@
         }
       });
     } else {
+      formRef.value.clearValidate();
       cancel.do();
     }
   };
@@ -142,5 +144,14 @@
     }
   };
 
-  return { formObj, formRef, edit, active, onSubmit, onCancel, onReset, clear };
+  return {
+    formObj,
+    formRef,
+    edit,
+    active,
+    onSubmit,
+    onCancel,
+    onReset,
+    clear
+  };
 }

--
Gitblit v1.9.3