From e45028d6bdb0b071300cd3373aeb326ad73a5928 Mon Sep 17 00:00:00 2001
From: LiuJiaNan <15703339975@163.com>
Date: Thu, 21 May 2026 16:23:12 +0800
Subject: [PATCH] =?UTF-8?q?refactor(FormBuilder):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=9B=A01.3.0=E7=89=88=E6=9C=AC=E9=80=A0=E6=88=90=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8D=E5=BF=85=E5=A1=AB=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?*=E5=8F=B7=EF=BC=8C=E4=BD=86=E6=98=AF=E8=BF=98=E4=B8=8D?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=BF=85=E5=A1=AB=E9=A1=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormBuilder/FormItemsRenderer.js | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

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}
                             >