From 7440fe4330afb52a703223fe7f09021c6949e7fa Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 30 Jun 2023 12:13:56 +0800
Subject: [PATCH] =?UTF-8?q?perf(=E8=A7=86=E5=9B=BE):=20=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=A2=9E=E5=8A=A0=E9=9A=90=E8=97=8F=E7=A9=BA?=
 =?UTF-8?q?=E5=80=BC=E8=AE=BE=E7=BD=AE#5562?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                                |  2 ++
 frontend/src/lang/tw.js                                |  2 ++
 frontend/src/lang/zh.js                                |  2 ++
 frontend/src/views/chart/chart/map/map.js              |  6 +++++-
 frontend/src/views/chart/chart/util.js                 |  1 +
 .../chart/components/shapeAttr/TooltipSelector.vue     | 10 ++++++++++
 6 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index e78404581a..633c74808d 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -935,6 +935,8 @@ export default {
     password_input_error: 'Original password input error'
   },
   chart: {
+    empty_hide: 'hiden empty',
+    hide: 'hide',
     chart_refresh_tips: 'View refresh setting takes precedence over panel refresh setting',
     '1-trend': 'trend',
     '2-state': 'State',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 9c09e989fa..05355e1942 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -934,6 +934,8 @@ export default {
     password_input_error: '原始密碼輸入錯誤'
   },
   chart: {
+    empty_hide: '隱藏空值',
+    hide: '隱藏',
     chart_refresh_tips: '視圖刷新設置優先於儀表板刷新設置',
     '1-trend': '趨勢',
     '2-state': '狀態',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index fc55889561..7bb7c43200 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -933,6 +933,8 @@ export default {
     password_input_error: '原始密码输入错误'
   },
   chart: {
+    empty_hide: '隐藏空值',
+    hide: '隐藏',
     chart_refresh_tips: '视图刷新设置优先于仪表板刷新设置',
     '1-trend': '趋势',
     '2-state': '状态',
diff --git a/frontend/src/views/chart/chart/map/map.js b/frontend/src/views/chart/chart/map/map.js
index 1d534f9a9e..5433ca8441 100644
--- a/frontend/src/views/chart/chart/map/map.js
+++ b/frontend/src/views/chart/chart/map/map.js
@@ -72,9 +72,13 @@ export function baseMapOption(chart_option, geoJson, chart, themeStyle, curAreaC
       const reg = new RegExp('\n', 'g')
       const text = tooltip.formatter.replace(reg, '<br/>')
       tooltip.formatter = params => {
+        const val = params.value
+        if (tooltip.emptyHide && (val === null || typeof val === 'undefined' || isNaN(val))) {
+          return ''
+        }
         const a = params.seriesName
         const b = params.name
-        const c = params.value ?? ''
+        const c = (val === null || typeof val === 'undefined' || isNaN(val)) ? '' : val
         return text.replace(new RegExp('{a}', 'g'), a).replace(new RegExp('{b}', 'g'), b).replace(new RegExp('{c}', 'g'), c)
       }
       chart_option.tooltip = tooltip
diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js
index 52ad0e780b..2d06070bdd 100644
--- a/frontend/src/views/chart/chart/util.js
+++ b/frontend/src/views/chart/chart/util.js
@@ -3323,6 +3323,7 @@ export const TYPE_CONFIGS = [
       ],
       'tooltip-selector': [
         'show',
+        'emptyHide',
         'textStyle',
         'formatter'
       ],
diff --git a/frontend/src/views/chart/components/shapeAttr/TooltipSelector.vue b/frontend/src/views/chart/components/shapeAttr/TooltipSelector.vue
index 618d32e305..b04e740df2 100644
--- a/frontend/src/views/chart/components/shapeAttr/TooltipSelector.vue
+++ b/frontend/src/views/chart/components/shapeAttr/TooltipSelector.vue
@@ -18,6 +18,16 @@
           >{{ $t('chart.show') }}</el-checkbox>
         </el-form-item>
         <div v-show="tooltipForm.show">
+          <el-form-item
+            v-show="showProperty('emptyHide')"
+            :label="$t('chart.empty_hide')"
+            class="form-item"
+          >
+            <el-checkbox
+              v-model="tooltipForm.emptyHide"
+              @change="changeTooltipAttr('emptyHide')"
+            >{{ $t('chart.hide') }}</el-checkbox>
+          </el-form-item>
           <el-form-item
             v-show="showProperty('trigger')"
             :label="$t('chart.trigger_position')"