front_library
/
zy-react-library
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(FormBuilder): 修复因1.3.0版本造成的不必填字段显示*号，但是还不验证必填项问题

master
LiuJiaNan 2026-05-21 16:23:12 +08:00
parent aa6c2b1705
commit e45028d6bd
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/FormBuilder/FormItemsRenderer.js
View File

@ -194,17 +194,6 @@ const FormItemsRenderer = ({
].includes(option.render); ].includes(option.render);
rules.push({ required: true, message: `${isBlurTrigger ? "请输入" : "请选择"}${option.label}` }); rules.push({ required: true, message: `${isBlurTrigger ? "请输入" : "请选择"}${option.label}` });
if (option.rules) {
if (Array.isArray(option.rules)) {
rules.push(...option.rules);
}
else {
rules.push(option.rules);
}
}
return rules;
} }
return option.rules ? (Array.isArray(option.rules) ? [...option.rules, ...rules] : [option.rules, ...rules]) : rules; return option.rules ? (Array.isArray(option.rules) ? [...option.rules, ...rules] : [option.rules, ...rules]) : rules;
@ -440,7 +429,7 @@ const FormItemsRenderer = ({
labelCol={col.labelCol} labelCol={col.labelCol}
wrapperCol={col.wrapperCol} wrapperCol={col.wrapperCol}
preserve={preserve} preserve={preserve}
required={renderLabel(option) === " " ? false : getRequired(option.required)} required={useAutoGenerateRequired ? (renderLabel(option) === " " ? false : getRequired(option.required)) : false}
colon={renderLabel(option) !== " "} colon={renderLabel(option) !== " "}
{...formItemProps} {...formItemProps}
> >
@ -580,7 +569,7 @@ const FormItemsRenderer = ({
labelCol={col.labelCol} labelCol={col.labelCol}
wrapperCol={col.wrapperCol} wrapperCol={col.wrapperCol}
preserve={false} preserve={false}
required={renderLabel(listOption) === " " ? false : getRequired(listOption.required)} required={useAutoGenerateRequired ? (renderLabel(listOption) === " " ? false : getRequired(listOption.required)) : false}
colon={renderLabel(listOption) !== " "} colon={renderLabel(listOption) !== " "}
{...formItemProps} {...formItemProps}
> >