From 05ae057172acc31487cf59bdedddc0250eb1d209 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Mon, 8 Mar 2021 16:37:43 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=A2=9E=E5=8A=A0chart=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88{{name}}=E6=98=A0=E5=B0=84=E3=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/chartPreview.vue | 4 ++--
 nezha-fronted/src/components/common/language/cn.js   | 2 +-
 nezha-fronted/src/components/common/language/en.js   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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',