diff --git a/src/components/FormBuilder/FormItemsRenderer.js b/src/components/FormBuilder/FormItemsRenderer.js index 7db38cf..da55da7 100644 --- a/src/components/FormBuilder/FormItemsRenderer.js +++ b/src/components/FormBuilder/FormItemsRenderer.js @@ -194,17 +194,6 @@ const FormItemsRenderer = ({ ].includes(option.render); 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; @@ -440,7 +429,7 @@ const FormItemsRenderer = ({ labelCol={col.labelCol} wrapperCol={col.wrapperCol} preserve={preserve} - required={renderLabel(option) === " " ? false : getRequired(option.required)} + required={useAutoGenerateRequired ? (renderLabel(option) === " " ? false : getRequired(option.required)) : false} colon={renderLabel(option) !== " "} {...formItemProps} > @@ -580,7 +569,7 @@ const FormItemsRenderer = ({ labelCol={col.labelCol} wrapperCol={col.wrapperCol} preserve={false} - required={renderLabel(listOption) === " " ? false : getRequired(listOption.required)} + required={useAutoGenerateRequired ? (renderLabel(listOption) === " " ? false : getRequired(listOption.required)) : false} colon={renderLabel(listOption) !== " "} {...formItemProps} >