zuohuaijun 2 лет назад
Родитель
Сommit
021a9295e0

+ 2 - 2
Web/src/views/system/codeGen/component/fkDialog.vue

@@ -121,12 +121,12 @@ const openDialog = async (row: any) => {
 // 关闭弹窗
 const closeDialog = () => {
 	rowdata.fkTableName = state.ruleForm.tableName;
-	let tableData = state.tableData.filter((x) => x.tableName == state.ruleForm.tableName);
+	let tableData = state.tableData.filter((x: any) => x.tableName == state.ruleForm.tableName);
 	rowdata.fkEntityName = tableData.length == 0 ? '' : tableData[0].entityName;
 	rowdata.fkColumnName = state.ruleForm.columnName;
 	rowdata.fkLinkColumnName = state.ruleForm.linkColumnName;
 	rowdata.fkConfigId = state.ruleForm.configId;
-	let columnData = state.columnData.filter((x) => x.columnName == state.ruleForm.columnName);
+	let columnData = state.columnData.filter((x: any) => x.columnName == state.ruleForm.columnName);
 	rowdata.fkColumnNetType = columnData.length == 0 ? '' : columnData[0].netType;
 	emits('submitRefreshFk', rowdata);
 	cancel();

+ 5 - 4
Web/src/views/system/codeGen/component/genConfigDialog.vue

@@ -95,13 +95,14 @@
 <script lang="ts" setup name="sysCodeGenConfig">
 import { onMounted, onUnmounted, reactive, ref } from 'vue';
 import mittBus from '/@/utils/mitt';
+import { Edit } from '@element-plus/icons-vue';
+
 import fkDialog from '/@/views/system/codeGen/component/fkDialog.vue';
 import treeDialog from '/@/views/system/codeGen/component/treeDialog.vue';
 
 import { getAPI } from '/@/utils/axios-utils';
 import { SysCodeGenConfigApi, SysConstApi, SysDictDataApi, SysDictTypeApi, SysEnumApi } from '/@/api-services/api';
 import { CodeGenConfig } from '/@/api-services/models/code-gen-config';
-import { Edit } from '@element-plus/icons-vue'
 
 const emits = defineEmits(['handleQuery']);
 const fkDialogRef = ref();
@@ -305,7 +306,7 @@ defineExpose({ openDialog });
 </script>
 <style scoped>
 .effect-type-container {
-  display: flex;
-  align-items: center;
+	display: flex;
+	align-items: center;
 }
-</style>
+</style>

+ 1 - 1
Web/src/views/system/codeGen/component/treeDialog.vue

@@ -131,7 +131,7 @@ const closeDialog = () => {
 	rowdata.fkTableName = state.ruleForm.tableName;
 	// rowdata.fkEntityName = state.ruleForm.entityName;
 	// 这里一定要设置 fkEntityName,因为模板文件用到了
-	let tableData = state.tableData.filter((x) => x.tableName == state.ruleForm.tableName);
+	let tableData = state.tableData.filter((x: any) => x.tableName == state.ruleForm.tableName);
 	rowdata.fkEntityName = tableData.length == 0 ? '' : tableData[0].entityName;
 	// rowdata.fkColumnName = state.ruleForm.columnName;
 	// rowdata.fkColumnNetType = state.ruleForm.columnNetType;