knt-shared 1.10.0 → 1.10.2

package/dist/index.esm.js

@@ -5542,6 +5542,7 @@ function useForm(options = {}) {
     });
   };
   const register = async (formInstance) => {
+    var _a;
     await nextTick();
     if (unwatchFormRef) {
       unwatchFormRef();
@@ -5549,8 +5550,9 @@ function useForm(options = {}) {
     }
     formRef.value = formInstance;
     loadedRef.value = true;
-    if (options && Object.keys(options).length > 0) {
-      await setProps(options);
+    const mergedProps = { ...options, ...propsRef.value };
+    if (Object.keys(mergedProps).length > 0) {
+      await setProps(mergedProps);
     }
     initFormModel();
     if (formInstance.formRef) {
@@ -5571,8 +5573,12 @@ function useForm(options = {}) {
       );
     }
     if (pendingValues.value) {
-      await setFieldsValue(pendingValues.value);
-      pendingValues.value = null;
+      const registeredSchemas = (_a = formInstance.getSchema) == null ? void 0 : _a.call(formInstance);
+      if (Array.isArray(registeredSchemas) && registeredSchemas.length > 0) {
+        const pending = pendingValues.value;
+        pendingValues.value = null;
+        await setFieldsValue(pending);
+      }
     }
   };
   const getForm = () => {
@@ -5604,11 +5610,18 @@ function useForm(options = {}) {
     return { ...formModel };
   };
   const setFieldsValue = async (values) => {
+    var _a;
     const form = getFormSafe();
     if (!form) {
       pendingValues.value = { ...pendingValues.value, ...values };
       return;
     }
+    const currentSchemas = (_a = form.getSchema) == null ? void 0 : _a.call(form);
+    const hasSchemas = Array.isArray(currentSchemas) && currentSchemas.length > 0;
+    if (!hasSchemas) {
+      pendingValues.value = { ...pendingValues.value, ...values };
+      return;
+    }
     if (form.setFieldsValue) {
       await form.setFieldsValue(values);
     } else {
@@ -5736,6 +5749,11 @@ function useForm(options = {}) {
     if (form.setProps) {
       await form.setProps(formProps);
     }
+    if (formProps.schemas && pendingValues.value) {
+      const pending = pendingValues.value;
+      pendingValues.value = null;
+      await setFieldsValue(pending);
+    }
   };
   const scrollToField = async (name, options2) => {
     const form = getFormSafe();
@@ -10646,6 +10664,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
     enabled: { type: Boolean, default: true },
+    versionUrl: {},
+    checkInterval: {},
+    sessionKey: {},
     title: { default: "页面超时" },
     content: { default: "页面已超时，请刷新后正常使用" },
     okText: { default: "立即刷新" },
@@ -10654,7 +10675,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const props = __props;
     const { hasNewVersion, start, stop, applyUpdate, dismissUpdate } = useVersionCheck({
-      enabled: props.enabled
+      enabled: props.enabled,
+      versionUrl: props.versionUrl,
+      checkInterval: props.checkInterval,
+      sessionKey: props.sessionKey
     });
     onMounted(() => start());
     onUnmounted(() => stop());