x-ui-design 0.2.91 → 0.2.92

package/dist/esm/types/types/form.d.ts

@@ -83,7 +83,7 @@ export interface FormItemChildComponentProps {
 export interface FormInstance {
     submit: () => Promise<Record<string, RuleTypes> | undefined>;
     setFields: (fields: FieldData[]) => void;
-    resetFields: (nameList?: string[], showError?: boolean) => void;
+    resetFields: (nameList?: string[], showError?: boolean | null) => void;
     getFieldError: (name: string) => string[];
     registerField: (name: string, rules?: RuleObject[]) => void;
     setFieldValue: (name: string, value: RuleTypes) => void;

package/dist/index.esm.js

@@ -638,12 +638,18 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange) => {
       errors: err
     }));
   }
-  function setFieldValue(name, value, errors, reset) {
-    if (!reset && ([undefined, null].includes(value) || formRef.current[name] === value)) {
+  function setFieldValue(name, value, errors, reset = null) {
+    if (!reset && reset !== null && ([undefined, null].includes(value) || formRef.current[name] === value)) {
       return;
     }
     formRef.current[name] = value;
     touchedFieldsRef.current.add(name);
+    if (reset === null) {
+      setErrors({
+        [name]: []
+      });
+      return;
+    }
     if (!errors?.length) {
       validateField(name).then(() => {
         const allValues = getFieldsValue();
@@ -737,37 +743,23 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange) => {
     const results = await Promise.all(fieldsToValidate.map(name => validateField(name)));
     return results.every(valid => valid);
   }
-  function resetFields(nameList, showError = false) {
+  function resetFields(nameList, showError = true) {
     if (nameList?.length) {
       nameList.forEach(name => {
         formRef.current[name] = initialValues[name];
         touchedFieldsRef.current.delete(name);
         delete warningsRef.current[name];
-        if (showError) {
-          setErrors(prev => ({
-            ...prev,
-            [name]: []
-          }));
-          setFieldValue(name, initialValues[name], undefined, true);
-        } else {
-          setFieldValue(name, initialValues[name], undefined, true);
-          setErrors(prev => ({
-            ...prev,
-            [name]: []
-          }));
-        }
+        setErrors(prev => ({
+          ...prev,
+          [name]: []
+        }));
+        setFieldValue(name, initialValues[name], undefined, showError);
       });
     } else {
       touchedFieldsRef.current.clear();
       warningsRef.current = {};
       Object.keys(formRef.current).forEach(name => {
-        setFieldValue(name, initialValues[name], undefined, true);
-        if (!showError) {
-          setErrors(prev => ({
-            ...prev,
-            [name]: []
-          }));
-        }
+        setFieldValue(name, initialValues[name], undefined, showError);
       });
     }
     formSubscribers.current.forEach(callback => callback(getFieldsValue()));