From baf817a2d229eda7931f41fb73e8371e843e0ad9 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 18 Apr 2025 09:51:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E8=AE=BE=E8=AE=A1=EF=BC=8C=E6=98=8E=E7=BB=86=E8=A1=A8?= =?UTF-8?q?=E5=90=8C=E6=AD=A5pc=E8=AE=BE=E8=AE=A1=E6=97=B6=E4=B8=80?= =?UTF-8?q?=E7=9B=B4loading=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/components/ChartComponentS2.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 d0cd061829..b76f007225 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 @@ -134,20 +134,20 @@ let chartData = shallowRef>({ const containerId = 'container-' + showPosition.value + '-' + view.value.id + '-' + suffixId.value const viewTrack = ref(null) -const calcData = (view: Chart, callback, resetPageInfo = true) => { - if (view.customAttr.basicStyle.tablePageStyle === 'general') { +const calcData = (viewInfo: Chart, callback, resetPageInfo = true) => { + if (viewInfo.customAttr.basicStyle.tablePageStyle === 'general') { if (state.currentPageSize !== 0) { - view.chartExtRequest.pageSize = state.currentPageSize + viewInfo.chartExtRequest.pageSize = state.currentPageSize state.pageInfo.pageSize = state.currentPageSize } else { - view.chartExtRequest.pageSize = state.pageInfo.pageSize + viewInfo.chartExtRequest.pageSize = state.pageInfo.pageSize } } else { - delete view.chartExtRequest.pageSize + delete viewInfo.chartExtRequest?.pageSize } - if (view.tableId || view['dataFrom'] === 'template') { + if (viewInfo.tableId || viewInfo['dataFrom'] === 'template') { isError.value = false - const v = JSON.parse(JSON.stringify(view)) + const v = JSON.parse(JSON.stringify(viewInfo)) getData(v) .then(res => { if (res.code && res.code !== 0) { @@ -156,7 +156,7 @@ const calcData = (view: Chart, callback, resetPageInfo = true) => { } else { chartData.value = res?.data as Partial state.totalItems = res?.totalItems - dvMainStore.setViewDataDetails(view.id, res) + dvMainStore.setViewDataDetails(viewInfo.id, res) emit('onDrillFilters', res?.drillFilters) renderChart(res as unknown as Chart, resetPageInfo) }