From e63253f11b9b7dc12463250be8ee880671145d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E4=BB=8A?=
 <11555891+metabytes@user.noreply.gitee.com>
Date: Mon, 7 Apr 2025 10:15:06 +0000
Subject: [PATCH] =?UTF-8?q?update=20src/components/Dict/index.vue.=20?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=A2=9E=E5=8A=A0=20select-multiple=20?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 如今 <11555891+metabytes@user.noreply.gitee.com>
---
 src/components/Dict/index.vue | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/components/Dict/index.vue b/src/components/Dict/index.vue
index 14dbc9c7..35f3b48e 100644
--- a/src/components/Dict/index.vue
+++ b/src/components/Dict/index.vue
@@ -1,9 +1,10 @@
 <template>
   <el-select
-    v-if="type === 'select'"
+    v-if="type === 'select' || type === 'select-multiple'"
     v-model="selectedValue"
     :placeholder="placeholder"
     :disabled="disabled"
+    :multiple="type === 'select-multiple'"
     clearable
     :style="style"
     @change="handleChange"
@@ -93,28 +94,30 @@ const emit = defineEmits(["update:modelValue"]);
 const options = ref<Array<{ label: string; value: string | number }>>([]);
 
 const selectedValue = ref<any>(
-  typeof props.modelValue === "string" || typeof props.modelValue === "number"
-    ? props.modelValue
-    : Array.isArray(props.modelValue)
+  ["select-multiple", "checkbox"].includes(props.type)
+    ? Array.isArray(props.modelValue)
+      ? props.modelValue
+      : []
+    : typeof props.modelValue === "string" || typeof props.modelValue === "number"
       ? props.modelValue
       : undefined
 );
 
 // 监听 modelValue 和 options 的变化
 watch(
-  [() => props.modelValue, () => options.value],
-  ([newValue, newOptions]) => {
-    if (newOptions.length > 0 && newValue !== undefined) {
-      if (props.type === "checkbox") {
-        selectedValue.value = Array.isArray(newValue) ? newValue : [];
-      } else {
+  [() => props.modelValue, () => props.type, () => options.value],
+  ([newValue, newType, newOptions]) => {
+    if (["select-multiple", "checkbox"].includes(newType)) {
+      selectedValue.value = Array.isArray(newValue) ? newValue : [];
+    } else {
+      if (newOptions.length > 0 && newValue !== undefined && newValue !== null) {
         const matchedOption = newOptions.find(
           (option) => String(option.value) === String(newValue)
         );
-        selectedValue.value = matchedOption?.value;
+        selectedValue.value = matchedOption?.value ?? undefined;
+      } else {
+        selectedValue.value = undefined;
       }
-    } else {
-      selectedValue.value = undefined;
     }
   },
   { immediate: true }
-- 
Gitee