From f216b25c7bf27912850a41c9c514e4f764fa94ed Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Wed, 21 Dec 2022 13:12:48 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E6=9F=B1=E7=8A=B6?=
 =?UTF-8?q?=E5=9B=BE=E3=80=81=E6=8A=98=E7=BA=BF=E5=9B=BE=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=9A=90=E8=97=8F=E7=A9=BA=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/chart/ChartViewService.java   | 4 +++-
 frontend/src/views/chart/chart/common/common_antv.js       | 2 +-
 frontend/src/views/chart/chart/formatter.js                | 3 +++
 frontend/src/views/chart/components/senior/FunctionCfg.vue | 7 ++-----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 593e285603..d06d88f47f 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -927,7 +927,9 @@ public class ChartViewService {
         PageInfo pageInfo = new PageInfo();
         pageInfo.setGoPage(chartExtRequest.getGoPage());
         if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) {
-            pageInfo.setPageSize(Math.min(view.getResultCount() - (chartExtRequest.getGoPage() - 1) * chartExtRequest.getPageSize(), chartExtRequest.getPageSize()));
+            if (StringUtils.equalsIgnoreCase(view.getType(), "table-info") && table.getMode() == 0) {
+                pageInfo.setPageSize(Math.min(view.getResultCount() - (chartExtRequest.getGoPage() - 1) * chartExtRequest.getPageSize(), chartExtRequest.getPageSize()));
+            }
         } else {
             pageInfo.setPageSize(chartExtRequest.getPageSize());
         }
diff --git a/frontend/src/views/chart/chart/common/common_antv.js b/frontend/src/views/chart/chart/common/common_antv.js
index 32a1e2f091..fa3921da31 100644
--- a/frontend/src/views/chart/chart/common/common_antv.js
+++ b/frontend/src/views/chart/chart/common/common_antv.js
@@ -371,7 +371,7 @@ export function getTooltip(chart) {
             } else {
               res = param.value
             }
-            obj.value = res
+            obj.value = res === null ? '' : res
             return obj
           }
         }
diff --git a/frontend/src/views/chart/chart/formatter.js b/frontend/src/views/chart/chart/formatter.js
index 9c3be428e3..5a51c89dda 100644
--- a/frontend/src/views/chart/chart/formatter.js
+++ b/frontend/src/views/chart/chart/formatter.js
@@ -23,6 +23,9 @@ export const formatterType = [
 ]
 
 export function valueFormatter(value, formatter) {
+  if (value === null || value === undefined) {
+    return null
+  }
   // 1.unit 2.decimal 3.thousand separator and suffix
   let result
   if (formatter.type === 'auto') {
diff --git a/frontend/src/views/chart/components/senior/FunctionCfg.vue b/frontend/src/views/chart/components/senior/FunctionCfg.vue
index 835e6b48fc..31f96f2968 100644
--- a/frontend/src/views/chart/components/senior/FunctionCfg.vue
+++ b/frontend/src/views/chart/components/senior/FunctionCfg.vue
@@ -76,11 +76,8 @@
             v-model="functionForm.emptyDataStrategy"
             @change="changeFunctionCfg"
           >
-            <el-radio :label="'breakLine'">{{ chart.type.includes('bar')?$t('chart.set_zero'):$t('chart.break_line') }}</el-radio>
-            <el-radio
-              v-if="chart.type.includes('line') || chart.type.includes('area')"
-              :label="'setZero'"
-            >{{ $t('chart.set_zero') }}</el-radio>
+            <el-radio :label="'breakLine'">{{ $t('chart.break_line') }}</el-radio>
+            <el-radio :label="'setZero'">{{ $t('chart.set_zero') }}</el-radio>
             <el-radio :label="'ignoreData'">{{ $t('chart.ignore_data') }}</el-radio>
           </el-radio-group>
         </el-form-item>