knt-shared 1.2.1 → 1.2.3

package/dist/index.esm.js

@@ -703,9 +703,10 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     autoUpload: { type: Boolean, default: true },
     resultType: { default: "fileList" },
     uploadButtonText: {},
-    uploadButtonType: { default: "primary" }
+    uploadButtonType: { default: "primary" },
+    responseUrlKey: { type: [String, Function], default: void 0 }
   },
-  emits: ["register", "update:modelValue", "change", "success", "error", "progress", "remove", "preview", "exceed"],
+  emits: ["register", "update:modelValue", "change", "success", "handleSuccess", "error", "handlError", "progress", "remove", "preview", "exceed"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emit = __emit;
@@ -713,7 +714,6 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     const fileListRef = ref([]);
     const propsRef = ref({});
     const hasShownActionError = ref(false);
-    const isInternalUpdate = ref(false);
     const processedFiles = ref(/* @__PURE__ */ new Map());
     const getProps = computed(() => {
       return { ...props, ...unref(propsRef) };
@@ -930,7 +930,6 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
       };
     };
     const handleChange = (fileList, currentFile) => {
-      if (isInternalUpdate.value) return;
       const oldLength = fileListRef.value.length;
       const newLength = fileList.length;
       fileListRef.value = fileList;
@@ -940,11 +939,11 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
       const lastStatus = processedFiles.value.get(fileKey);
       if (currentFile.status === "done" && lastStatus !== "done" && !isRemove) {
         processedFiles.value.set(fileKey, "done");
-        emit("success", currentFile.response, currentFile);
+        emit("handleSuccess", currentFile.response, currentFile);
       } else if (currentFile.status === "error" && lastStatus !== "error") {
         processedFiles.value.set(fileKey, "error");
         const error = new Error("上传失败");
-        emit("error", error, currentFile);
+        emit("handlError", error, currentFile);
       }
       if (isRemove) {
         const fileUids = new Set(fileList.map((f) => f.uid));
@@ -970,7 +969,6 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     const updateModelValue = (fileList) => {
       var _a;
       const propsData = unref(getProps);
-      isInternalUpdate.value = true;
       switch (propsData.resultType) {
         case "fileList":
           emit("update:modelValue", fileList);
@@ -991,11 +989,6 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
         default:
           emit("update:modelValue", fileList);
       }
-      nextTick(() => {
-        setTimeout(() => {
-          isInternalUpdate.value = false;
-        }, 50);
-      });
     };
     const parseModelValue = (value) => {
       if (!value) return [];
@@ -1081,8 +1074,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     });
     watch(
       () => props.modelValue,
-      (val, oldVal) => {
-        if (isInternalUpdate.value) return;
+      (val) => {
         fileListRef.value = parseModelValue(val);
       },
       { immediate: true }
@@ -1183,7 +1175,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const BasicUpload = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-10587859"]]);
+const BasicUpload = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-1a5a7ff7"]]);
 const componentMap = {
   Input,
   InputNumber,
@@ -1627,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 || []);
@@ -1638,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);
@@ -1655,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();
@@ -1667,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 {
@@ -3739,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 {
@@ -3752,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();