From 0936bca755aeef5390d28b03711573e22ee43202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=98=89=E8=B1=AA?= <42510293+ziyujiahao@users.noreply.github.com> Date: Mon, 29 Sep 2025 15:29:48 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=98=8E=E7=BB=86=E8=A1=A8?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E8=B7=B3=E8=BD=AC=E5=AD=97=E6=AE=B5=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E6=90=BA=E5=B8=A6=E7=9A=84=E8=B7=B3=E8=BD=AC=E7=BB=B4?= =?UTF-8?q?=E5=BA=A6=20(#17121)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/ExtVisualizationLinkJumpMapper.xml | 4 ++-- .../store/modules/data-visualization/dvMain.ts | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml index 536ebe3d1d..5a1dc2335f 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml @@ -339,7 +339,7 @@ SELECT DISTINCT - concat( lj.source_view_id, '#', jtvi.source_field_active_id ) AS sourceInfo, + concat( lj.source_view_id, '#', jtvi.source_field_active_id, '#', lji.source_field_id ) AS sourceInfo, concat( jtvi.target_view_id, '#', jtvi.target_field_id ) AS targetInfo FROM snapshot_visualization_link_jump_target_view_info jtvi diff --git a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts index a99c67cbb9..ef9b612f00 100644 --- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts +++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts @@ -1016,7 +1016,6 @@ export const dvMainStore = defineStore('dataVisualization', { trackInfo = this.nowPanelJumpInfoTargetPanel } const preActiveComponentIds = [] - const checkQDList = [...data.dimensionList, ...data.quotaList] const customFilterInfo = data.customFilter for (let indexOuter = 0; indexOuter < this.componentData.length; indexOuter++) { const element = this.componentData[indexOuter] @@ -1024,7 +1023,7 @@ export const dvMainStore = defineStore('dataVisualization', { if (['UserView', 'VQuery'].includes(element.component)) { this.trackFilterCursor( element, - checkQDList, + data, trackInfo, preActiveComponentIds, viewId, @@ -1035,7 +1034,7 @@ export const dvMainStore = defineStore('dataVisualization', { element.propValue?.forEach((groupItem, index) => { this.trackFilterCursor( groupItem, - checkQDList, + data, trackInfo, preActiveComponentIds, viewId, @@ -1048,7 +1047,7 @@ export const dvMainStore = defineStore('dataVisualization', { tabItem.componentData?.forEach((tabComponent, index) => { this.trackFilterCursor( tabComponent, - checkQDList, + data, trackInfo, preActiveComponentIds, viewId, @@ -1367,12 +1366,13 @@ export const dvMainStore = defineStore('dataVisualization', { }, trackFilterCursor( element, - checkQDList, + sourceData, trackInfo, preActiveComponentIds, viewId, customFilter? ) { + const checkQDList = [...sourceData.dimensionList, ...sourceData.quotaList] let currentFilters = element.linkageFilters || [] // 当前联动filter if (['table-info', 'table-normal'].includes(element.innerType)) { currentFilters = [] @@ -1387,7 +1387,10 @@ export const dvMainStore = defineStore('dataVisualization', { // 联动的图表情况历史条件 // const currentFilters = [] checkQDList.forEach(QDItem => { - const sourceInfo = viewId + '#' + QDItem.id + let sourceInfo = viewId + '#' + QDItem.id + if (sourceData.option === 'jump') { + sourceInfo = sourceInfo + '#' + sourceData.sourceFieldId + } // 获取所有目标联动信息 const targetInfoList = trackInfo[sourceInfo] || [] const paramValue = [QDItem.value]