6a97d339 by xukangle

Merge branch 'dev_20241202_xukangle' into develop

2 parents 3ce663e6 21ddfd96
......@@ -28,7 +28,7 @@ import {
import { TableColumnWidth } from "@/utils/enum";
import router from "@/router";
import { download } from "@/utils/common";
import { da } from "element-plus/es/locale";
import { da, sl } from "element-plus/es/locale";
const currentPath = ref<string[]>([]);
......@@ -1346,8 +1346,8 @@ const getDataBaseTableData = async (params = {}) => {
pageSize: dataBasePage.value.limit,
isDataAsset: checked.value ? 'Y' : 'N',
execGuid: execGuidInfo.value.execGuid,
tableGuid: tableGuid.value || selectedA.value || '',
databaseGuid: dataBaseGuid.value || selectedB.value || '',
tableGuid: tableGuid.value || selectedB.value || '',
databaseGuid: dataBaseGuid.value || selectedA.value || '',
fieldGuid: "",
labelGuid: "",
classifyDetailGuid: "",
......@@ -1396,8 +1396,8 @@ const getDataBaseFieldData = async (params = {}) => {
pageIndex: dataFieldPage.value.curr,
pageSize: dataFieldPage.value.limit,
execGuid: execGuidInfo.value.execGuid,
tableGuid: tableGuid.value || selectedA.value || '',
databaseGuid: dataBaseGuid.value || selectedB.value || '',
tableGuid: tableGuid.value || selectedB.value || '',
databaseGuid: dataBaseGuid.value || selectedA.value || '',
fieldGuid: "",
labelGuid: "",
classifyDetailGuid: "",
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!