From 4a8f129d87d1924152512590e5e3633633e60b7e Mon Sep 17 00:00:00 2001 From: junjun Date: Sun, 4 Feb 2024 17:58:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=9A=E6=97=B6=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=92=8CExcel=E6=94=AF=E6=8C=81=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/frontend/src/views/chart/components/ChartComponentS2.vue | 4 ++-- .../frontend/src/views/chart/components/table/TableNormal.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/frontend/src/views/chart/components/ChartComponentS2.vue b/core/frontend/src/views/chart/components/ChartComponentS2.vue index 19d55c8f45..5b55a277fb 100644 --- a/core/frontend/src/views/chart/components/ChartComponentS2.vue +++ b/core/frontend/src/views/chart/components/ChartComponentS2.vue @@ -494,7 +494,7 @@ export default { }, pageChange(val) { this.currentPage.pageSize = val - if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) { + if ((this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) || this.chart.datasetMode === 1) { this.$emit('onPageChange', this.currentPage) } else { this.initData() @@ -504,7 +504,7 @@ export default { pageClick(val) { this.currentPage.page = val - if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) { + if ((this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) || this.chart.datasetMode === 1) { this.$emit('onPageChange', this.currentPage) } else { this.initData() diff --git a/core/frontend/src/views/chart/components/table/TableNormal.vue b/core/frontend/src/views/chart/components/table/TableNormal.vue index a73cf113c5..e51e1b1f32 100644 --- a/core/frontend/src/views/chart/components/table/TableNormal.vue +++ b/core/frontend/src/views/chart/components/table/TableNormal.vue @@ -566,7 +566,7 @@ export default { pageChange(val) { this.currentPage.pageSize = val - if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) { + if ((this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) || this.chart.datasetMode === 1) { this.$emit('onPageChange', this.currentPage) } else { this.init() @@ -575,7 +575,7 @@ export default { pageClick(val) { this.currentPage.page = val - if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) { + if ((this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) || this.chart.datasetMode === 1) { this.$emit('onPageChange', this.currentPage) } else { this.init()