From badb7555007ef4e5e168fdc617b2ec8957adca82 Mon Sep 17 00:00:00 2001 From: junjun Date: Fri, 25 Nov 2022 17:52:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=95=B0=E6=8D=AE=E6=BA=90=E4=B8=8D=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=9B=B4=E8=BF=9E=E5=88=86=E9=A1=B5=EF=BC=8C=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=89=8D=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 | 4 ++-- frontend/src/views/chart/components/table/TableNormal.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/views/chart/components/ChartComponentS2.vue b/frontend/src/views/chart/components/ChartComponentS2.vue index 53c6e7be64..39c91a2c90 100644 --- a/frontend/src/views/chart/components/ChartComponentS2.vue +++ b/frontend/src/views/chart/components/ChartComponentS2.vue @@ -455,7 +455,7 @@ export default { }, pageChange(val) { this.currentPage.pageSize = val - if (this.chart.datasetMode === 0) { + if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) { this.$emit('onPageChange', this.currentPage) } else { this.initData() @@ -465,7 +465,7 @@ export default { pageClick(val) { this.currentPage.page = val - if (this.chart.datasetMode === 0) { + if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) { this.$emit('onPageChange', this.currentPage) } else { this.initData() diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue index 7a5af2efaf..d99837281f 100644 --- a/frontend/src/views/chart/components/table/TableNormal.vue +++ b/frontend/src/views/chart/components/table/TableNormal.vue @@ -444,7 +444,7 @@ export default { pageChange(val) { this.currentPage.pageSize = val - if (this.chart.datasetMode === 0) { + if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) { this.$emit('onPageChange', this.currentPage) } else { this.init() @@ -453,7 +453,7 @@ export default { pageClick(val) { this.currentPage.page = val - if (this.chart.datasetMode === 0) { + if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) { this.$emit('onPageChange', this.currentPage) } else { this.init() From 411601562600101cdc21215eee6e92741aa1459c Mon Sep 17 00:00:00 2001 From: junjun Date: Fri, 25 Nov 2022 18:02:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=95=B0=E6=8D=AE=E6=BA=90=E4=B8=8D=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=9B=B4=E8=BF=9E=E5=88=86=E9=A1=B5=EF=BC=8C=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=89=8D=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/chart/chart.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js index 9fd766a019..728f7469d4 100644 --- a/frontend/src/views/chart/chart/chart.js +++ b/frontend/src/views/chart/chart/chart.js @@ -1108,4 +1108,4 @@ export const CHART_FONT_LETTER_SPACE = [ { name: '10px', value: '10' } ] -export const NOT_SUPPORT_PAGE_DATASET = ['kylin', 'sqlServer', 'es', 'presto'] +export const NOT_SUPPORT_PAGE_DATASET = ['kylin', 'sqlServer', 'es', 'presto', 'ds_doris', 'StarRocks']