From d8e946bbd995553a9c26c4eaf3c28ad98503e5f7 Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Mon, 15 Aug 2022 16:39:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hxkj/generator/util/VelocityUtil.java |  2 +-
 .../src/main/resources/java/voDetail.java.vm  |  2 +-
 .../src/main/resources/vue/index.vue.vm       | 20 +++++++++++++++----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java
index 64f000cf..9f28599a 100644
--- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java
+++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java
@@ -52,7 +52,7 @@ public class VelocityUtil {
             if (column.getIsList() == 1) {
                 listFields.add(column.getColumnName());
             }
-            if (column.getIsDetail() == 1) {
+            if (column.getIsEdit() == 1) {
                 detailFields.add(column.getColumnName());
             }
             if (column.getIsQuery() == 1) {
diff --git a/server/like-generator/src/main/resources/java/voDetail.java.vm b/server/like-generator/src/main/resources/java/voDetail.java.vm
index a8ff435c..1cf85a3c 100644
--- a/server/like-generator/src/main/resources/java/voDetail.java.vm
+++ b/server/like-generator/src/main/resources/java/voDetail.java.vm
@@ -13,7 +13,7 @@ public class ${EntityName}DetailVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
-#if($column.isDetail==1)
+#if($column.isEdit==1)
     #if($dateFields.contains($column.columnName))
     private String ${column.javaField}; // ${column.columnComment}
     #else
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 ddf24315..e8df59e6 100644
--- a/server/like-generator/src/main/resources/vue/index.vue.vm
+++ b/server/like-generator/src/main/resources/vue/index.vue.vm
@@ -46,7 +46,7 @@
         </el-card>
         <el-card class="!border-none mt-4" shadow="never">
             <div>
-                <el-button v-perms="['dept.jobs/add']" type="primary" @click="handleAdd()">
+                <el-button v-perms="['${moduleName}/add']" type="primary" @click="handleAdd()">
                     <template #icon>
                         <icon name="el-icon-Plus" />
                     </template>
@@ -62,8 +62,20 @@
                         <dict-value :options="dictData.${column.dictType}" :value="row.${column.javaField}" />
                     </template>
                 </el-table-column>
-                #elseif ($column.htmlType=="datetime")
+                #elseif($column.htmlType=="datetime")
                 <el-table-column label="${column.columnComment}" prop="${column.javaField}" min-width="180" />
+                #elseif($column.htmlType=="imageUpload")
+                <el-table-column label="${column.columnComment}" prop="${column.javaField}" min-width="60">
+                    <template #default="{ row }">
+                        <image-contain width="50px" height="50px" :src="row.${column.javaField}" />
+                    </template>
+                </el-table-column>
+                #elseif($column.htmlType=="select" || $column.htmlType=="radio")
+                <el-table-column label="${column.columnComment}" prop="${column.javaField}">
+                    <template #default="{ row }">
+                        <dict-value :options="dictData.${column.dictType}" :value="row.${column.javaField}" />
+                    </template>
+                </el-table-column>
                 #else
                 <el-table-column label="${column.columnComment}" prop="${column.javaField}" min-width="100" />
                 #end
@@ -123,8 +135,8 @@
         fetchFun: ${moduleName}Lists,
         params: queryParams
     })
-    #if($dictFields!="")
 
+    #if($dictFields!="")
     const { dictData } = useDictData<{
         #foreach ($column in $columns)
         #if($column.dictType!="")
@@ -132,8 +144,8 @@
         #end
         #end
     }>([${dictFields}])
-    #end
 
+    #end
     const handleAdd = async () => {
         showEdit.value = true
         await nextTick()