From 0831d571a9193c922d633792907b506fba10aabd Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Mon, 15 Aug 2022 10:50:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=89=A7=E6=95=B0=E6=8D=AE=E8=A1=A8?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/views/dev_tools/code/edit.vue   | 46 +++++++++++++----------
 admin/src/views/permission/menu/index.vue | 12 +++++-
 admin/src/views/permission/role/index.vue |  4 +-
 3 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/admin/src/views/dev_tools/code/edit.vue b/admin/src/views/dev_tools/code/edit.vue
index deeadb38..f65bf7b7 100644
--- a/admin/src/views/dev_tools/code/edit.vue
+++ b/admin/src/views/dev_tools/code/edit.vue
@@ -13,7 +13,7 @@
             >
                 <el-tabs v-model="activeName">
                     <el-tab-pane label="基础信息" name="base">
-                        <el-form-item label="表名称" prop="tableName">
+                        <el-form-item label="表名称" prop="base.tableName">
                             <div class="w-80">
                                 <el-input
                                     v-model="formData.base.tableName"
@@ -21,7 +21,7 @@
                                 />
                             </div>
                         </el-form-item>
-                        <el-form-item label="表描述" prop="tableComment">
+                        <el-form-item label="表描述" prop="base.tableComment">
                             <div class="w-80">
                                 <el-input
                                     v-model="formData.base.tableComment"
@@ -29,7 +29,7 @@
                                 />
                             </div>
                         </el-form-item>
-                        <el-form-item label="实体类名称" prop="entityName">
+                        <el-form-item label="实体类名称" prop="base.entityName">
                             <div class="w-80">
                                 <el-input
                                     v-model="formData.base.entityName"
@@ -38,9 +38,12 @@
                             </div>
                         </el-form-item>
 
-                        <el-form-item label="作者">
+                        <el-form-item label="作者" prop="base.authorName">
                             <div class="w-80">
-                                <el-input v-model="formData.base.authorName" />
+                                <el-input
+                                    v-model="formData.base.authorName"
+                                    placeholder="请输入作者"
+                                />
                             </div>
                         </el-form-item>
                         <el-form-item label="备注">
@@ -181,19 +184,13 @@
                         </el-table>
                     </el-tab-pane>
                     <el-tab-pane label="生成配置" name="config">
-                        <el-form-item label="模板类型" prop="template_type">
+                        <el-form-item label="模板类型" prop="gen.genTpl" required>
                             <el-radio-group v-model="formData.gen.genTpl">
                                 <el-radio :label="GenTpl.CURD">单表（增删改查）</el-radio>
                                 <el-radio :label="GenTpl.TREE">树表（增删改查）</el-radio>
                             </el-radio-group>
                         </el-form-item>
-                        <el-form-item label="生成方式" prop="generate_type">
-                            <el-radio-group v-model="formData.gen.genType">
-                                <el-radio :label="GenType.ZIP">压缩包下载</el-radio>
-                                <el-radio :label="GenType.CUSTOM_PATH">自定义路径</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                        <el-form-item label="模块名" prop="moduleName">
+                        <el-form-item label="模块名" prop="gen.moduleName">
                             <div class="w-80">
                                 <el-input
                                     v-model="formData.gen.moduleName"
@@ -202,7 +199,7 @@
                                 <div class="form-tips">生成文件所在模块名</div>
                             </div>
                         </el-form-item>
-                        <el-form-item label="功能名称" prop="functionName">
+                        <el-form-item label="功能名称" prop="gen.functionName">
                             <div class="w-80">
                                 <el-input
                                     v-model="formData.gen.functionName"
@@ -210,10 +207,16 @@
                                 />
                             </div>
                         </el-form-item>
+                        <el-form-item label="生成方式" prop="gen.genType">
+                            <el-radio-group v-model="formData.gen.genType">
+                                <el-radio :label="GenType.ZIP">压缩包下载</el-radio>
+                                <el-radio :label="GenType.CUSTOM_PATH">自定义路径</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
                         <el-form-item
                             v-if="formData.gen.genType == GenType.CUSTOM_PATH"
                             label="自定义路径"
-                            prop="treePrimary"
+                            prop="gen.genPath"
                         >
                             <div class="w-80">
                                 <el-input
@@ -223,7 +226,7 @@
                             </div>
                         </el-form-item>
                         <template v-if="formData.gen.genTpl == GenTpl.TREE">
-                            <el-form-item label="树主键字段" prop="treePrimary">
+                            <el-form-item label="树主键字段" prop="gen.treePrimary">
                                 <el-select
                                     class="w-80"
                                     v-model="formData.gen.treePrimary"
@@ -237,7 +240,7 @@
                                     />
                                 </el-select>
                             </el-form-item>
-                            <el-form-item label="树父级字段" prop="treeParent">
+                            <el-form-item label="树父级字段" prop="gen.treeParent">
                                 <el-select class="w-80" v-model="formData.gen.treeParent" clearable>
                                     <el-option
                                         v-for="item in formData.column"
@@ -304,9 +307,12 @@ const formData = reactive({
 
 const formRef = shallowRef<FormInstance>()
 const rules = reactive({
-    table_name: [{ required: true, message: '请输入表名称', trigger: 'blur' }],
-    table_comment: [{ required: true, message: '请输入表描述', trigger: 'blur' }],
-    module_name: [{ required: true, message: '请输入模块名', trigger: 'blur' }]
+    ['base.tableName']: [{ required: true, message: '请输入表名称', trigger: 'blur' }],
+    ['base.tableComment']: [{ required: true, message: '请输入表描述', trigger: 'blur' }],
+    ['base.entityName']: [{ required: true, message: '请输入实体类名称', trigger: 'blur' }],
+    ['base.authorName']: [{ required: true, message: '请输入作者', trigger: 'blur' }],
+    ['gen.moduleName']: [{ required: true, message: '请输入模块名', trigger: 'blur' }],
+    ['gen.functionName']: [{ required: true, message: '请输入功能名称', trigger: 'blur' }]
 })
 
 const getDetails = async () => {
diff --git a/admin/src/views/permission/menu/index.vue b/admin/src/views/permission/menu/index.vue
index a955d3f2..5abbe675 100644
--- a/admin/src/views/permission/menu/index.vue
+++ b/admin/src/views/permission/menu/index.vue
@@ -11,6 +11,7 @@
                 <el-button @click="handleExpand"> 展开/折叠 </el-button>
             </div>
             <el-table
+                v-loading="loading"
                 ref="tableRef"
                 class="mt-4"
                 size="large"
@@ -98,12 +99,19 @@ import feedback from '@/utils/feedback'
 const tableRef = shallowRef<InstanceType<typeof ElTable>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 let isExpand = false
+const loading = ref(false)
 const showEdit = ref(false)
 const lists = ref([])
 
 const getLists = async () => {
-    const data = await menuLists()
-    lists.value = data
+    loading.value = true
+    try {
+        const data = await menuLists()
+        lists.value = data
+        loading.value = false
+    } catch (error) {
+        loading.value = false
+    }
 }
 
 const handleAdd = async (id?: number) => {
diff --git a/admin/src/views/permission/role/index.vue b/admin/src/views/permission/role/index.vue
index 72d1f316..b42563f9 100644
--- a/admin/src/views/permission/role/index.vue
+++ b/admin/src/views/permission/role/index.vue
@@ -9,9 +9,9 @@
                     新增
                 </el-button>
             </div>
-            <div class="mt-4" v-loading="pager.loading">
+            <div class="mt-4">
                 <div>
-                    <el-table :data="pager.lists" size="large">
+                    <el-table :data="pager.lists" size="large" v-loading="pager.loading">
                         <el-table-column prop="id" label="ID" min-width="100" />
                         <el-table-column prop="name" label="名称" min-width="150" />
                         <el-table-column