From 385c17c792ba40628e8a1aa1ed0c4054528f08ea Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Mon, 21 Sep 2020 11:34:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=9B=BE=E8=A1=A8=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0legend=20option=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/language/cn.js | 11 ++++++++- .../src/components/common/language/en.js | 3 ++- .../components/page/dashboard/chartBox.vue | 23 +++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index c75f469ce..33675d057 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -178,7 +178,16 @@ const cn = { alertRule:'告警规则', level:'级别', state:'状态' - } + }, + valMapping:{ + name:'Value mapping', + from:'From', + to:'To', + text:'Text', + value:'Value', + range:'Range', + }, + legendValue:'Legend option' }, chartTableColumn: { metric: "指标", diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 044618dd8..a947671a0 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -192,7 +192,8 @@ const en = { text:'Text', value:'Value', range:'Range', - } + }, + legendValue:'Legend option' }, chartTableColumn:{ metric:'Metric', //'指标' diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue index 0d25de3b7..ac08d518e 100644 --- a/nezha-fronted/src/components/page/dashboard/chartBox.vue +++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue @@ -245,6 +245,27 @@ + @@ -369,6 +390,7 @@ }, heightSuggestions:['300','400','500','600'], unitOptions:chartDataFormat.unitOptions(), + sortedOptionKeys:[{key:'min',label:'Min'},{key:'max',label:'Max'},{key:'avg',label:'Avg'},{key:'last',label:'Current'},{key:'total',label:'Total'}] } }, components:{ @@ -1005,6 +1027,7 @@ param.url=''; param.threshold=''; param.valueMapping={type:'text',mapping:[{value:'',text:''}]}; + param.legendValue={min:'off',max:'off',avg:'off',last:'off',total:'off'} this.$set(this.editChart, "param", param); this.elements = [1]; this.elementTarget = [];