From 24fef559023c8628f7651304cbdd75eb78eac1d5 Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 6 Dec 2022 14:50:37 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/components/ChartComponentS2.vue | 5 +++-- frontend/src/views/chart/components/table/TableNormal.vue | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/src/views/chart/components/ChartComponentS2.vue b/frontend/src/views/chart/components/ChartComponentS2.vue index 3e6fbfbb97..87f8c75fc2 100644 --- a/frontend/src/views/chart/components/ChartComponentS2.vue +++ b/frontend/src/views/chart/components/ChartComponentS2.vue @@ -67,7 +67,7 @@ > {{ $t('chart.total') }} {{ - chart.datasetMode === 0 ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0) + (chart.datasetMode === 0 && !not_support_page_dataset.includes(chart.datasourceType)) ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0) }} {{ $t('chart.items') }} @@ -173,7 +173,8 @@ export default { }, totalStyle: { color: '#606266' - } + }, + not_support_page_dataset: NOT_SUPPORT_PAGE_DATASET } }, diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue index 511e02caa1..373864104a 100644 --- a/frontend/src/views/chart/components/table/TableNormal.vue +++ b/frontend/src/views/chart/components/table/TableNormal.vue @@ -55,7 +55,7 @@ > {{ $t('chart.total') }} {{ - chart.datasetMode === 0 ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0) + (chart.datasetMode === 0 && !not_support_page_dataset.includes(chart.datasourceType)) ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0) }} {{ $t('chart.items') }} @@ -166,7 +166,8 @@ export default { scrollBarHoverColor: DEFAULT_COLOR_CASE.tableScrollBarHoverColor, totalStyle: { color: '#606266' - } + }, + not_support_page_dataset: NOT_SUPPORT_PAGE_DATASET } }, computed: {