From 82bd68eb4eae505a90fa0f60820797402f284097 Mon Sep 17 00:00:00 2001 From: junjun Date: Fri, 25 Nov 2022 16:53:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E4=B8=8D=E6=94=AF=E6=8C=81=E7=9B=B4?= =?UTF-8?q?=E8=BF=9E=E5=88=86=E9=A1=B5=EF=BC=8C=E4=BD=BF=E7=94=A8=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/components/ChartComponentS2.vue | 2 +- frontend/src/views/chart/components/table/TableNormal.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/chart/components/ChartComponentS2.vue b/frontend/src/views/chart/components/ChartComponentS2.vue index a10365bb4f..53c6e7be64 100644 --- a/frontend/src/views/chart/components/ChartComponentS2.vue +++ b/frontend/src/views/chart/components/ChartComponentS2.vue @@ -234,7 +234,7 @@ export default { const attr = JSON.parse(this.chart.customAttr) this.currentPage.pageSize = parseInt(attr.size.tablePageSize ? attr.size.tablePageSize : 20) data = JSON.parse(JSON.stringify(this.chart.data.tableRow)) - if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasetType)) { + if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) { if (this.chart.type === 'table-info' && (attr.size.tablePageMode === 'page' || !attr.size.tablePageMode) && this.chart.totalItems > this.currentPage.pageSize) { this.currentPage.show = this.chart.totalItems this.showPage = true diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue index 1a53ced39d..7a5af2efaf 100644 --- a/frontend/src/views/chart/components/table/TableNormal.vue +++ b/frontend/src/views/chart/components/table/TableNormal.vue @@ -238,7 +238,7 @@ export default { } data = JSON.parse(JSON.stringify(this.chart.data.tableRow)) - if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasetType)) { + if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) { if (this.chart.type === 'table-info' && (attr.size.tablePageMode === 'page' || !attr.size.tablePageMode) && this.chart.totalItems > this.currentPage.pageSize) { this.currentPage.show = this.chart.totalItems this.showPage = true