From 92b1d7945a87e781f08d551ac3909026c8e85335 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Tue, 16 Aug 2022 15:37:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=80=89=E9=A1=B9=EF=BC=8C=E8=B0=83=E6=95=B4=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/like-generator/src/main/resources/vue/index-tree.vue.vm | 2 +-
 server/like-generator/src/main/resources/vue/index.vue.vm      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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 f2da8788..29941b09 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
@@ -65,7 +65,7 @@
             >
             #foreach ($column in $columns)
             #if($column.isList)
-                #if($column.htmlType=="select" || $column.htmlType=="radio" || $column.htmlType=="checkbox")
+                #if($column.dictType!="" && ($column.htmlType=="select" || $column.htmlType=="radio" || $column.htmlType=="checkbox"))
                 <el-table-column label="${column.columnComment}" prop="${column.javaField}" min-width="100">
                     <template #default="{ row }">
                         <dict-value :options="dictData.${column.dictType}" :value="row.${column.javaField}" />
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 616c6dfa..c5c0ae14 100644
--- a/server/like-generator/src/main/resources/vue/index.vue.vm
+++ b/server/like-generator/src/main/resources/vue/index.vue.vm
@@ -70,9 +70,10 @@
                 :data="pager.lists"
                 @selection-change="handleSelectionChange"
             >
+                <el-table-column type="selection" width="50" align="center" />
             #foreach ($column in $columns)
             #if($column.isList)
-                #if($column.htmlType=="select" || $column.htmlType=="radio" || $column.htmlType=="checkbox")
+                #if($column.dictType!="" && ($column.htmlType=="select" || $column.htmlType=="radio" || $column.htmlType=="checkbox"))
                 <el-table-column label="${column.columnComment}" prop="${column.javaField}" min-width="100">
                     <template #default="{ row }">
                         <dict-value :options="dictData.${column.dictType}" :value="row.${column.javaField}" />