gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 单值/table的valuemapping增加{{name}}

Browse Source
This commit is contained in:
chenjinsong
2021-02-23 16:38:11 +08:00
parent 1ca22fa6ed
commit 3c0e874ab2
3 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/charts/chart-single-stat.vue
View File

@@ -436,7 +436,7 @@ export default {
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);
}
@@ -472,7 +472,7 @@ export default {
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);
}

2
nezha-fronted/src/components/charts/chart-table.vue
View File

@@ -409,7 +409,7 @@
}
this.mapping=mapping;
item.mapping=mapping;
item.value = mapping?mapping.text.replace('{{value}}', item.value):chartDataFormat.getUnit(chartItem.unit?chartItem.unit:2).compute(value,null,2);
item.value = mapping?mapping.text.replace('{{value}}', item.value).replace('{{name}}', item.element.alias):chartDataFormat.getUnit(chartItem.unit?chartItem.unit:2).compute(value,null,2);
}
return item;
}));

37
nezha-fronted/src/components/page/config/terminallog.vue
View File

@@ -217,32 +217,19 @@
searchMsg: { //给搜索框子组件传递的信息
zheze_none: true,
searchLabelList: [
// {
// id: 10,
// name: this.$t('config.terminallog.protocol'),
// type: 'selectType',
// label: 'protocol',
// disabled: false
// },
{
id: 11,
name: this.$t('config.terminallog.host'),
type: 'input',
label: 'host',
disabled: false
},{
id: 12,
name: this.$t('config.terminallog.user'),
type: 'input',
label: 'user',
disabled: false
},{
id: 14,
name: this.$t('config.terminallog.userId'),
type: 'input',
label: 'userId',
disabled: false
}
id: 11,
name: this.$t('config.terminallog.host'),
type: 'input',
label: 'host',
disabled: false
},{
id: 12,
name: this.$t('config.terminallog.user'),
type: 'input',
label: 'username',
disabled: false
}
],
},
searchLabel: {}, //搜索参数