knt-shared 1.2.2 → 1.2.3

package/dist/index.esm.js

@@ -1619,6 +1619,8 @@ function useForm(options = {}) {
   const formModel = reactive({});
   const loadedRef = ref(false);
   const propsRef = ref({});
+  const pendingValues = ref(null);
+  let unwatchFormRef = null;
   const initFormModel = () => {
     var _a, _b;
     const schemas = unref(((_b = (_a = formRef.value) == null ? void 0 : _a.getSchema) == null ? void 0 : _b.call(_a)) || options.schemas || []);
@@ -1630,12 +1632,38 @@ function useForm(options = {}) {
   };
   const register = async (formInstance) => {
     await nextTick();
+    if (unwatchFormRef) {
+      unwatchFormRef();
+      unwatchFormRef = null;
+    }
     formRef.value = formInstance;
     loadedRef.value = true;
     if (options && Object.keys(options).length > 0) {
       await setProps(options);
     }
     initFormModel();
+    if (formInstance.formRef) {
+      unwatchFormRef = watch(
+        () => formInstance.formRef.value,
+        (val) => {
+          if (val === null) {
+            console.log("表单组件已卸载，重置 useForm 状态");
+            formRef.value = null;
+            loadedRef.value = false;
+            if (unwatchFormRef) {
+              unwatchFormRef();
+              unwatchFormRef = null;
+            }
+          }
+        },
+        { flush: "sync" }
+        // 同步执行，确保及时清理
+      );
+    }
+    if (pendingValues.value) {
+      await setFieldsValue(pendingValues.value);
+      pendingValues.value = null;
+    }
   };
   const getForm = () => {
     const form = unref(formRef);
@@ -1647,7 +1675,16 @@ function useForm(options = {}) {
     return form;
   };
   const getFormSafe = () => {
-    return unref(formRef);
+    var _a;
+    const form = unref(formRef);
+    if (!form) return null;
+    if (((_a = form.formRef) == null ? void 0 : _a.value) === null) {
+      console.log("检测到失效的表单实例，清理引用");
+      formRef.value = null;
+      loadedRef.value = false;
+      return null;
+    }
+    return form;
   };
   const getFieldsValue = () => {
     const form = getFormSafe();
@@ -1659,7 +1696,10 @@ function useForm(options = {}) {
   };
   const setFieldsValue = async (values) => {
     const form = getFormSafe();
-    if (!form) return;
+    if (!form) {
+      pendingValues.value = { ...pendingValues.value, ...values };
+      return;
+    }
     if (form.setFieldsValue) {
       await form.setFieldsValue(values);
     } else {
@@ -3731,9 +3771,7 @@ function useModal(props) {
   const openModal = (visible = true, data) => {
     const modal = getModal();
     if (!modal) return;
-    if (data !== void 0) {
-      modal.setModalProps({ _data: data });
-    }
+    modal.setModalProps({ _data: data });
     if (visible) {
       modal.openModal();
     } else {
@@ -3744,6 +3782,9 @@ function useModal(props) {
     const modal = getModal();
     if (!modal) return;
     modal.closeModal();
+    setTimeout(() => {
+      modal.setModalProps({ _data: void 0 });
+    });
   };
   const setModalProps = (modalProps) => {
     const modal = getModal();