diff --git a/nezha-fronted/src/components/charts/chartPreview.vue b/nezha-fronted/src/components/charts/chartPreview.vue index 63bcf9894..a2d902f3c 100644 --- a/nezha-fronted/src/components/charts/chartPreview.vue +++ b/nezha-fronted/src/components/charts/chartPreview.vue @@ -596,7 +596,7 @@ if(this.mapping&&!this.mapping.color){ this.mapping.color={bac:'#fff',text:'#000'} } - this.serieSingleStat = mapping?mapping.text.replace('{{value}}', singleStatTmp):chartDataFormat.getUnit(chartItem.unit?chartItem.unit:2).compute(singleStatTmp,null,2); + this.serieSingleStat = mapping?mapping.text.replace('{{value}}', singleStatTmp).replace('{{name}}', chartItem.elements[0].legend):chartDataFormat.getUnit(chartItem.unit?chartItem.unit:2).compute(singleStatTmp,null,2); }else{ this.serieSingleStat = chartDataFormat.getUnit(chartItem.unit?chartItem.unit:2).compute(singleStatTmp,null,2); } @@ -1198,7 +1198,7 @@ } this.mapping=mapping; item.mapping=mapping; - item.value = mapping?mapping.text.replace('{{value}}', item.value):this.unit.compute(value,null,2); + item.value = mapping?mapping.text.replace('{{value}}', item.value).replace('{{name}}', item.element.alias):this.unit.compute(value,null,2); } return item; }) diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index d32af2105..f36cdf2ce 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -189,7 +189,7 @@ const cn = { unit: "单位", legend: "图例", legendTip: "使用名称或表达式控制时间序列的名称。例如{{hostname}将替换为标签主机名的标签值。", - valueMappingTip: '使用{{value}}可以显示原值\n'+ + valueMappingTip: '使用{{name}}和{{value}}显示原名和原值\n'+ '例如:total alive: {{value}}\n'+ '结果为:total alive: 100', option: "操作", diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index c58c97ab7..d15f0d162 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -147,7 +147,7 @@ const en = { legend:'Legend', statistics:'Statistics', legendTip:'Controls the name of the time series, using name or pattern. For example {{hostname}} will be replaced with label value for the label hostname.', - valueMappingTip: 'Use {{value}} to display the original value\n'+ + valueMappingTip: 'Use {{name}} and {{value}} to display the original name and value\n'+ 'For example: Total Alive: {{value}}\n'+ 'The result is: Total Alive: 100', sync: 'Sync to assets',