cosey 0.4.46 → 0.4.47

package/components/field/components/select/select.vue.js

@@ -2,7 +2,7 @@ import { ElSelect, ElOptionGroup, ElOption } from 'element-plus';
 import { defineComponent, computed, unref, h, mergeProps } from 'vue';
 import { fieldSelectOmitKeys, flatGroup } from './select.js';
 import { omit } from 'lodash-es';
-import { isFunction } from '../../../../utils/is.js';
+import { isFunction, isObject } from '../../../../utils/is.js';
 import { useLocale } from '../../../../hooks/useLocale.js';
 import { addNullablePlaceholder } from '../../../../utils/vue.js';
 import { getLabelByValue } from '../../../../utils/collection.js';
@@ -43,7 +43,7 @@ var stdin_default = defineComponent((props, {
     const optionProps = componentProps.value.optionProps;
     return h(ElOption, {
       ...option,
-      key: option.value,
+      key: isObject(option.value) && componentProps.value.valueKey ? option.value[componentProps.value.valueKey] : option.value,
       ...(isFunction(optionProps) ? optionProps(option, index) : optionProps)
     }, slots.option ? () => slots.option(option, index) : void 0);
   }

package/components/field/components/select-v2/select-v2.d.ts

@@ -13,6 +13,7 @@ export interface FieldSelectV2Props extends FieldComponentCommonProps {
     } & {
         labelKey?: string;
         valueKey?: string;
+        optionProps?: (props: Record<PropertyKey, any>, index: number) => Record<PropertyKey, any>;
     };
     componentSlots?: Partial<FieldSelectV2Slots>;
 }

package/components/field/components/select-v2/select-v2.vue.js

@@ -1,5 +1,5 @@
 import { ElSelectV2 } from 'element-plus';
-import { defineComponent, computed, h, mergeProps } from 'vue';
+import { defineComponent, computed, unref, h, mergeProps } from 'vue';
 import { flatGroup } from './select-v2.js';
 import { useLocale } from '../../../../hooks/useLocale.js';
 import { addNullablePlaceholder } from '../../../../utils/vue.js';
@@ -12,6 +12,22 @@ var stdin_default = defineComponent((props, {
     t
   } = useLocale();
   const componentProps = computed(() => props.componentProps || {});
+  const childrenKey = computed(() => componentProps.value.props?.options || "children");
+  const optionProps = computed(() => componentProps.value.optionProps || (option => option));
+  function convertRecur(options) {
+    return options.map((option, index) => {
+      if (childrenKey.value in option) {
+        return {
+          ...optionProps.value(option, index),
+          [childrenKey.value]: convertRecur(option[childrenKey.value])
+        };
+      }
+      return optionProps.value(option, index);
+    });
+  }
+  const convertedOptions = computed(() => {
+    return convertRecur(unref(componentProps.value.options) ?? []);
+  });
   return () => {
     if (props.readonly) {
       const value = componentProps.value.modelValue;
@@ -26,7 +42,9 @@ var stdin_default = defineComponent((props, {
       style: {
         verticalAlign: "top"
       }
-    }, componentProps.value), slots);
+    }, componentProps.value, {
+      options: convertedOptions.value
+    }), slots);
   };
 }, {
   name: "FieldSelectV2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cosey",
-  "version": "0.4.46",
+  "version": "0.4.47",
   "description": "基于 Vue3 + vite 的后台管理系统框架",
   "type": "module",
   "main": "index.js",