knt-shared 1.10.1 → 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();