Revert "优化代码生成"

This reverts commit 999e09907a.

.gitignore

@@ -46,4 +46,3 @@ node_modules/
 /App/unpackage
 .history
 /package-lock.json
-/Admin.NET/Admin.NET.Core/Utils/Config.cs

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

@@ -3,8 +3,7 @@
 		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="980px">
 			<template #header>
 				<div style="color: #fff">
-					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit />
+					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
-					</el-icon>
 					<span> {{ props.title }} </span>
 				</div>
 			</template>
@@ -17,20 +16,15 @@
 					<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="auto">
 						<el-row :gutter="10">
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-								<el-form-item label="库定位器" prop="configId"
+								<el-form-item label="库定位器" prop="configId" :rules="[{ required: true, message: '请选择库定位器', trigger: 'blur' }]">
-									:rules="[{ required: true, message: '请选择库定位器', trigger: 'blur' }]">
+									<el-select v-model="state.ruleForm.configId" placeholder="库名" filterable @change="dbChanged()" class="w100">
-									<el-select v-model="state.ruleForm.configId" placeholder="库名" filterable
+										<el-option v-for="item in state.dbData" :key="item.configId" :label="item.configId" :value="item.configId" />
-										@change="dbChanged()" class="w100">
-										<el-option v-for="item in state.dbData" :key="item.configId"
-											:label="item.configId" :value="item.configId" />
 									</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="dbType"
+								<el-form-item label="库类型" prop="dbType" :rules="[{ required: true, message: '描述不能为空', trigger: 'blur' }]">
-									:rules="[{ required: true, message: '描述不能为空', trigger: 'blur' }]">
+									<el-select v-model="state.ruleForm.dbType" placeholder="数据库类型" filterable clearable disabled class="w100">
-									<el-select v-model="state.ruleForm.dbType" placeholder="数据库类型" filterable clearable
-										disabled class="w100">
 										<el-option label="MySql" :value="'0'" />
 										<el-option label="SqlServer" :value="'1'" />
 										<el-option label="Sqlite" :value="'2'" />
@@ -60,57 +54,30 @@
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-								<el-form-item label="库地址" prop="connectionString"
+								<el-form-item label="库地址" prop="connectionString" :rules="[{ required: true, message: '库地址不能为空', trigger: 'blur' }]">
-									:rules="[{ required: true, message: '库地址不能为空', trigger: 'blur' }]">
+									<el-input v-model="state.ruleForm.connectionString" disabled clearable type="textarea" />
-									<el-input v-model="state.ruleForm.connectionString" disabled clearable
-										type="textarea" />
 								</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"
+								<el-form-item label="生成表" prop="tableName" :rules="[{ required: true, message: '生成表不能为空', trigger: 'blur' }]">
-									:rules="[{ required: true, message: '生成表不能为空', trigger: 'blur' }]">
 									<template v-slot:label>
 										<div>
 											生成表
-											<el-tooltip raw-content content="若找不到在前端生成的实体/表，请检查配置文件中实体所在程序集或重启后台服务。"
+											<el-tooltip raw-content content="若找不到在前端生成的实体/表，请检查配置文件中实体所在程序集或重启后台服务。" placement="top">
-												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="busName"
-									:rules="[{ required: true, message: '业务名不能为空', trigger: 'blur' }]">
-									<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="树属性Name字段" prop="treeName">
-									<template v-slot:label>
-										<div>
-											Name字段
-											<el-tooltip raw-content content="本表作为树控件的树属性Name字段。" 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.treeName" @change="treeNameChanged"
+									<el-select v-model="state.ruleForm.tableName" @change="tableChanged" value-key="value" filterable clearable class="w100">
-										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-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="业务名" prop="busName" :rules="[{ required: true, message: '业务名不能为空', trigger: 'blur' }]">
+									<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="generateMenu">
 									<el-radio-group v-model="state.ruleForm.generateMenu">
@@ -121,15 +88,22 @@
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 								<el-form-item label="菜单图标" prop="menuIcon">
-									<IconSelector v-model="state.ruleForm.menuIcon" :size="getGlobalComponentSize"
+									<IconSelector v-model="state.ruleForm.menuIcon" :size="getGlobalComponentSize" placeholder="菜单图标" type="all" />
-										placeholder="菜单图标" type="all" />
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 								<el-form-item label="父级菜单" prop="menuPid">
-									<el-cascader :options="state.menuData" :props="cascaderProps" placeholder="请选择上级菜单"
+									<el-cascader
-										:disabled="!state.ruleForm.generateMenu" filterable clearable class="w100"
+										:options="state.menuData"
-										v-model="state.ruleForm.menuPid" @change="menuChange">
+										:props="cascaderProps"
+										placeholder="请选择上级菜单"
+										:disabled="!state.ruleForm.generateMenu"
+										filterable
+										clearable
+										class="w100"
+										v-model="state.ruleForm.menuPid"
+										@change="menuChange"
+									>
 										<template #default="{ node, data }">
 											<span>{{ data.title }}</span>
 											<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
@@ -138,19 +112,15 @@
 								</el-form-item>
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-								<el-form-item label="命名空间" prop="nameSpace"
+								<el-form-item label="命名空间" prop="nameSpace" :rules="[{ required: true, message: '请选择命名空间', trigger: 'blur' }]">
-									:rules="[{ required: true, message: '请选择命名空间', trigger: 'blur' }]">
 									<!-- <el-input v-model="state.ruleForm.nameSpace" clearable placeholder="请输入" /> -->
-									<el-select v-model="state.ruleForm.nameSpace" filterable clearable class="w100"
+									<el-select v-model="state.ruleForm.nameSpace" filterable clearable class="w100" placeholder="命名空间">
-										placeholder="命名空间">
+										<el-option v-for="(item, index) in props.applicationNamespaces" :key="index" :label="item" :value="item" />
-										<el-option v-for="(item, index) in props.applicationNamespaces" :key="index"
-											:label="item" :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="pagePath"
+								<el-form-item label="前端目录" prop="pagePath" :rules="[{ required: true, message: '前端目录不能为空', trigger: 'blur' }]">
-									:rules="[{ required: true, message: '前端目录不能为空', trigger: 'blur' }]">
 									<el-input v-model="state.ruleForm.pagePath" clearable placeholder="请输入" />
 								</el-form-item>
 							</el-col>
@@ -162,8 +132,7 @@
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 								<el-form-item label="生成方式" prop="generateType">
 									<el-select v-model="state.ruleForm.generateType" filterable class="w100">
-										<el-option v-for="item in getDictDataByCode('code_gen_create_type')"
+										<el-option v-for="item in getDictDataByCode('code_gen_create_type')" :key="item.value" :label="item.value" :value="item.code" />
-											:key="item.value" :label="item.value" :value="item.code" />
 									</el-select>
 								</el-form-item>
 							</el-col>
@@ -172,11 +141,8 @@
 									<template v-slot:label>
 										<div>
 											接口模式
-											<el-tooltip raw-content
+											<el-tooltip raw-content content="接口服务模式是指根据swagger自动生成前端接口请求文件，推荐此模式。传统模式则是指手动编写接口请求并进行数据绑定。" placement="top">
-												content="接口服务模式是指根据swagger自动生成前端接口请求文件，推荐此模式。传统模式则是指手动编写接口请求并进行数据绑定。"
+												<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"><ele-QuestionFilled /></el-icon>
-												placement="top">
-												<el-icon size="16"
-													style="margin-right: 3px; display: inline; vertical-align: middle"><ele-QuestionFilled /></el-icon>
 											</el-tooltip>
 										</div>
 									</template>
@@ -188,19 +154,15 @@
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 								<el-form-item label="支持打印" prop="printType">
-									<el-select v-model="state.ruleForm.printType" filterable class="w100"
+									<el-select v-model="state.ruleForm.printType" filterable class="w100" @change="printTypeChanged">
-										@change="printTypeChanged">
+										<el-option v-for="item in getDictDataByCode('code_gen_print_type')" :key="item.value" :label="item.value" :value="item.code" />
-										<el-option v-for="item in getDictDataByCode('code_gen_print_type')"
-											:key="item.value" :label="item.value" :value="item.code" />
 									</el-select>
 								</el-form-item>
 							</el-col>
-							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"
+							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="state.ruleForm.printType == 'custom'">
-								v-if="state.ruleForm.printType == 'custom'">
 								<el-form-item label="打印模版" prop="printName">
 									<el-select v-model="state.ruleForm.printName" filterable class="w100">
-										<el-option v-for="item in state.printList" :key="item.id" :label="item.name"
+										<el-option v-for="item in state.printList" :key="item.id" :label="item.name" :value="item.name" />
-											:value="item.name" />
 									</el-select>
 								</el-form-item>
 							</el-col>
@@ -252,45 +214,38 @@
 										<el-row :gutter="10">
 											<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 												<el-form-item label="树 - 库定位器" prop="configId2">
-													<el-select v-model="state.ruleForm.configId2" placeholder="库名"
+													<el-select v-model="state.ruleForm.configId2" placeholder="库名" filterable @change="dbChanged2()" class="w100">
-														filterable @change="dbChanged2()" class="w100">
+														<el-option v-for="item in state.dbData" :key="item.configId" :label="item.configId" :value="item.configId" />
-														<el-option v-for="item in state.dbData" :key="item.configId"
-															:label="item.configId" :value="item.configId" />
 													</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>
 														<div>
 															树表名称
-															<el-tooltip raw-content
+															<el-tooltip raw-content content="若找不到在前端生成的实体/表，同上，如表有下划线_则因实体去掉划线取不到字段。" placement="top">
-																content="若找不到在前端生成的实体/表，同上，如表有下划线_则因实体去掉划线取不到字段。"
+																<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"><ele-QuestionFilled /></el-icon>
-																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.leftTab"
+													<el-select v-model="state.ruleForm.leftTab" @change="leftTableChanged" value-key="value" filterable clearable class="w100">
-														@change="leftTableChanged" value-key="value" filterable
+														<el-option v-for="item in state.tableData2" :key="item.entityName" :label="item.entityName + ' ( ' + item.tableName + ' ) [' + item.tableComment + ']'" :value="item" />
-														clearable class="w100">
-														<el-option v-for="item in state.tableData2"
-															: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="树关联字段">
-													<el-select v-model="state.ruleForm.leftKey" @change="leftKeyChanged"
+													<el-select v-model="state.ruleForm.leftKey" @change="leftKeyChanged" value-key="value" filterable clearable class="w100">
-														value-key="value" filterable clearable class="w100">
+														<el-option v-for="item in state.lcolumnData" :key="item.columnName" :label="item.columnName + ' ( ' + item.columnName + ' ) [' + item.columnComment + ']'" :value="item" />
-														<el-option v-for="item in state.lcolumnData"
-															:key="item.columnName"
-															:label="item.columnName + ' ( ' + item.columnName + ' ) [' + item.columnComment + ']'"
-															:value="item" />
 													</el-select>
 												</el-form-item>
 											</el-col>
@@ -299,41 +254,28 @@
 													<template v-slot:label>
 														<div>
 															关联主表字段
-															<el-tooltip raw-content content="先选择主表才可以选择字段。"
+															<el-tooltip raw-content content="先选择主表才可以选择字段。" placement="top">
-																placement="top">
+																<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"><ele-QuestionFilled /></el-icon>
-																<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.leftPrimaryKey"
+													<el-select v-model="state.ruleForm.leftPrimaryKey" @change="leftPrimaryKeyChanged" value-key="value" filterable clearable class="w100">
-														@change="leftPrimaryKeyChanged" value-key="value" filterable
+														<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName + ' ( ' + item.columnName + ' ) [' + item.columnComment + ']'" :value="item" />
-														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="树显示名称">
-													<el-select v-model="state.ruleForm.leftName"
+													<el-select v-model="state.ruleForm.leftName" @change="leftNameChanged" value-key="value" filterable clearable class="w100">
-														@change="leftNameChanged" value-key="value" filterable clearable
+														<el-option v-for="item in state.lcolumnData" :key="item.columnName" :label="item.columnName + ' ( ' + item.columnName + ' ) [' + item.columnComment + ']'" :value="item" />
-														class="w100">
-														<el-option v-for="item in state.lcolumnData"
-															: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="模板">
-													<el-input v-model="state.ruleForm.template" clearable
+													<el-input v-model="state.ruleForm.template" clearable placeholder="请输入" />
-														placeholder="请输入" />
 												</el-form-item>
 											</el-col>
 										</el-row>
@@ -342,10 +284,8 @@
 										<el-row :gutter="10">
 											<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 												<el-form-item label="子表 - 库定位器" prop="configId3">
-													<el-select v-model="state.ruleForm.configId3" placeholder="库名"
+													<el-select v-model="state.ruleForm.configId3" placeholder="库名" filterable @change="dbChanged3()" class="w100">
-														filterable @change="dbChanged3()" class="w100">
+														<el-option v-for="item in state.dbData" :key="item.configId" :label="item.configId" :value="item.configId" />
-														<el-option v-for="item in state.dbData" :key="item.configId"
-															:label="item.configId" :value="item.configId" />
 													</el-select>
 												</el-form-item>
 											</el-col>
@@ -354,33 +294,20 @@
 													<template v-slot:label>
 														<div>
 															子表名称
-															<el-tooltip raw-content
+															<el-tooltip raw-content content="若找不到在前端生成的实体/表，同上，如表有下划线_则因实体去掉划线取不到字段。" placement="top">
-																content="若找不到在前端生成的实体/表，同上，如表有下划线_则因实体去掉划线取不到字段。"
+																<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"><ele-QuestionFilled /></el-icon>
-																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.bottomTab"
+													<el-select v-model="state.ruleForm.bottomTab" @change="bottomTableChanged" value-key="value" filterable clearable class="w100">
-														@change="bottomTableChanged" value-key="value" filterable
+														<el-option v-for="item in state.tableData3" :key="item.entityName" :label="item.entityName + ' ( ' + item.tableName + ' ) [' + item.tableComment + ']'" :value="item" />
-														clearable class="w100">
-														<el-option v-for="item in state.tableData3"
-															: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="bottomKey">
-													<el-select v-model="state.ruleForm.bottomKey"
+													<el-select v-model="state.ruleForm.bottomKey" @change="bottomKeyChanged" value-key="value" filterable clearable class="w100">
-														@change="bottomKeyChanged" value-key="value" filterable
+														<el-option v-for="item in state.bcolumnData" :key="item.columnName" :label="item.columnName + ' ( ' + item.columnName + ' ) [' + item.columnComment + ']'" :value="item" />
-														clearable class="w100">
-														<el-option v-for="item in state.bcolumnData"
-															:key="item.columnName"
-															:label="item.columnName + ' ( ' + item.columnName + ' ) [' + item.columnComment + ']'"
-															:value="item" />
 													</el-select>
 												</el-form-item>
 											</el-col>
@@ -389,20 +316,13 @@
 													<template v-slot:label>
 														<div>
 															关联主表字段
-															<el-tooltip raw-content content="先选择主表才可以选择字段。"
+															<el-tooltip raw-content content="先选择主表才可以选择字段。" placement="top">
-																placement="top">
+																<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"><ele-QuestionFilled /></el-icon>
-																<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.bottomPrimaryKey"
+													<el-select v-model="state.ruleForm.bottomPrimaryKey" @change="bottomPrimaryKeyChanged" value-key="value" filterable clearable class="w100">
-														@change="bottomPrimaryKeyChanged" value-key="value" filterable
+														<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName + ' ( ' + item.columnName + ' ) [' + item.columnComment + ']'" :value="item" />
-														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>
@@ -414,8 +334,7 @@
 					</el-form>
 				</el-tab-pane>
 				<el-tab-pane label="选择模板" name="template" style="height: 700px">
-					<el-table ref="templateTableRef" :data="templateTableData" @selection-change="handleSelectionChange"
+					<el-table ref="templateTableRef" :data="templateTableData" @selection-change="handleSelectionChange" style="width: 100%">
-						style="width: 100%">
 						<el-table-column type="selection" width="55" />
 						<el-table-column property="name" label="模板文件名" width="280" />
 						<el-table-column property="describe" label="描述" show-overflow-tooltip />