From 9b19334efefc58234426eefe7f600ab0b7194ff7 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Tue, 16 Aug 2022 10:58:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E7=89=88=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vue/edit.vue.vm        |  21 ++-
 .../src/main/resources/vue/index-tree.vue.vm  | 132 ++++++++++--------
 .../src/main/resources/vue/index.vue.vm       |   2 +
 3 files changed, 86 insertions(+), 69 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 a7fd3288..16a36137 100644
--- a/server/like-generator/src/main/resources/vue/edit.vue.vm
+++ b/server/like-generator/src/main/resources/vue/edit.vue.vm
@@ -31,14 +31,8 @@
                 <el-form-item label="${column.columnComment}" prop="${column.javaField}">
                     <el-input v-model="formData.name" placeholder="请输入${column.columnComment}" />
                 </el-form-item>
-            #elseif($column.htmlType=="number")
-                <el-form-item label="${column.columnComment}" prop="${column.javaField}">
-                    <div>
-                        <el-input-number v-model="formData.sort" />
-                    </div>
-                </el-form-item>
             #elseif($column.htmlType=="textarea")
-                <el-form-item label="备注" prop="remark">
+                <el-form-item label="${column.columnComment}" prop="${column.javaField}">
                     <el-input
                         v-model="formData.${column.javaField}"
                         placeholder="请输入${column.columnComment}"
@@ -51,10 +45,10 @@
                     <el-checkbox-group v-model="formData.${column.javaField}" placeholder="请选择${column.columnComment}">
                         #if($column.dictType!="")
                         <el-checkbox
-                                v-for="(item, index) in dictData.${column.dictType}"
-                                :key="index"
-                                :label="item.value"
-                                :disabled="!item.status"
+                            v-for="(item, index) in dictData.${column.dictType}"
+                            :key="index"
+                            :label="item.value"
+                            :disabled="!item.status"
                         >
                             {{ item.name }}
                         </el-checkbox>
@@ -135,9 +129,10 @@
     })
 
     const formData = reactive({
-        ${primaryKey}: '',
         #foreach ($column in $columns)
-        #if($column.isEdit)
+        #if($column.javaField==$primaryKey)
+        ${primaryKey}: '',
+        #elseif($column.isEdit)
         #if($column.htmlType=="checkbox")
         ${column.javaField}: [],
         #else
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 5aed7967..dbc16914 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
@@ -2,42 +2,42 @@
     <div class="index-tree">
         <el-card class="!border-none mb-4" shadow="never">
             <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
-                #foreach ($column in $columns)
-                #if($column.isQuery==1)
-                    #if($column.htmlType=="datetime")
-                    <el-form-item label="${column.columnComment}" prop="${column.javaField}">
-                        <data-picker
-                            v-model:startTime="queryParams.startTime"
-                            v-model:endTime="queryParams.endTime"
-                        />
-                    </el-form-item>
-                    #elseif($column.htmlType=="select")
-                    <el-form-item label="${column.columnComment}" prop="${column.javaField}">
-                        <el-select
-                            v-model="queryParams.${column.javaField}"
-                            class="w-56"
-                            clearable
-                        >
-                            #if($column.dictType=="")
-                                <el-option label="请选择字典生成" value="" />
-                            #else
-                                <el-option label="全部" value="" />
-                                <el-option
-                                    v-for="(item, index) in dictData.${column.dictType}"
-                                    :key="index"
-                                    :label="item.name"
-                                    :value="item.value"
-                                />
-                            #end
-                        </el-select>
-                    </el-form-item>
-                    #elseif($column.htmlType=="input")
-                    <el-form-item label="${column.columnComment}" prop="${column.javaField}">
-                        <el-input class="w-56" v-model="queryParams.${column.javaField}" />
-                    </el-form-item>
-                   #end
-                #end
+            #foreach ($column in $columns)
+            #if($column.isQuery==1)
+                #if($column.htmlType=="datetime")
+                <el-form-item label="${column.columnComment}" prop="${column.javaField}">
+                    <data-picker
+                        v-model:startTime="queryParams.startTime"
+                        v-model:endTime="queryParams.endTime"
+                    />
+                </el-form-item>
+                #elseif($column.htmlType=="select")
+                <el-form-item label="${column.columnComment}" prop="${column.javaField}">
+                    <el-select
+                        v-model="queryParams.${column.javaField}"
+                        class="w-56"
+                        clearable
+                    >
+                        #if($column.dictType=="")
+                            <el-option label="请选择字典生成" value="" />
+                        #else
+                            <el-option label="全部" value="" />
+                            <el-option
+                                v-for="(item, index) in dictData.${column.dictType}"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.value"
+                            />
+                        #end
+                    </el-select>
+                </el-form-item>
+                #elseif($column.htmlType=="input")
+                <el-form-item label="${column.columnComment}" prop="${column.javaField}">
+                    <el-input class="w-56" v-model="queryParams.${column.javaField}" />
+                </el-form-item>
                 #end
+            #end
+            #end
                 <el-form-item>
                     <el-button type="primary" @click="getLists">查询</el-button>
                     <el-button @click="getLists">重置</el-button>
@@ -63,27 +63,27 @@
                 row-key="${table.treePrimary}"
                 :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
             >
-            #foreach ($column in $columns)
-            #if($column.isList)
-                #if($column.htmlType=="imageUpload")
-                    #if($column.htmlType=="select" || $column.htmlType=="radio" || $column.htmlType=="checkbox")
-                    <el-table-column label="${column.columnComment}" prop="${column.javaField}" min-width="100">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.${column.dictType}" :value="row.${column.javaField}" />
-                        </template>
-                    </el-table-column>
-                    #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>
-                    #else
-                    <el-table-column label="${column.columnComment}" prop="${column.javaField}" min-width="100" />
-                    #end
+        #foreach ($column in $columns)
+        #if($column.isList)
+            #if($column.htmlType=="imageUpload")
+                #if($column.htmlType=="select" || $column.htmlType=="radio" || $column.htmlType=="checkbox")
+                <el-table-column label="${column.columnComment}" prop="${column.javaField}" min-width="100">
+                    <template #default="{ row }">
+                        <dict-value :options="dictData.${column.dictType}" :value="row.${column.javaField}" />
+                    </template>
+                </el-table-column>
+                #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>
+                #else
+                <el-table-column label="${column.columnComment}" prop="${column.javaField}" min-width="100" />
                 #end
             #end
-            #end
+        #end
+        #end
                 <el-table-column label="操作" width="160" fixed="right">
                     <template #default="{ row }">
                         <el-button
@@ -114,20 +114,30 @@
                 </el-table-column>
             </el-table>
         </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
+        <edit-popup
+            v-if="showEdit"
+            ref="editRef"
+            #if($dictFields!="")
+            :dict-data="dictData"
+            #end
+            @success="getLists"
+            @close="showEdit = false"
+        />
     </div>
 </template>
 <script lang="ts" setup>
     import { ${moduleName}Edit, ${moduleName}Delete, ${moduleName}Lists } from '@/api/${moduleName}'
     import EditPopup from './edit.vue'
     import feedback from '@/utils/feedback'
+    import { useDictData } from '@/hooks/useDictOptions'
+
     const tableRef = shallowRef<InstanceType<typeof ElTable>>()
     const editRef = shallowRef<InstanceType<typeof EditPopup>>()
     let isExpand = false
     const showEdit = ref(false)
     const loading = ref(false)
     const lists = ref<any[]>([])
-
+    
     const queryParams = reactive({
         #foreach ($column in $columns)
         #if($column.isQuery)
@@ -147,6 +157,16 @@
         }
     }
 
+    #if($dictFields!="")
+    const { dictData } = useDictData<{
+        #foreach ($column in $columns)
+        #if($column.dictType!="")
+        ${column.dictType}: any[]
+        #end
+        #end
+    }>([${dictFields}])
+    #end
+
     const handleAdd = async (${table.treePrimary}?: number) => {
         showEdit.value = true
         await nextTick()
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 5763946c..487c4fb1 100644
--- a/server/like-generator/src/main/resources/vue/index.vue.vm
+++ b/server/like-generator/src/main/resources/vue/index.vue.vm
@@ -117,7 +117,9 @@
         <edit-popup
             v-if="showEdit"
             ref="editRef"
+            #if($dictFields!="")
             :dict-data="dictData"
+            #end
             @success="getLists"
             @close="showEdit = false"
         />