模版调整

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}"
@@ -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

server/like-generator/src/main/resources/vue/index-tree.vue.vm

@@ -114,13 +114,23 @@
                 </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
@@ -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()

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"
         />