From 14776b90e97d725dcf28e2a048caa0a691128abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Tue, 26 Apr 2022 14:48:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E4=B8=8A=E7=BA=A7=E8=8F=9C=E5=8D=95=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/gen/editTable.vue   |  4 +--
 src/views/tool/gen/genInfoForm.vue | 39 ++++++++++++++++--------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue
index 0904a83..d635b3a 100644
--- a/src/views/tool/gen/editTable.vue
+++ b/src/views/tool/gen/editTable.vue
@@ -110,8 +110,8 @@
         </el-table>
       </el-tab-pane>
     </el-tabs>
-    <el-form label-width="100px">
-      <el-form-item style="text-align: center; margin-left: -100px; margin-top: 10px">
+    <el-form class="mt20">
+      <el-form-item>
         <el-button type="primary" icon="check" @click="submitForm()">提交</el-button>
         <el-button type="success" icon="refresh" @click="handleQuery()">刷新</el-button>
         <el-button icon="back" @click="close()">返回</el-button>
diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index 6279f2e..dce003b 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -80,15 +80,25 @@
               </el-icon>
             </el-tooltip>
           </template>
-          <tree-select v-model:value="info.parentMenuId" :options="menuOptions" :show-count="true"
-            :objMap="{ value: 'menuId', label: 'menuName', children: 'children' }" placeholder="选择上级菜单" />
+          <el-cascader
+            class="w100"
+            :options="menuOptions"
+            :props="{ checkStrictly: true, value: 'menuId', label: 'menuName', emitPath: false }"
+            placeholder="请选择上级菜单"
+            clearable
+            v-model="info.parentMenuId"
+          >
+            <template #default="{ node, data }">
+              <span>{{ data.menuName }}</span>
+              <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+            </template>
+          </el-cascader>
         </el-form-item>
       </el-col>
       <el-col :lg="12">
         <el-form-item label="查询排序字段">
           <el-select v-model="info.sortField" placeholder="请选择字段" class="mr10" clearable="">
-            <el-option v-for="item in columns" :key="item.columnId" :label="item.csharpField" :value="item.csharpField">
-            </el-option>
+            <el-option v-for="item in columns" :key="item.columnId" :label="item.csharpField" :value="item.csharpField"> </el-option>
           </el-select>
 
           <el-radio v-model="info.sortType" label="asc">正序</el-radio>
@@ -186,8 +196,7 @@
             </el-tooltip>
           </template>
           <el-select v-model="info.treeCode" placeholder="请选择">
-            <el-option v-for="(column, index) in columns" :key="index" :label="column.csharpField + '：' + column.columnComment"
-              :value="column.csharpField"></el-option>
+            <el-option v-for="(column, index) in columns" :key="index" :label="column.csharpField + '：' + column.columnComment" :value="column.csharpField"></el-option>
           </el-select>
         </el-form-item>
       </el-col>
@@ -202,8 +211,7 @@
             </el-tooltip>
           </template>
           <el-select v-model="info.treeParentCode" placeholder="请选择">
-            <el-option v-for="(column, index) in columns" :key="index" :label="column.csharpField + '：' + column.columnComment"
-              :value="column.csharpField"></el-option>
+            <el-option v-for="(column, index) in columns" :key="index" :label="column.csharpField + '：' + column.columnComment" :value="column.csharpField"></el-option>
           </el-select>
         </el-form-item>
       </el-col>
@@ -218,8 +226,7 @@
             </el-tooltip>
           </template>
           <el-select v-model="info.treeName" placeholder="请选择">
-            <el-option v-for="(column, index) in columns" :key="index" :label="column.csharpField + '：' + column.columnComment"
-              :value="column.csharpField"></el-option>
+            <el-option v-for="(column, index) in columns" :key="index" :label="column.csharpField + '：' + column.columnComment" :value="column.csharpField"></el-option>
           </el-select>
         </el-form-item>
       </el-col>
@@ -237,8 +244,7 @@
             </el-tooltip>
           </template>
           <el-select v-model="info.subTableName" placeholder="请选择" @change="subSelectChange(this)">
-            <el-option v-for="(table, index) in tables" :key="index" :label="table.tableName + '：' + table.tableComment" :value="table.tableName">
-            </el-option>
+            <el-option v-for="(table, index) in tables" :key="index" :label="table.tableName + '：' + table.tableComment" :value="table.tableName"> </el-option>
           </el-select>
         </el-form-item>
       </el-col>
@@ -253,8 +259,7 @@
             </el-tooltip>
           </template>
           <el-select v-model="info.subTableFkName" placeholder="请选择">
-            <el-option v-for="(column, index) in subColumns" :key="index" :label="column.columnName + '：' + column.columnComment"
-              :value="column.columnName"></el-option>
+            <el-option v-for="(column, index) in subColumns" :key="index" :label="column.columnName + '：' + column.columnComment" :value="column.columnName"></el-option>
           </el-select>
         </el-form-item>
       </el-col>
@@ -305,9 +310,7 @@ const rules = ref({
       pattern: /^[A-Za-z]+$/,
     },
   ],
-  functionName: [
-    { required: true, message: '请输入生成功能名', trigger: 'blur' },
-  ],
+  functionName: [{ required: true, message: '请输入生成功能名', trigger: 'blur' }],
   permissionPrefix: {
     required: true,
     message: '请输入权限前缀',
@@ -354,7 +357,7 @@ watch(
   () => props.info.subTableName,
   (val) => {
     setSubTableColumns(val)
-  }
+  },
 )
 
 getMenuTreeselect()