merge

2022-10-09 17:27:46 +08:00
parent 8b4fa1aa21 00232b11ed
commit 232a0f5396
16 changed files with 208 additions and 190 deletions
--- a/src/components/Form/src/components/useRenderSelect.tsx
+++ b/src/components/Form/src/components/useRenderSelect.tsx
@@ -31,8 +31,15 @@ export const useRenderSelect = (slots: Slots) => {
    // 如果有别名，就取别名
    const labelAlias = item?.componentProps?.optionsAlias?.labelField
    const valueAlias = item?.componentProps?.optionsAlias?.valueField
+
+    const { label, value, ...other } = option
+
    return (
-      <ElOption label={option[labelAlias || 'label']} value={option[valueAlias || 'value']}>
+      <ElOption
+        label={labelAlias ? option[labelAlias] : label}
+        value={valueAlias ? option[valueAlias] : value}
+        {...other}
+      >
        {{
          default: () =>
            // option 插槽名规则，{field}-option