@elementplus-kit/uikit 1.9.0 → 1.10.0

package/components/dictLabel/index.ts

@@ -1,4 +1 @@
-import DictLabel from "./src/index.vue";
-export * from "./src/index.vue";
-export { DictLabel };
-export default DictLabel;
+export { default as CDictLabel } from "./src/index.vue";

package/components/dictLabel/src/index.vue

@@ -2,20 +2,30 @@
     {{ label }}
 </template>
 <script setup lang="ts">
-import { computed, PropType } from 'vue'
+import { computed, type PropType } from 'vue'
 const props = defineProps({
+    // 字典选项
     options: {
-        type: Array,
+        type: Array as PropType<{ value: string; label: string }[]>,
         default: () => []
     },
+    // 字典值
     value: {
-        type: String as PropType<any>,
         default: ''
     },
+    // 是否将value转换为字符串进行匹配
+    stringify: {
+        type: Boolean,
+        default: false
+    }
 })
 const label = computed(() => {
-    // 处理value为数字的情况 后端字典都是字符串
-    const item = props.options?.find((item) => item.value == props.value.toString());
-    return item?.label || props.value;
-});
+    const item = props.options?.find((item) => {
+        if (!props.stringify) {
+            return item.value === props.value
+        }
+        return item.value === props.value?.toString()
+    })
+    return item?.label || props.value
+})
 </script>

package/components/form/src/FormItem.ts

@@ -192,15 +192,17 @@ export default defineComponent({
             ...handleAttrs(),
             ...handleEvents(),
           },
-          () => {
-            return options?.value?.map((item) => {
-              return h(ElOption, {
-                ...item,
-                label: item.label,
-                value: item.value,
-                key: item.value,
+          {
+            default: () => {
+              return options?.value?.map((item) => {
+                return h(ElOption, {
+                  ...item,
+                  label: item.label,
+                  value: item.value,
+                  key: item.value,
+                });
               });
-            });
+            },
           },
         );
       },

package/components/index.ts

@@ -5,3 +5,4 @@ export * from "./dialog/index.ts";
 export * from "./drawer/index.ts";
 export * from "./search/index.ts";
 export * from "./button/index.ts";
+export * from "./dictLabel/index.ts";

package/components/table/src/index.ts

@@ -5,7 +5,7 @@ import {
   type ExtractPropTypes,
 } from "vue";
 import { ElTable, ElTableColumn } from "element-plus";
-import TableDictLabel from "./tableDictLabel.vue";
+import { CDictLabel } from "@elementplus-kit/uikit";
 import {
   defaultAttrs,
   tableSlots,
@@ -115,7 +115,7 @@ export default defineComponent({
             type: "selection",
             width: 50,
             align: "center",
-          })
+          }),
         );
       }
       if (props.showIndex) {
@@ -125,7 +125,7 @@ export default defineComponent({
             type: "index",
             width: 60,
             align: "center",
-          })
+          }),
         );
       }
 
@@ -167,9 +167,10 @@ export default defineComponent({
           } else if (isArray(item.options)) {
             // column 字典数组
             itemSlot["default"] = (scope: any) =>
-              h(TableDictLabel, {
+              h(CDictLabel, {
                 options: item.options,
                 value: scope.row[item.prop],
+                stringify: true, // value 转换为字符串
               });
           }
 
@@ -188,8 +189,8 @@ export default defineComponent({
               h(
                 ElTableColumn,
                 { ...p, class: "c-table-column" },
-                getColumnContent()
-              )
+                getColumnContent(),
+              ),
             );
           } else {
             const getColumnContent = () => {
@@ -204,8 +205,8 @@ export default defineComponent({
               h(
                 ElTableColumn,
                 { ...p, class: "c-table-column" },
-                getColumnContent()
-              )
+                getColumnContent(),
+              ),
             );
           }
         });
@@ -241,7 +242,7 @@ export default defineComponent({
         {
           default: () => columnList,
           ...getSlots(),
-        }
+        },
       );
     };
 

package/components/table/src/tableDictLabel.vue

@@ -2,14 +2,13 @@
     {{ label }}
 </template>
 <script setup lang="ts">
-import { computed, PropType } from 'vue'
+import { computed, type PropType } from 'vue'
 const props = defineProps({
     options: {
-        type: Array,
+        type: Array as PropType<{ value: string; label: string }[]>,
         default: () => []
     },
     value: {
-        type: String as PropType<any>,
         default: ''
     },
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elementplus-kit/uikit",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "",
   "main": "./components/index.ts",
   "peerDependencies": {