优化代码生成

Web/src/views/system/codeGen/component/editCodeGenDialog.vue

@@ -78,6 +78,21 @@
 									<el-input v-model="state.ruleForm.busName" placeholder="请输入" clearable />
 								</el-form-item>
 							</el-col>
+							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+								<el-form-item label="生成表" prop="tableName" :rules="[{ required: true, message: '生成表不能为空', trigger: 'blur' }]">
+									<template v-slot:label>
+										<div>
+											生成表
+											<el-tooltip raw-content content="若找不到在前端生成的实体/表，请检查配置文件中实体所在程序集或重启后台服务。" placement="top">
+												<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"><ele-QuestionFilled /></el-icon>
+											</el-tooltip>
+										</div>
+									</template>
+									<el-select v-model="state.ruleForm.tableName" @change="tableChanged" value-key="value" filterable clearable class="w100">
+										<el-option v-for="item in state.tableData" :key="item.entityName" :label="item.entityName + ' ( ' + item.tableName + ' ) [' + item.tableComment + ']'" :value="item" />
+									</el-select>
+								</el-form-item>
+							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 								<el-form-item label="生成菜单" prop="generateMenu">
 									<el-radio-group v-model="state.ruleForm.generateMenu">
@@ -93,8 +108,7 @@
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 								<el-form-item label="父级菜单" prop="menuPid">
-									<el-cascader
+									<el-cascader :options="state.menuData"
-										:options="state.menuData"
 												 :props="cascaderProps"
 												 placeholder="请选择上级菜单"
 												 :disabled="!state.ruleForm.generateMenu"
@@ -102,8 +116,7 @@
 												 clearable
 												 class="w100"
 												 v-model="state.ruleForm.menuPid"
-										@change="menuChange"
+												 @change="menuChange">
-									>
 										<template #default="{ node, data }">
 											<span>{{ data.title }}</span>
 											<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
@@ -219,13 +232,6 @@
 													</el-select>
 												</el-form-item>
 											</el-col>
-											<!-- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-												<el-form-item label="Name字段" prop="treeName" :rules="[{ required: true, message: '请选择树控件Name字段', trigger: 'blur' }]">
-													<el-select v-model="state.ruleForm.treeName" @change="treeNameChanged" value-key="value" filterable clearable class="w100">
-														<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName + ' ( ' + item.columnName + ' ) [' + item.columnComment + ']'" :value="item" />
-													</el-select>
-												</el-form-item>
-											</el-col> -->
 											<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 												<el-form-item label="树表名称">
 													<template v-slot:label>