x-ui-design 0.6.59 → 0.6.61

package/dist/index.esm.js

@@ -624,18 +624,19 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange, scrollToFir
   const errorSubscribers = useRef({});
   const fieldSubscribers = useRef({});
   const formSubscribers = useRef([]);
-  function getFormFields() {
-    return Object.assign({}, ...Object.values(formRef.current));
-  }
+  // function getFormFields() {
+  //   return formRef.current[stepRef.current]
+  //   // return Object.assign({}, ...Object.values());
+  // }
   function getFieldInstance(name) {
     return name ? fieldInstancesRef.current[name] : fieldInstancesRef.current;
   }
   function getFieldValue(name) {
-    const formData = getFormFields();
+    const formData = formRef.current[stepRef.current];
     return formData[name];
   }
   function getFieldsValue(nameList) {
-    const formData = getFormFields();
+    const formData = formRef.current[stepRef.current];
     console.info({
       stepRef: stepRef.current,
       formRef: formRef.current
@@ -664,7 +665,13 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange, scrollToFir
     if (!reset && reset !== null && ([undefined, null].includes(value) || formRef.current[stepRef.current][name] === value)) {
       return;
     }
-    formRef.current[stepRef.current][name] = value;
+    if (reset === true) {
+      Object.entries(formRef.current).forEach(([key]) => {
+        formRef.current[+key][name] = value;
+      });
+    } else {
+      formRef.current[stepRef.current][name] = value;
+    }
     if (touch) {
       touchedFieldsRef.current.add(name);
     }
@@ -794,10 +801,11 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange, scrollToFir
     return results.every(valid => valid);
   }
   function resetFields(nameList, showError = true) {
-    const formData = getFormFields();
+    const formData = Object.assign({}, ...Object.values(formRef.current));
     if (nameList?.length) {
       nameList.forEach(name => {
         formData[name] = initialValues[name];
+        trashFormRef.current[name] = initialValues[name];
         touchedFieldsRef.current.delete(name);
         delete warningsRef.current[name];
         errorsRef.current[name] = [];
@@ -817,9 +825,9 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange, scrollToFir
     setIsReseting(prev => !prev);
   }
   async function submit() {
-    const formData = getFormFields();
+    const formData = Object.assign({}, ...Object.values(formRef.current));
     return (await validateFields()) ? (() => {
-      formHandlersRef.current.onFinish?.(formData);
+      formHandlersRef.current.onFinish?.(Object.assign({}, ...Object.values(formRef.current)));
       return formData;
     })() : undefined;
   }
@@ -877,7 +885,6 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange, scrollToFir
   }
   function changeStep(step) {
     stepRef.current = step ?? 0;
-    console.info('stepRef', stepRef.current);
     if (!formRef.current[stepRef.current]) {
       formRef.current[stepRef.current] = {};
     }