refactor: useBeforeCloseDiff逻辑更新

apps/web-antd/src/utils/popup.ts

@@ -47,6 +47,11 @@ export function useBeforeCloseDiff(props: BeforeCloseDiffProps) {
     isInitialized.value = true;
   }
 
+  function resetInitialized() {
+    initialized.value = '';
+    isInitialized.value = false;
+  }
+
   function setSubmitted() {
     isSubmitted.value = true;
   }
@@ -101,6 +106,7 @@ export function useBeforeCloseDiff(props: BeforeCloseDiffProps) {
     onBeforeClose,
     updateInitialized,
     setSubmitted,
+    resetInitialized,
   };
 }
 

apps/web-antd/src/views/system/config/config-modal.vue

@@ -26,7 +26,8 @@ const [BasicForm, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-const { onBeforeClose, updateInitialized, setSubmitted } = useBeforeCloseDiff({
+const { onBeforeClose, updateInitialized, setSubmitted, resetInitialized } =
+  useBeforeCloseDiff({
     initializedGetter: defaultFormValueGetter(formApi),
     currentGetter: defaultFormValueGetter(formApi),
   });
@@ -40,8 +41,7 @@ const [BasicModal, modalApi] = useVbenModal({
     if (!isOpen) {
       return null;
     }
-    try {
+    modalApi.modalLoading(true);
-      modalApi.lock(true);
 
     const { id } = modalApi.getData() as { id?: number | string };
     isUpdate.value = !!id;
@@ -51,11 +51,8 @@ const [BasicModal, modalApi] = useVbenModal({
       await formApi.setValues(record);
     }
     await updateInitialized();
-    } catch (error) {
+
-      console.error(error);
+    modalApi.modalLoading(false);
-    } finally {
-      modalApi.lock(false);
-    }
   },
 });
 
@@ -80,6 +77,7 @@ async function handleConfirm() {
 
 async function handleClosed() {
   await formApi.resetForm();
+  resetInitialized();
 }
 </script>