Browse Source

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

fix: 修复rule validator type默认为string
pull/3087/head
invalid w 3 years ago
committed by GitHub
parent
commit
10d6cc9b60
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/components/Form/src/components/FormItem.vue
  2. 3
      src/components/Form/src/helper.ts

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
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)) {

Loading…
Cancel
Save