From 5ffd61f25c4fd15632e8bb6e9bde98f213f41b6f Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Tue, 16 Aug 2022 16:08:54 +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

---
 .../generator/service/impl/GenerateServiceImpl.java  |  2 +-
 .../java/com/hxkj/generator/util/VelocityUtil.java   |  4 ++--
 .../src/main/resources/vue/index-tree.vue.vm         | 12 +++++-------
 .../src/main/resources/vue/index.vue.vm              | 10 ++++------
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java
index b8a10b7b..37bbbd37 100644
--- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java
+++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java
@@ -372,7 +372,7 @@ public class GenerateServiceImpl implements IGenerateService {
             Template tpl = Velocity.getTemplate(template, GenConstants.UTF8);
             tpl.merge(context, sw);
             map.put(template.replace(".vm", ""), sw.toString());
-            System.out.println(sw);
+            // System.out.println(sw);
         }
 
         return map;
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 7606fd87..b0f55d36 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
@@ -61,7 +61,7 @@ public class VelocityUtil {
             if (column.getIsPk() == 1) {
                 primaryKey = column.getJavaField();
             }
-            if (StringUtil.isNotEmpty(column.getDictType())) {
+            if (StringUtil.isNotEmpty(column.getDictType()) && !dictFields.contains(column.getDictType())) {
                 dictFields.add(column.getDictType());
             }
         }
@@ -83,7 +83,7 @@ public class VelocityUtil {
         velocityContext.put("allFields", allFields);
         velocityContext.put("listFields", listFields);
         velocityContext.put("detailFields", detailFields);
-        velocityContext.put("dictFields", ArrayUtil.listToStringByStr(dictFields,","));
+        velocityContext.put("dictFields", dictFields);
         velocityContext.put("isSearch", isSearch);
         return velocityContext;
     }
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 29941b09..6f40fc89 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
@@ -159,15 +159,13 @@
             loading.value = false
         }
     }
+    #if($dictFields.size()>=1)
 
-    #if($dictFields!="")
     const { dictData } = useDictData<{
-        #foreach ($column in $columns)
-        #if($column.dictType!="")
-        ${column.dictType}: any[]
-        #end
-        #end
-    }>([${dictFields}])
+    #foreach ($dict in $dictFields)
+        ${dict}: any[]
+    #end
+    }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields.size()>1),#end#end])
     #end
 
     const handleAdd = async (${table.treePrimary}?: number) => {
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 c5c0ae14..0c81a047 100644
--- a/server/like-generator/src/main/resources/vue/index.vue.vm
+++ b/server/like-generator/src/main/resources/vue/index.vue.vm
@@ -151,15 +151,13 @@
         fetchFun: ${moduleName}Lists,
         params: queryParams
     })
+    #if($dictFields.size()>=1)
 
-    #if($dictFields!="")
     const { dictData } = useDictData<{
-        #foreach ($column in $columns)
-        #if($column.dictType!="")
-        ${column.dictType}: any[]
+        #foreach ($dict in $dictFields)
+        ${dict}: any[]
         #end
-        #end
-    }>([${dictFields}])
+    }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields.size()>1),#end#end])
     #end
 
     const selectData = ref<any[]>([])