From 1875f72430828fe0fa801d98a8c7755cf997a17a Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Tue, 16 Aug 2022 18:30:02 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vue/edit.vue.vm              | 13 +++----------
 .../src/main/resources/vue/index-tree.vue.vm        |  9 ++++++---
 .../src/main/resources/vue/index.vue.vm             |  4 +++-
 3 files changed, 12 insertions(+), 14 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 600aa544..bd0480a4 100644
--- a/server/like-generator/src/main/resources/vue/edit.vue.vm
+++ b/server/like-generator/src/main/resources/vue/edit.vue.vm
@@ -128,14 +128,7 @@
 </template>
 <script lang="ts" setup>
 import type { FormInstance } from 'element-plus'
-import {
-    #if($table.treePrimary && $table.treeParent)
-    ${moduleName}Lists,
-    #end
-    ${moduleName}Edit,
-    ${moduleName}Add,
-    ${moduleName}Detail
-} from '@/api/${moduleName}'
+import { #if($table.treePrimary && $table.treeParent)${moduleName}Lists,#end ${moduleName}Edit,${moduleName}Add, ${moduleName}Detail } from '@/api/${moduleName}'
 import Popup from '@/components/popup/index.vue'
 import feedback from '@/utils/feedback'
 import type { PropType } from 'vue'
@@ -196,7 +189,7 @@ const handleSubmit = async () => {
     const data: any = { ...formData }
     #foreach ($column in $columns)
     #if($column.htmlType == "checkbox")
-    data.${column.javaField} = data.${column.javaField}.join(",");
+    data.${column.javaField} = data.${column.javaField}.join(',')
     #end
     #end
     mode.value == 'edit' ? await ${moduleName}Edit(data) : await ${moduleName}Add(data)
@@ -235,7 +228,7 @@ const handleClose = () => {
 
 // 树表
 const getLists = async () => {
-    const data: any = await ${moduleName}List()
+    const data: any = await ${moduleName}Lists()
     const item = { ${table.treePrimary}: 0, ${table.treeName}: '顶级', children: [] }
     item.children = data
     treeList.value.push(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 f6ea28a3..21266eeb 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
@@ -122,7 +122,7 @@
         <edit-popup
             v-if="showEdit"
             ref="editRef"
-            #if($dictFields!="")
+            #if($dictFields.size()>=1)
             :dict-data="dictData"
             #end
             @success="getLists"
@@ -131,10 +131,13 @@
     </div>
 </template>
 <script lang="ts" setup>
-import { ${moduleName}Edit, ${moduleName}Delete, ${moduleName}Lists } from '@/api/${moduleName}'
+import { ${moduleName}Delete, ${moduleName}Lists } from '@/api/${moduleName}'
 import EditPopup from './edit.vue'
 import feedback from '@/utils/feedback'
+#if($dictFields.size()>=1)
 import { useDictData } from '@/hooks/useDictOptions'
+#end
+import type { ElTable } from 'element-plus'
 
 const tableRef = shallowRef<InstanceType<typeof ElTable>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
@@ -197,7 +200,7 @@ const handleEdit = async (data: any) => {
 
 const handleDelete = async (${primaryKey}: number) => {
     await feedback.confirm('确定要删除？')
-    await menuDelete({ ${primaryKey} })
+    await ${moduleName}Delete({ ${primaryKey} })
     getLists()
 }
 
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 0de7237d..5f4daf89 100644
--- a/server/like-generator/src/main/resources/vue/index.vue.vm
+++ b/server/like-generator/src/main/resources/vue/index.vue.vm
@@ -125,7 +125,7 @@
         <edit-popup
             v-if="showEdit"
             ref="editRef"
-            #if($dictFields!="")
+            #if($dictFields.size()>=1)
             :dict-data="dictData"
             #end
             @success="getLists"
@@ -135,7 +135,9 @@
 </template>
 <script lang="ts" setup>
 import { ${moduleName}Delete, ${moduleName}Lists } from '@/api/${moduleName}'
+#if($dictFields.size()>=1)
 import { useDictData } from '@/hooks/useDictOptions'
+#end
 import { usePaging } from '@/hooks/usePaging'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'