From 713ba2ab5943da519270258a635aef255eaed083 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 23 Aug 2023 10:21:06 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-3122=20fix=EF=BC=9ADashboard=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=9B=BE=E8=A1=A8=E4=B8=ADNull=20Value=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9connected=E6=97=B6=EF=BC=8C=E5=9B=BE=E8=A1=A8=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chart/chartTimeSeries.vue | 2 --
 nezha-fronted/src/components/chart/chartMixin.js             | 5 ++---
 nezha-fronted/src/components/common/js/tools.js              | 3 +++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
index 17eb68ee1..f9a323bc2 100644
--- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
@@ -501,7 +501,6 @@ export default {
             } else if (item.yAxisIndex == 1) {
               className = 'yAxis-icon nz-icon nz-icon-youzongzhou'
             }
-
             str += `
             <div class="tooltip__row" title="${seriesName}">
               <div class="row__label">
@@ -538,7 +537,6 @@ export default {
               }
               color = self.stackTotalColorRight
             }
-
             str += `
             <div class="tooltip__row">
               <div class="row__label" title="${self.$t('dashboard.dashboard.chartTotal')}">
diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js
index e63252db9..daa4999ef 100644
--- a/nezha-fronted/src/components/chart/chartMixin.js
+++ b/nezha-fronted/src/components/chart/chartMixin.js
@@ -117,9 +117,8 @@ export default {
           if (!this.dataLink.length) {
             s.cursor = 'default'
           }
-
-          if (s.param && s.param.nullType) {
-            s.connectNulls = s.param.nullType !== 'null'
+          if (chartInfo.param && chartInfo.param.nullType) {
+            s.connectNulls = chartInfo.param.nullType !== 'null'
           } else {
             s.connectNulls = false
           }
diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js
index 8813150ff..a5e081bea 100644
--- a/nezha-fronted/src/components/common/js/tools.js
+++ b/nezha-fronted/src/components/common/js/tools.js
@@ -1061,6 +1061,9 @@ export function hideTableTooltip () {
 
 /* 数字转换保留小数，数字很小时转为科学计数法, dot为保留几位小数 */
 export function formatScientificNotation (value, dot = 2) {
+  if (isNaN(value) || value === null) {
+    return value
+  }
   let val = value ? parseFloat(Number(value).toFixed(dot)) : 0
   if (val === 0) {
     val = Number(value).toPrecision(dot + 1)