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 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E6=95=B0=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"

From d2acb7addc992459cab80c28f49eecbb3899380f Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Tue, 16 Aug 2022 18:54:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/like-generator/src/main/resources/vue/edit.vue.vm   | 7 ++++---
 .../src/main/resources/vue/index-tree.vue.vm               | 1 -
 server/like-generator/src/main/resources/vue/index.vue.vm  | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/server/like-generator/src/main/resources/vue/edit.vue.vm b/server/like-generator/src/main/resources/vue/edit.vue.vm
index b702bc0b..a74f5373 100644
--- a/server/like-generator/src/main/resources/vue/edit.vue.vm
+++ b/server/like-generator/src/main/resources/vue/edit.vue.vm
@@ -20,7 +20,7 @@
                         :data="treeList"
                         clearable
                         node-key="${table.treePrimary}"
-                        :props="{label: ${table.treeName}, value: ${table.treePrimary}, children: 'children'}"
+                        :props="{ label: '${table.treeName}', value: '${table.treePrimary}', children: 'children' }"
                         :default-expand-all="true"
                         placeholder="请选择${column.columnComment}"
                         check-strictly
@@ -73,6 +73,7 @@
                             #else
                             :value="item.value"
                             #end
+                            clearable
                             :disabled="!item.status"
                         />
                         #else
@@ -104,7 +105,7 @@
             #elseif($column.htmlType=="datetime")
                 <el-form-item label="${column.columnComment}" prop="${column.javaField}">
                     <el-date-picker
-                        v-model="form.${column.javaField}"
+                        v-model="formData.${column.javaField}"
                         type="date"
                         clearable
                         value-format="YYYY-MM-DD"
@@ -128,7 +129,7 @@
 </template>
 <script lang="ts" setup>
 import type { FormInstance } from 'element-plus'
-import { #if($table.treePrimary && $table.treeParent)${moduleName}Lists,#end ${moduleName}Edit,${moduleName}Add, ${moduleName}Detail } from '@/api/${moduleName}'
+import { #if($table.treePrimary && $table.treeParent)${moduleName}Lists,#end ${moduleName}Edit, ${moduleName}Add, ${moduleName}Detail } from '@/api/${moduleName}'
 import Popup from '@/components/popup/index.vue'
 import feedback from '@/utils/feedback'
 import type { PropType } from 'vue'
diff --git a/server/like-generator/src/main/resources/vue/index-tree.vue.vm b/server/like-generator/src/main/resources/vue/index-tree.vue.vm
index 21266eeb..696789d6 100644
--- a/server/like-generator/src/main/resources/vue/index-tree.vue.vm
+++ b/server/like-generator/src/main/resources/vue/index-tree.vue.vm
@@ -179,7 +179,6 @@ const { dictData } = useDictData<{
 }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields[$dictSize] != ${dict}),#end#end])
 #end
 
-
 const handleAdd = async (${table.treePrimary}?: number) => {
     showEdit.value = true
     await nextTick()
diff --git a/server/like-generator/src/main/resources/vue/index.vue.vm b/server/like-generator/src/main/resources/vue/index.vue.vm
index 5f4daf89..909a3fcf 100644
--- a/server/like-generator/src/main/resources/vue/index.vue.vm
+++ b/server/like-generator/src/main/resources/vue/index.vue.vm
@@ -64,7 +64,8 @@
                     删除
                 </el-button>
             </div>
-            <el-table class="mt-4"
+            <el-table
+                class="mt-4"
                 size="large"
                 v-loading="pager.loading"
                 :data="pager.lists"
@@ -172,7 +173,7 @@ const { dictData } = useDictData<{
 
 const selectData = ref<any[]>([])
 const handleSelectionChange = (selection: any[]) => {
-    selectData.value = selection.map(item => item.${primaryKey})
+    selectData.value = selection.map((item) => item.${primaryKey})
 }
 
 const handleAdd = async () => {