优化 美化 代码生成 配置中 外键 树选择 表备注 字段备注

Signed-off-by: IMaster <logole@live.cn>

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

@@ -46,7 +46,7 @@
 					<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' }]">
 							<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-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>
@@ -157,6 +157,10 @@ onMounted(async () => {
 
 	let resPrintIdData = await getAPI(SysPrintApi).apiSysPrintPagePost();
 	state.printList = resPrintIdData.data.result?.items ?? [];
+
+	// 默认使用第一个库
+	//state.ruleForm.configId = state.dbData[0].configId;
+	//await dbChanged();
 });
 
 // db改变

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

@@ -19,14 +19,14 @@
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="数据库表" prop="tableName">
 							<el-select v-model="state.ruleForm.tableName" filterable clearable @change="TableChanged()" class="w100">
-								<el-option v-for="item in state.tableData" :key="item.entityName" :label="item.entityName + ' ( ' + item.tableName + ' )' + item.tableComment" :value="item.tableName" />
+								<el-option v-for="item in state.tableData" :key="item.entityName" :label="item.entityName + ' ( ' + item.tableName + ' )[' + item.tableComment + ']'" :value="item.tableName" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="显示字段" prop="columnName">
 							<el-select v-model="state.ruleForm.columnName" class="w100">
-								<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName + ' ' + item.columnComment" :value="item.columnName" />
+								<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName + ' [' + item.columnComment + ']'" :value="item.columnName" />
 							</el-select>
 						</el-form-item>
 					</el-col>
@@ -60,8 +60,11 @@ const state = reactive({
 });
 
 onMounted(async () => {
-	var res = await getAPI(SysCodeGenApi).apiSysCodeGenDatabaseListGet();
-	state.dbData = res.data.result;
+	await getDbList();
+
+	// 默认使用第一个库
+	//state.ruleForm.configId = state.dbData[0].configId;
+	//await DbChanged();
 });
 
 const DbChanged = async () => {

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

@@ -19,28 +19,28 @@
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="数据库表" prop="tableName">
 							<el-select v-model="state.ruleForm.tableName" class="w100" filterable clearable @change="TableChanged()">
-								<el-option v-for="item in state.tableData" :key="item.entityName" :label="item.tableName" :value="item.tableName" />
+								<el-option v-for="item in state.tableData" :key="item.entityName" :label="item.tableName + ' [' + item.tableComment + ']'" :value="item.tableName" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="显示字段" prop="displayColumn">
 							<el-select v-model="state.ruleForm.displayColumn" class="w100">
-								<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName" :value="item.columnName" />
+								<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName + ' [' + item.columnComment + ']'" :value="item.columnName" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="选择值字段" prop="valueColumn">
 							<el-select v-model="state.ruleForm.valueColumn" class="w100">
-								<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName" :value="item.columnName" />
+								<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName + ' [' + item.columnComment + ']'" :value="item.columnName" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="父级字段" prop="pidColumn">
 							<el-select v-model="state.ruleForm.pidColumn" class="w100">
-								<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName" :value="item.columnName" />
+								<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName + ' [' + item.columnComment + ']'" :value="item.columnName" />
 							</el-select>
 						</el-form-item>
 					</el-col>
@@ -75,6 +75,10 @@ const state = reactive({
 
 onMounted(async () => {
 	await getDbList();
+
+	// 默认使用第一个库
+	//state.ruleForm.configId = state.dbData[0].configId;
+	//await DbChanged();
 });
 
 const DbChanged = async () => {