Merge branch 'dev_20241202_xukangle' into develop

@@ -335,6 +335,7 @@ const tableInfo = ref({
   fields: [
   fields: [
     { label: "序号", type: "index", width: 56, align: "center" },
     { label: "序号", type: "index", width: 56, align: "center" },
     { label: "字段名", field: "fieldName", width: 140 },
     { label: "字段名", field: "fieldName", width: 140 },
+    { label: "字段中文名", field: "fieldChName", width: 180 },
     { label: "分类", field: "classifyDetailName", width: 120 },
     { label: "分类", field: "classifyDetailName", width: 120 },
     { label: "分级", field: "gradeDetailName", width: 80 },
     { label: "分级", field: "gradeDetailName", width: 80 },
     { label: "标签", field: "label", width: 140 },
     { label: "标签", field: "label", width: 140 },
@@ -342,7 +343,7 @@ const tableInfo = ref({
     { label: "表名", field: "tableName", width: 120, align: 'center' },
     { label: "表名", field: "tableName", width: 120, align: 'center' },
     { label: "表中文名", field: "tableChName", width: 120, align: 'center' },
     { label: "表中文名", field: "tableChName", width: 120, align: 'center' },
     { label: "数据库名", field: "database", width: 120, align: 'center' },
     { label: "数据库名", field: "database", width: 120, align: 'center' },
-    { label: "数据类型", field: "databaseChName", width: 120, align: 'center' },
+    { label: "数据库中文名", field: "databaseChName", width: 120, align: 'center' },
 
 
   ],
   ],
   data: [],
   data: [],
@@ -1245,7 +1246,6 @@ const treeSelectNodeChange = (node, item) => {
 // 这里应该是onActivated 钩子,路由从configure-路由从configure-rules跳转过来要重新请求数据、
 // 这里应该是onActivated 钩子,路由从configure-路由从configure-rules跳转过来要重新请求数据、
 onActivated(async () => {
 onActivated(async () => {
   if (route.query.reload === 'true') {
   if (route.query.reload === 'true') {
-    console.log('重新请求数据');
     await getExecGuid();
     await getExecGuid();
     activeName.value = 'second';
     activeName.value = 'second';
     getDataBaseTreeData();
     getDataBaseTreeData();

@@ -833,6 +833,22 @@ const inputLengthKeyUp = (regexp, scope, field, max: any = null, min: any = null
     scope.row[field] = min;
     scope.row[field] = min;
   }
   }
 }
 }
+
+onActivated(() => {
+  const tableChName = route.query.tableChName;
+  let tab: any = userStore.tabbar.find((tab: any) => tab.fullPath === fullPath);
+  if (tab) {
+    if (tableChName) {
+      tab.meta.title = `编辑-(${tableChName})`;
+    }
+    if (fullPath === route.fullPath) {
+      document.title = tab.meta.title;
+    }
+  }
+});
+
+
+
 </script>
 </script>
 
 
 <template>
 <template>