fix: 修复afterSubmit返回false仍然关闭对话框的bug

fast-crud · Oct 27, 2023 · 80337ff · 80337ff
1 parent 26ff43b
commit 80337ff
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/packages/fast-admin/fs-admin-antdv b/packages/fast-admin/fs-admin-antdv
diff --git a/packages/fast-admin/fs-admin-antdv4 b/packages/fast-admin/fs-admin-antdv4
diff --git a/packages/fast-admin/fs-admin-element b/packages/fast-admin/fs-admin-element
diff --git a/packages/fast-admin/fs-admin-naive-ui b/packages/fast-admin/fs-admin-naive-ui
diff --git a/packages/fast-crud/src/components/crud/fs-form-wrapper.tsx b/packages/fast-crud/src/components/crud/fs-form-wrapper.tsx
@@ -185,7 +185,10 @@ export default defineComponent({
     async function submit() {
       loading.value = true;
       try {
-        await formRef.value.submit();
+        const success = await formRef.value.submit();
+        if (success === false) {
+          return;
+        }
         close();
       } finally {
         loading.value = false;

diff --git a/packages/fast-crud/src/components/crud/fs-form.vue b/packages/fast-crud/src/components/crud/fs-form.vue
@@ -517,7 +517,7 @@ export default defineComponent({
       if (props.beforeSubmit) {
         const ret = await props.beforeSubmit(submitScope);
         if (ret === false) {
-          return;
+          return false;
         }
       }
 
@@ -532,14 +532,14 @@ export default defineComponent({
         const res = await props.doSubmit(submitScope);
         submitScope.res = res;
         if (res === false) {
-          return;
+          return false;
         }
       }
       ctx.emit("submit", submitScope);
       if (props.afterSubmit) {
         const success = await props.afterSubmit(submitScope);
         if (success === false) {
-          return;
+          return false;
         }
       }
       ctx.emit("success", submitScope);