From e42143ee5a5cafe2f7ac4141823812219277afbf Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Fri, 24 Nov 2023 15:28:53 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE-=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D=E9=9D=9E=E7=9B=B4=E8=BF=9E?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=E6=98=8E=E7=BB=86=E8=A1=A8=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E7=94=B1=E5=B0=8F=E5=8F=98=E5=A4=A7=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/frontend/src/views/chart/components/ChartComponentS2.vue | 3 +++ core/frontend/src/views/chart/components/table/TableNormal.vue | 3 +++ 2 files changed, 6 insertions(+) diff --git a/core/frontend/src/views/chart/components/ChartComponentS2.vue b/core/frontend/src/views/chart/components/ChartComponentS2.vue index 907bbbec8d..a051995a50 100644 --- a/core/frontend/src/views/chart/components/ChartComponentS2.vue +++ b/core/frontend/src/views/chart/components/ChartComponentS2.vue @@ -254,6 +254,9 @@ export default { if (this.chart.data && this.chart.data.fields) { this.fields = JSON.parse(JSON.stringify(this.chart.data.fields)) const attr = JSON.parse(this.chart.customAttr) + if (this.currentPage.pageSize < attr.size.tablePageSize) { + this.currentPage.page = 1 + } 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.datasourceType)) { diff --git a/core/frontend/src/views/chart/components/table/TableNormal.vue b/core/frontend/src/views/chart/components/table/TableNormal.vue index 5f4368e1f8..0a25c2662d 100644 --- a/core/frontend/src/views/chart/components/table/TableNormal.vue +++ b/core/frontend/src/views/chart/components/table/TableNormal.vue @@ -294,6 +294,9 @@ export default { } this.fields = fields const attr = JSON.parse(this.chart.customAttr) + if (this.currentPage.pageSize < attr.size.tablePageSize) { + this.currentPage.page = 1 + } this.currentPage.pageSize = parseInt(attr.size.tablePageSize ? attr.size.tablePageSize : 20) // column width