fix(useForm): immdiate validate doesn't work (#4646)

vueComponent · Sep 15, 2021 · 27b258c · 27b258c
1 parent 3b8b19e
commit 27b258c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/components/form/useForm.ts b/components/form/useForm.ts
@@ -332,16 +332,20 @@ function useForm(
     return info;
   };
   let oldModel = initialModel;
+  let isFirstTime = true;
   const modelFn = (model: { [x: string]: any }) => {
     const names = [];
     rulesKeys.value.forEach(key => {
       const prop = getPropByPath(model, key, false);
       const oldProp = getPropByPath(oldModel, key, false);
-      if (!isEqual(prop.v, oldProp.v)) {
+      const isFirstValidation = isFirstTime && options?.immediate && prop.isValid;
+
+      if (isFirstValidation || !isEqual(prop.v, oldProp.v)) {
         names.push(key);
       }
     });
     validate(names, { trigger: 'change' });
+    isFirstTime = false;
     oldModel = cloneDeep(model);
   };