From 8dc15f6bee7b11e00218ff5137856b7ffcc676ec Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Tue, 16 Aug 2022 12:06:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=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

---
 .../src/main/resources/vue/edit.vue.vm        |  3 +--
 .../src/main/resources/vue/index-tree.vue.vm  | 24 +++++++++----------
 2 files changed, 12 insertions(+), 15 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 16a36137..a7aa38ca 100644
--- a/server/like-generator/src/main/resources/vue/edit.vue.vm
+++ b/server/like-generator/src/main/resources/vue/edit.vue.vm
@@ -26,8 +26,7 @@
                         check-strictly
                     />
                 </el-form-item>
-            #end
-            #if($column.htmlType=="input")
+            #elseif($column.htmlType=="input")
                 <el-form-item label="${column.columnComment}" prop="${column.javaField}">
                     <el-input v-model="formData.name" placeholder="请输入${column.columnComment}" />
                 </el-form-item>
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 db89fb7d..f2da8788 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
@@ -19,15 +19,15 @@
                         clearable
                     >
                         #if($column.dictType=="")
-                            <el-option label="请选择字典生成" value="" />
+                        <el-option label="请选择字典生成" value="" />
                         #else
-                            <el-option label="全部" value="" />
-                            <el-option
-                                v-for="(item, index) in dictData.${column.dictType}"
-                                :key="index"
-                                :label="item.name"
-                                :value="item.value"
-                            />
+                        <el-option label="全部" value="" />
+                        <el-option
+                            v-for="(item, index) in dictData.${column.dictType}"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.value"
+                        />
                         #end
                     </el-select>
                 </el-form-item>
@@ -63,9 +63,8 @@
                 row-key="${table.treePrimary}"
                 :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
             >
-        #foreach ($column in $columns)
-        #if($column.isList)
-            #if($column.htmlType=="imageUpload")
+            #foreach ($column in $columns)
+            #if($column.isList)
                 #if($column.htmlType=="select" || $column.htmlType=="radio" || $column.htmlType=="checkbox")
                 <el-table-column label="${column.columnComment}" prop="${column.javaField}" min-width="100">
                     <template #default="{ row }">
@@ -82,8 +81,7 @@
                 <el-table-column label="${column.columnComment}" prop="${column.javaField}" min-width="100" />
                 #end
             #end
-        #end
-        #end
+            #end
                 <el-table-column label="操作" width="160" fixed="right">
                     <template #default="{ row }">
                         <el-button