From 1103e34d6ae8cd13d22c39157bc636e1e3c53815 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: Tue, 3 Mar 2026 17:46:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E5=8D=A1=E6=97=A0=E6=B3=95=E8=81=94=E5=8A=A8=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=88=9B=E5=BB=BA=E7=9A=84=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=BC=82=E5=B8=B8=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20(#18007)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/store/modules/data-visualization/dvMain.ts | 4 ++-- core/core-frontend/src/utils/viewUtils.ts | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) 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 deeb84115a..12327b9ffe 100644 --- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts +++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts @@ -21,7 +21,7 @@ import { findBaseDeFaultAttr } from '@/custom-component/component-list' import { get, set } from 'lodash-es' -import { viewFieldTimeTrans } from '@/utils/viewUtils' +import { checkIsSameDs, viewFieldTimeTrans } from '@/utils/viewUtils' import { useAppearanceStoreWithOut } from '@/store/modules/appearance' import { ElMessage } from 'element-plus-secondary' import { useI18n } from '@/hooks/web/useI18n' @@ -1458,7 +1458,7 @@ export const dvMainStore = defineStore('dataVisualization', { const targetViewId = targetInfoArray[0] // 目标图表 if (element.component === 'UserView' && element.id === targetViewId) { // 如果含有customFilter 仅加入customFilter - if (customFilter) { + if (customFilter && checkIsSameDs(this.canvasViewInfo, viewId, element.id)) { currentFilters.push({ filterType: 3, customFilter: customFilter diff --git a/core/core-frontend/src/utils/viewUtils.ts b/core/core-frontend/src/utils/viewUtils.ts index 4c12285c8f..ffde566bc9 100644 --- a/core/core-frontend/src/utils/viewUtils.ts +++ b/core/core-frontend/src/utils/viewUtils.ts @@ -33,3 +33,7 @@ export function viewFieldTimeTrans(viewDataInfo, params) { }) } } + +export function checkIsSameDs(canvasViewInfo, sourceViewId, targetViewId) { + return canvasViewInfo[sourceViewId]['tableId'] === canvasViewInfo[targetViewId]['tableId'] +}