yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(component): fix: 修复rule validator类型默认为string，导致 radio 等组件在 setFormValues 时，如果值不是string类型，提示校验错误

pull/38/head
xingyu 2023-10-10 10:57:48 +08:00
parent 97de2d680b
commit 781f7c9cd1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,9 +200,6 @@ export default defineComponent({
rule.required = false rule.required = false
if (component) { if (component) {
if (!Reflect.has(rule, 'type'))
rule.type = component === 'InputNumber' ? 'number' : 'string'
rule.message = rule.message || defaultMsg rule.message = rule.message || defaultMsg
if (component.includes('Input') || component.includes('Textarea')) if (component.includes('Input') || component.includes('Textarea'))

3
src/components/Form/src/helper.ts
View File

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