From 75badfa16059dd6dc856c5c87d322e79d140755b Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Tue, 16 Aug 2022 18:52:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E5=85=B8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=98=BE=E7=A4=BA=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/components/dict-value/index.vue            | 10 +++++++---
 admin/src/layout/default/components/sidebar/logo.vue |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/admin/src/components/dict-value/index.vue b/admin/src/components/dict-value/index.vue
index c8e11664..24200016 100644
--- a/admin/src/components/dict-value/index.vue
+++ b/admin/src/components/dict-value/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
-        <template v-for="(item, index) in options">
-            <span v-if="values.includes(item.value)" :key="index">{{ item.name }}</span>
+        <template v-for="(item, index) in getOptions" :key="index">
+            <span>{{ index != 0 ? '、' : '' }}{{ item.name }}</span>
         </template>
     </div>
 </template>
@@ -13,9 +13,13 @@ const props = defineProps<{
 
 const values = computed(() => {
     if (props.value !== null && typeof props.value !== 'undefined') {
-        return Array.isArray(props.value) ? props.value : [String(props.value)]
+        return Array.isArray(props.value) ? props.value : String(props.value).split(',')
     } else {
         return []
     }
 })
+
+const getOptions = computed(() => {
+    return props.options.filter((item) => values.value.includes(item.value))
+})
 </script>
diff --git a/admin/src/layout/default/components/sidebar/logo.vue b/admin/src/layout/default/components/sidebar/logo.vue
index 1efa3950..d016ab3c 100644
--- a/admin/src/layout/default/components/sidebar/logo.vue
+++ b/admin/src/layout/default/components/sidebar/logo.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="logo">
-        <ImageContain :width="szie" :height="szie" :src="config.webLogo" />
+        <image-contain :width="szie" :height="szie" :src="config.webLogo" />
         <transition name="title-width">
             <div
                 v-show="showTitle"