Просмотр исходного кода

Merge pull request #3082 from wangjue666/fix-form-rule-validate

fix: 修复rule validator type默认为string
invalid w 1 год назад
Родитель
Сommit
10d6cc9b60

+ 0 - 4
src/components/Form/src/components/FormItem.vue

@@ -220,10 +220,6 @@
             rule.required = false;
           }
           if (component) {
-            if (!Reflect.has(rule, 'type')) {
-              rule.type = component === 'InputNumber' ? 'number' : 'string';
-            }
-
             rule.message = rule.message || defaultMsg;
 
             if (component.includes('Input') || component.includes('Textarea')) {

+ 3 - 0
src/components/Form/src/helper.ts

@@ -40,6 +40,9 @@ export function setComponentRuleType(
   component: ComponentType,
   valueFormat: string,
 ) {
+  if (Reflect.has(rule, 'type')) {
+    return;
+  }
   if (['DatePicker', 'MonthPicker', 'WeekPicker', 'TimePicker'].includes(component)) {
     rule.type = valueFormat ? 'string' : 'object';
   } else if (['RangePicker', 'Upload', 'CheckboxGroup', 'TimePicker'].includes(component)) {