feat(form): requires Increase function type value (#649)

* feat(form): requires Increase function type value * feat(form): requires Increase function type value * fix(form): 修复 rules 赋值错误的问题
vbenjs · May 24, 2021 · 765064a · 765064a
1 parent bbf178f
commit 765064a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/components/Form/src/components/FormItem.vue b/src/components/Form/src/components/FormItem.vue
@@ -174,8 +174,12 @@
           return Promise.resolve();
         }
 
-        if ((!rules || rules.length === 0) && required) {
-          rules = [{ required, validator }];
+        const getRequired = isFunction(required)
+          ? required(unref(getValues))
+          : required;
+
+        if ((!rules || rules.length === 0) && getRequired) {
+          rules = [{ required: getRequired, validator }];
         }
 
         const requiredRuleIndex: number = rules.findIndex(

diff --git a/src/components/Form/src/types/form.ts b/src/components/Form/src/types/form.ts
@@ -149,7 +149,7 @@ export interface FormSchema {
       }) => Recordable)
     | object;
   // Required
-  required?: boolean;
+  required?: boolean | ((renderCallbackParams: RenderCallbackParams) => boolean);
 
   suffix?: string | number | ((values: RenderCallbackParams) => string | number);