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

---
 server/like-generator/src/main/resources/vue/index-tree.vue.vm | 3 ++-
 server/like-generator/src/main/resources/vue/index.vue.vm      | 3 ++-
 2 files changed, 4 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 6f40fc89..823af8e7 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
@@ -160,12 +160,13 @@
         }
     }
     #if($dictFields.size()>=1)
+    #set($dictSize = $dictFields.size() - 1)
 
     const { dictData } = useDictData<{
     #foreach ($dict in $dictFields)
         ${dict}: any[]
     #end
-    }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields.size()>1),#end#end])
+    }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields[$dictSize] != ${dict}),#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 0c81a047..8f803f30 100644
--- a/server/like-generator/src/main/resources/vue/index.vue.vm
+++ b/server/like-generator/src/main/resources/vue/index.vue.vm
@@ -152,12 +152,13 @@
         params: queryParams
     })
     #if($dictFields.size()>=1)
+    #set($dictSize = $dictFields.size() - 1)
 
     const { dictData } = useDictData<{
         #foreach ($dict in $dictFields)
         ${dict}: any[]
         #end
-    }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields.size()>1),#end#end])
+    }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields[$dictSize] != ${dict}),#end#end])
     #end
 
     const selectData = ref<any[]>([])