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, '
') 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') }}
+ + {{ $t('chart.hide') }} +