From 1f96f089eb3546c682313d29513be04ac72e2de5 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 31 十月 2023 16:21:08 +0800
Subject: [PATCH] Merge branch 'master' of ssh://114.215.109.124:29418/grid-management-vue

---
 src/composables/formConfirm.js |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/composables/formConfirm.js b/src/composables/formConfirm.js
index ef6a057..f036d0b 100644
--- a/src/composables/formConfirm.js
+++ b/src/composables/formConfirm.js
@@ -1,6 +1,6 @@
 // 琛ㄥ崟鐨勭‘璁ゅ拰鍙栨秷
 import { onActivated, onDeactivated, ref, watch } from 'vue';
-import { useCloned } from '@vueuse/core';
+// import { useCloned } from '@vueuse/core';
 import { useMessageBoxTip, useMessageBox } from './messageBox';
 
 export function useFormConfirm({
@@ -70,13 +70,15 @@
     //   manual: true
     // }).cloned.value;
     formRef.value.clearValidate();
+    formRef.value.resetFields();
   };
 
   // 娓呯┖琛ㄥ崟
   const clear = function () {
+    formRef.value.clearValidate();
     edit.value = false;
     isReset = true;
-    formRef.value.resetFields();
+    formObj.value = {};
   };
 
   // 鎻愪氦鎴愬姛鍚�
@@ -93,9 +95,9 @@
           confirmMsg: submit.msg,
           confirmTitle: submit.title,
           onConfirm: async () => {
-            await submit.do();
-            submited();
-            return;
+            return submit.do().then(() => {
+              submited();
+            });
           }
         });
       }
@@ -115,6 +117,7 @@
         }
       });
     } else {
+      formRef.value.clearValidate();
       cancel.do();
     }
   };
@@ -141,5 +144,14 @@
     }
   };
 
-  return { formObj, formRef, edit, active, onSubmit, onCancel, onReset };
+  return {
+    formObj,
+    formRef,
+    edit,
+    active,
+    onSubmit,
+    onCancel,
+    onReset,
+    clear
+  };
 }

--
Gitblit v1.9.3