From 5eadb56698a8c6a18b438d51662eedbc17e314b7 Mon Sep 17 00:00:00 2001
From: LiuJiaNan <15703339975@163.com>
Date: Mon, 9 Feb 2026 14:51:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96FormItemsRenderer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FormBuilder/FormItemsRenderer.js          | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/components/FormBuilder/FormItemsRenderer.js b/src/components/FormBuilder/FormItemsRenderer.js
index 2fc2266..c81055c 100644
--- a/src/components/FormBuilder/FormItemsRenderer.js
+++ b/src/components/FormBuilder/FormItemsRenderer.js
@@ -230,6 +230,15 @@ const FormItemsRenderer = ({
       : (listOptions ?? []);
   };
 
+  // 获取可选项的属性（适用于 SELECT、RADIO、CHECKBOX）
+  const getSelectableItemAttributes = (item, itemsFieldKey) => {
+    const value = item[itemsFieldKey.valueKey];
+    const label = typeof itemsFieldKey.labelKey === "function" ? itemsFieldKey.labelKey(item) : item[itemsFieldKey.labelKey];
+    const disabled = item.disabled;
+
+    return { value, label, disabled };
+  };
+
   // 渲染表单控件
   const renderFormControl = (option) => {
     const componentProps = getComponentProps(option);
@@ -253,9 +262,7 @@ const FormItemsRenderer = ({
         return (
           <Select placeholder={placeholder} showSearch allowClear optionFilterProp="children" {...componentProps}>
             {(option.items || []).map((item) => {
-              const value = item[itemsFieldKey.valueKey];
-              const label = typeof itemsFieldKey.labelKey === "function" ? itemsFieldKey.labelKey(item) : (item[itemsFieldKey.labelKey]);
-              const disabled = item.disabled;
+              const { value, label, disabled } = getSelectableItemAttributes(item, itemsFieldKey);
               return (
                 <Select.Option key={value} value={value} disabled={disabled}>
                   {label}
@@ -269,9 +276,7 @@ const FormItemsRenderer = ({
         return (
           <Radio.Group {...componentProps}>
             {(option.items || []).map((item) => {
-              const value = item[itemsFieldKey.valueKey];
-              const label = typeof itemsFieldKey.labelKey === "function" ? itemsFieldKey.labelKey(item) : (item[itemsFieldKey.labelKey]);
-              const disabled = item.disabled;
+              const { value, label, disabled } = getSelectableItemAttributes(item, itemsFieldKey);
               return (
                 <Radio key={value} value={value} disabled={disabled}>
                   {label}
@@ -289,9 +294,7 @@ const FormItemsRenderer = ({
                 ? (
                     <Row>
                       {(option.items || []).map((item) => {
-                        const value = item[itemsFieldKey.valueKey];
-                        const label = typeof itemsFieldKey.labelKey === "function" ? itemsFieldKey.labelKey(item) : (item[itemsFieldKey.labelKey]);
-                        const disabled = item.disabled;
+                        const { value, label, disabled } = getSelectableItemAttributes(item, itemsFieldKey);
                         return (
                           <Col span={option.checkboxCol} key={value}>
                             <Checkbox value={value} disabled={disabled}>
@@ -304,9 +307,7 @@ const FormItemsRenderer = ({
                   )
                 : (
                     (option.items || []).map((item) => {
-                      const value = item[itemsFieldKey.valueKey];
-                      const label = typeof itemsFieldKey.labelKey === "function" ? itemsFieldKey.labelKey(item) : (item[itemsFieldKey.labelKey]);
-                      const disabled = item.disabled;
+                      const { value, label, disabled } = getSelectableItemAttributes(item, itemsFieldKey);
                       return (
                         <Checkbox key={value} value={value} disabled={disabled}>
                           {label}