ddc5c4ea by xukangle

fix: 分类分级目录

1 parent e7384c73
......@@ -142,7 +142,7 @@ export const getTableFieldLineage = (params) => request({
/** 获取表的所有字段血缘数据 */
export const getTableAllFieldLineage = (params) => request({
url: `${import.meta.env.VITE_APP_PLAN_BASEURL}/lineage/lineage-query-field?databaseName=${params.databaseName}&tableName=${params.tableName}`,
url: `${import.meta.env.VITE_APP_PLAN_BASEURL}/lineage/lineage-query-field?databaseName=${params.databaseName}&tableName=${params.tableName}&tableGuid=${params.tableGuid}`,
method: 'get',
})
......
......@@ -1018,8 +1018,8 @@ const tableFieldsDataInfo = ref({
{ label: "表中文名", field: "tableChName", width: 140, },
{ label: "数据库名称", field: "database", width: 120 },
{ label: "数据库中文名", field: "databaseChName", width: TableColumnWidth.DATETIME },
{ label: "分类", field: "classifyDetailName", width: 120, align: 'center' },
{ label: "分级", field: "gradeDetailName", width: 120, align: 'center' },
{ label: "分类", field: "classifyDetailName", width: 120, align: 'left' },
{ label: "分级", field: "gradeDetailName", width: 120, align: 'left' },
// { label: "标签", field: "label", width: 120, align: 'center' },
],
data: [],
......
......@@ -507,7 +507,7 @@ const cancelEdit = (row) => {
:deep(.bottom_table) {
margin-top: 12px;
height: calc(100% - 150px);
height: calc(100% - 115px);
overflow-y: auto;
.el-table td.el-table__cell {
......
......@@ -320,7 +320,7 @@ watch(
if (val?.length && !currDatasourceSelect.value?.tableName) {
currDatasourceSelect.value = val[0];
}
emits("datasourceSelectedChange", val, databaseGuid.value);
emits("datasourceSelectedChange", val, currDatasourceSelect.value);
},
{
deep: true,
......@@ -361,9 +361,9 @@ const getTextAlign = (field) => {
<el-table-column type="selection" :width="22" align="center" />
<el-table-column prop="tableName" label="名称" width="100px" align="left" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="tableComment" label="表注释" width="60px" align="left" show-overflow-tooltip>
<el-table-column prop="tableChName" label="表中文名称" width="80px" align="left" show-overflow-tooltip>
<template #default="scope">
<span>{{ scope.row['tableComment'] ?? '--' }}</span>
<span>{{ scope.row['tableChName'] ?? '--' }}</span>
</template>
</el-table-column>
</el-table>
......@@ -497,7 +497,7 @@ const getTextAlign = (field) => {
height: calc(100% - 80px);
.content-left {
width: 200px;
width: 220px;
border-right: 1px solid #d9d9d9;
.title-left {
......@@ -532,7 +532,7 @@ const getTextAlign = (field) => {
}
.content-right {
width: calc(100% - 200px);
width: calc(100% - 220px);
.title-right {
height: 44px;
......
......@@ -284,7 +284,7 @@ const loadTreeNode = (node, resolve) => {
})
node.data.children = data;
nextTick(() => {
treeInfo.value.currentNodeKey && treeInfoRef.value.setCurrentKey(treeInfo.value.currentNodeKey);
treeInfo.value.currentNodeKey && treeInfoRef.value.setCurrentKey(treeInfo.value.currentNodeKey);
treeInfo.value.currentNodeKey && isCurrentNodeField && scrollToNode(treeInfo.value.currentNodeKey);
let node1 = treeInfoRef.value.treeRef.store.nodesMap[treeInfo.value.currentNodeKey];
if (node1) {
......@@ -1010,7 +1010,7 @@ const getTableFieldLineageMap = () => {
const getAllTableFieldLineageMap = () => {
lineageLoading.value = true;
isFieldLineage.value = true;
getTableAllFieldLineage({ databaseName: lastClickNode.value.databaseName, tableName: lastClickNode.value.tableName }).then((res: any) => {
getTableAllFieldLineage({ databaseName: lastClickNode.value.databaseName, tableName: lastClickNode.value.tableName, tableGuid: lastClickNode.value.guid }).then((res: any) => {
if (res.code == proxy.$passCode) {
let data1 = res.data || [];
lineageData.value = data1;
......@@ -1152,4 +1152,4 @@ const handleLineageSwitchChange = (val, type) => {
z-index: 10000;
/* 设置一个较高的z-index值确保在最上层显示 */
}
</style>
\ No newline at end of file
</style>
......
......@@ -100,11 +100,11 @@ const fieldTableInfo = ref({
//跳转倒查看血缘页面。
let row = scope.row;
set({
tableGuid: sheetInfo.value.guid,
table: sheetInfo.value.tableName,
databas: sheetInfo.value.databaseName,
tableGuid: sheetInfo.value.guid,
table: sheetInfo.value.tableName,
databas: sheetInfo.value.databaseName,
databaseCh: sheetInfo.value.databaseChName,
dsGuid: sheetInfo.value.databaseGuid,
dsGuid: sheetInfo.value.databaseGuid,
fGuid: row.guid,
fEnName: row.enName
})
......@@ -191,7 +191,7 @@ const tabsPaneMap = ref({
type: 'table',
tableInfo: fieldTableInfo.value,
show: true
},
},
{
title: '索引信息',
type: 'table',
......@@ -680,11 +680,11 @@ const handleRefres = () => {
const handleEdit = () => {
lineageGraph.value[0].handleEdit({});//先退出全屏再跳转,否则回来查看时就没有了。
set({
tableGuid: sheetInfo.value.guid,
table: sheetInfo.value.tableName,
databas: sheetInfo.value.databaseName,
tableGuid: sheetInfo.value.guid,
table: sheetInfo.value.tableName,
databas: sheetInfo.value.databaseName,
databaseCh: sheetInfo.value.databaseChName,
dsGuid: sheetInfo.value.databaseGuid,
dsGuid: sheetInfo.value.databaseGuid,
isFieldLine: isFieldLineage.value
})
router.push({
......@@ -722,7 +722,7 @@ const getTableLineageMap = () => {
const getAllTableFieldLineageMap = () => {
lineageDataLoading.value = true;
isFieldLineage.value = true;
getTableAllFieldLineage({ databaseName: sheetInfo.value.databaseName, tableName: sheetInfo.value.tableName }).then((res: any) => {
getTableAllFieldLineage({ databaseName: sheetInfo.value.databaseName, tableName: sheetInfo.value.tableName, tableGuid: sheetInfo.value.guid }).then((res: any) => {
if (res.code == proxy.$passCode) {
let data1 = res.data || [];
lineageData.value = data1;
......@@ -802,8 +802,8 @@ const handleLineageSwitchChange = (val) => {
<LineageGraph ref="lineageGraph" v-if="lineageData.length" layout="vertical" :lineageData="lineageData"
:is-field-lineage="isFieldLineage" :primary-table="sheetInfo.tableName" :is-detail="true"
:primaryDatabase="sheetInfo.databaseName" :isEdit="true" @handleSave="handleSave"
@tableContextMenu="handleTableContextMenu" @handleToggle="handleToggle" :isToggle="isToggle" @handleChOrEn=handleChOrEn :isCh="isCh"
@handleRefres="handleRefres" @handleEdit="handleEdit"
@tableContextMenu="handleTableContextMenu" @handleToggle="handleToggle" :isToggle="isToggle"
@handleChOrEn=handleChOrEn :isCh="isCh" @handleRefres="handleRefres" @handleEdit="handleEdit"
@handleLineageSwitchChange="handleLineageSwitchChange" />
</div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!