From 35fdcb9b192c009a10e9fde2eb6b38f7c7eea9a5 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 16 Aug 2022 17:09:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxkj/generator/util/VelocityUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 b0f55d36..e2b16021 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 @@ -173,19 +173,19 @@ public class VelocityUtil { } else if (template.contains("vue/api.ts.vm")) { - fileName = StringUtil.format("vue/api.ts"); + fileName = StringUtil.format("vue/api/{}.ts", moduleName); } else if (template.contains("vue/edit.vue.vm")) { - fileName = StringUtil.format("vue/edit.vue"); + fileName = StringUtil.format("vue/views/{}/edit.vue", moduleName); } else if (template.contains("vue/index.vue.vm")) { - fileName = StringUtil.format("vue/index.vue"); + fileName = StringUtil.format("vue/views/{}/index.vue", moduleName); } else if (template.contains("vue/index-tree.vue.vm")) { - fileName = StringUtil.format("vue/index.vue"); + fileName = StringUtil.format("vue/views/{}/index.vue", moduleName); } return fileName; From 13919fd0b8ee3dab151b553f2a5d51b9521b9430 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 16 Aug 2022 17:14:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=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.vue.vm | 1 + 1 file changed, 1 insertion(+) 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 87ddff63..b9728272 100644 --- a/server/like-generator/src/main/resources/vue/index.vue.vm +++ b/server/like-generator/src/main/resources/vue/index.vue.vm @@ -159,6 +159,7 @@ const { dictData } = useDictData<{ ${dict}: any[] #end }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields[$dictSize] != ${dict}),#end#end]) +#end const selectData = ref([]) const handleSelectionChange = (selection: any[]) => {