From dc638be8601574c141746e81d0629251e48cc50c Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Sat, 27 Nov 2021 11:42:27 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1328=20fix=EF=BC=9A=20line-chart=20?=
 =?UTF-8?q?=E6=95=B0=E5=80=BC=E4=B8=BAnull=E6=97=B6=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BAtooltip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/charts/chartPreview.vue    | 11 +++-
 .../components/charts/line-chart-block.vue    | 63 +++++++++++++------
 .../page/dashboard/overview/chart.vue         | 11 +++-
 3 files changed, 65 insertions(+), 20 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chartPreview.vue b/nezha-fronted/src/components/charts/chartPreview.vue
index efa8ab19b..aad43b80c 100644
--- a/nezha-fronted/src/components/charts/chartPreview.vue
+++ b/nezha-fronted/src/components/charts/chartPreview.vue
@@ -924,6 +924,7 @@ export default {
           formatter: function (params) {
             let str = '<div>'
             let sum = 0
+            let showFlag = false
             params.forEach((item, i) => {
               const tip = legend[item.seriesIndex]
               const color = self.bgColorList[item.seriesIndex]
@@ -934,6 +935,10 @@ export default {
                     [tData.getHours(), tData.getMinutes(), tData.getSeconds()].join(':')
                 str += '<br/>'
               }
+              showFlag = showFlag || item.data[1]
+              if (isNaN(item.data[1] + '')) {
+                return
+              }
               const val = formatScientificNotation(item.data[1], 2)
               sum += isNaN(self.numberWithEConvent(val)) ? 0 : Number(self.numberWithEConvent(val))
               str += '<div style="white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;display: flex; justify-content: space-between; min-width: 150px; max-width: 600px; line-height: 18px; font-size: 12px;">'
@@ -960,7 +965,11 @@ export default {
               str += '</div>'
             }
             str += '</div>'
-            return str
+            if (!showFlag) {
+              return ''
+            } else {
+              return str
+            }
           }
         },
         legend: {
diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue
index 5ebe40687..e53b2c8b1 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.vue
+++ b/nezha-fronted/src/components/charts/line-chart-block.vue
@@ -813,6 +813,7 @@ export default {
           formatter: function (params) {
             let str = '<div>'
             let sum = 0
+            let showFlag = false
             let minusFlag = true
             params.forEach((item, i) => {
               const tip = legend[item.seriesIndex]
@@ -835,6 +836,10 @@ export default {
                 str += '</div>'
                 minusFlag = false
               }
+              showFlag = showFlag || item.data[1]
+              if (isNaN(item.data[1] + '')) {
+                return
+              }
               const previousItem = params.find((series) => ('Previous ' + item.seriesName) === series.seriesName)
               let paramsDot = bus.countDecimals(item.data[1])
               if (paramsDot < self.chartDot) {
@@ -887,7 +892,11 @@ export default {
             }
 
             str += '</div>'
-            return str
+            if (!showFlag) {
+              return ''
+            } else {
+              return str
+            }
           }
         },
         legend: {
@@ -1004,11 +1013,11 @@ export default {
         series: dataArg
       }
       if (!maxValueCopies.copies) {
-          option.yAxis.min = 0
-          option.yAxis.max = 1
-        } else {
-          option.yAxis.max = undefined
-        }
+        option.yAxis.min = 0
+        option.yAxis.max = 1
+      } else {
+        option.yAxis.max = undefined
+      }
       if (unit.type == 'Time') {
         delete option.yAxis.maxInterval
       }
@@ -1127,6 +1136,7 @@ export default {
                   formatter: function (params) {
                     let str = '<div>'
                     let sum = 0
+                    let showFlag = false
                     params.forEach((item, i) => {
                       const tip = self.legendMagicType[item.seriesIndex]
                       const color = self.bgColorList[item.seriesIndex]
@@ -1141,6 +1151,10 @@ export default {
                         str += bus.timeFormate(tData)
                         str += '</div>'
                       }
+                      showFlag = showFlag || item.data[1]
+                      if (isNaN(item.data[1] + '')) {
+                        return
+                      }
                       const val = formatScientificNotation(item.data[1], 2)
                       sum += isNaN(self.numberWithEConvent(val)) ? 0 : Number(self.numberWithEConvent(val))
                       str += '<div style="white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;display: flex; justify-content: space-between; min-width: 150px; max-width: 600px; line-height: 18px; font-size: 12px;">'
@@ -1163,7 +1177,11 @@ export default {
                     }
 
                     str += '</div>'
-                    return str
+                    if (!showFlag) {
+                      return ''
+                    } else {
+                      return str
+                    }
                   }
                 }
               })
@@ -1295,6 +1313,7 @@ export default {
                   formatter: function (params) {
                     let str = '<div>'
                     let sum = 0
+                    let showFlag = false
                     let minusFlag = true
                     params.forEach((item, i) => {
                       const tip = self.legendMagicType[item.seriesIndex]
@@ -1317,6 +1336,10 @@ export default {
                         str += '</div>'
                         minusFlag = false
                       }
+                      showFlag = showFlag || item.data[1]
+                      if (isNaN(item.data[1] + '')) {
+                        return
+                      }
                       const previousItem = params.find((series) => ('Previous ' + item.seriesName) === series.seriesName)
                       const val = formatScientificNotation(item.data[1], 2)
                       sum += isNaN(self.numberWithEConvent(val)) ? 0 : Number(self.numberWithEConvent(val))
@@ -1373,7 +1396,11 @@ export default {
                     }
 
                     str += '</div>'
-                    return str
+                    if (!showFlag) {
+                      return ''
+                    } else {
+                      return str
+                    }
                   }
                 }
               })
@@ -1918,11 +1945,11 @@ export default {
         }
       }
       if (!maxValueCopies.copies) {
-          option.yAxis.min = 0
-          option.yAxis.max = 1
-        } else {
-          option.yAxis.max = undefined
-        }
+        option.yAxis.min = 0
+        option.yAxis.max = 1
+      } else {
+        option.yAxis.max = undefined
+      }
       if (unit.type == 'Time' || option.yAxis.maxInterval === 1) {
         delete option.yAxis.maxInterval
       }
@@ -1965,11 +1992,11 @@ export default {
         }
       }
       if (!maxValueCopies.copies) {
-          option.yAxis.min = 0
-          option.yAxis.max = 1
-        } else {
-          option.yAxis.max = undefined
-        }
+        option.yAxis.min = 0
+        option.yAxis.max = 1
+      } else {
+        option.yAxis.max = undefined
+      }
       if (unit.type == 'Time' || option.yAxis.maxInterval === 1) {
         delete option.yAxis.maxInterval
       }
diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
index e8a55d15b..366ca35f1 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
@@ -413,6 +413,7 @@ export default {
       return params.title
     },
     defaultTooltipFormatter: function (params) {
+      let showFlag = false
       let minusFlag = true
       let str = '<div>'
       params instanceof Array || (params = [params])
@@ -436,6 +437,10 @@ export default {
           str += '<br/>'
           minusFlag = false
         }
+        showFlag = showFlag || item.data[1]
+        if (isNaN(item.data[1] + '')) {
+          return
+        }
         const val = Number(item.data[1])
         str += '<div style="white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;display: flex; justify-content: space-between; min-width: 150px; max-width: 600px; line-height: 18px; font-size: 12px;">'
         str += `<div style="max-width: 500px;white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;"><span style='display:inline-block;margin-right:5px;border-radius:10px;width:15px;height:5px;background-color: ${item.color};}'></span>${alias || item.seriesName}:  </div>`
@@ -472,7 +477,11 @@ export default {
         str += '</div>'
       })
       str += '</div>'
-      return str
+      if (!showFlag) {
+        return ''
+      } else {
+        return str
+      }
     },
     queryAlias: function (i) {
       let alias = null