From ad2146f3bd4df4720bf86fef14e33f1dbbd355de Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Thu, 25 Apr 2024 19:38:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(form):=20select=20option=20=E5=9C=A8?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89adapter=E7=9A=84=E6=97=B6=E5=80=99=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=BD=BF=E7=94=A8el-option?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/form/src/fields/Select.vue | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/packages/form/src/fields/Select.vue b/packages/form/src/fields/Select.vue
index 32dd61b1..fcf8fbdf 100644
--- a/packages/form/src/fields/Select.vue
+++ b/packages/form/src/fields/Select.vue
@@ -23,24 +23,23 @@
       <component
         v-for="(group, index) in (options as SelectGroupOption[])"
         :key="index"
-        :is="optionGroupComponent?.component"
-        v-bind="
-          optionGroupComponent?.props({
-            label: group.label,
-            disabled: group.disabled,
-          })
-        "
+        :is="optionGroupComponent?.component || 'el-option-group'"
+        v-bind="optionGroupComponent?.props(group) || group"
       >
         <component
           v-for="(item, index) in group.options"
-          :is="optionComponent?.component"
+          :is="optionComponent?.component || 'el-option'"
           :key="index"
           v-bind="
             optionComponent?.props({
               label: item.label || item.text,
               value: item.value,
               disabled: item.disabled,
-            })
+            }) || {
+              label: item.label || item.text,
+              value: item.value,
+              disabled: item.disabled,
+            }
           "
         >
         </component>
@@ -51,14 +50,8 @@
         v-for="option in (options as SelectOption[])"
         class="tmagic-design-option"
         :key="config.valueKey ? option.value[config.valueKey] : option.value"
-        :is="optionComponent?.component"
-        v-bind="
-          optionComponent?.props({
-            label: option.text,
-            value: option.value,
-            disabled: option.disabled,
-          })
-        "
+        :is="optionComponent?.component || 'el-option'"
+        v-bind="optionComponent?.props(option) || option"
       >
       </component>
     </template>