github_mirrors/vue-vben-admin
1
0
Fork 0
mirror of https://github.com/vbenjs/vue-vben-admin.git synced 2025-01-24 18:40:22 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

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

Browse Source 
fix: 修复rule validator type默认为string
This commit is contained in:
invalid w 2023-09-27 17:03:25 +08:00 committed by GitHub
commit 10d6cc9b60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Form/src/components/FormItem.vue
View File

@ -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
View File

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