From 7dfda8b7b20f77bd2efee970b68ceec35a0c3a01 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Fri, 26 Sep 2025 15:08:27 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=A8=E9=92=BB=E5=8F=96=E5=90=8E=E8=A1=A8=E5=A4=B4=E5=88=86?= =?UTF-8?q?=E7=BB=84=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BC=9A=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/store/modules/data-visualization/dvMain.ts | 8 ++++++++ .../components/table/TableHeaderGroupConfig.vue | 2 +- .../components/views/components/ChartComponentS2.vue | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) 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 50fa160719..c39f276165 100644 --- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts +++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts @@ -126,6 +126,8 @@ export const dvMainStore = defineStore('dataVisualization', { mobileLayoutStatus: false, // 公共链接状态(当前是否是公共链接打开) publicLinkStatus: false, + // 不带钻取的原始数据 + pureCanvasViewDataInfo: {}, pcTabMatrixCount: { x: 36, y: 36 @@ -204,6 +206,12 @@ export const dvMainStore = defineStore('dataVisualization', { } }, actions: { + setPureCanvasViewDataInfo(viewId, chartDataInfo) { + this.pureCanvasViewDataInfo[viewId] = chartDataInfo.data + }, + getPureCanvasViewDataInfo(viewId) { + return this.pureCanvasViewDataInfo[viewId] + }, setLastHiddenComponent(value?) { if (value) { this.lastHiddenComponent = [value] diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderGroupConfig.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderGroupConfig.vue index 2b386bb022..f00326950c 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderGroupConfig.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderGroupConfig.vue @@ -125,7 +125,7 @@ const groupMenu = ref() const tableContainer = ref() let s2: TableSheet const renderTable = (chart: ChartObj) => { - const data = dvMainStore.getViewDataDetails(chart.id) + const data = dvMainStore.getPureCanvasViewDataInfo(chart.id) const containerDom = document.getElementById(containerId.value) let realData = [] if (data?.tableRow?.length) { diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue index b76f007225..a2bdb7e8b3 100644 --- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue +++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue @@ -157,6 +157,9 @@ const calcData = (viewInfo: Chart, callback, resetPageInfo = true) => { chartData.value = res?.data as Partial state.totalItems = res?.totalItems dvMainStore.setViewDataDetails(viewInfo.id, res) + if (!res.drill) { + dvMainStore.setPureCanvasViewDataInfo(viewInfo.id, res) + } emit('onDrillFilters', res?.drillFilters) renderChart(res as unknown as Chart, resetPageInfo) }