fix:endpoint query loading调整 & dashboard bug修复

1.endpoint query loading样式调整
2.dashboard preview 无法显示图表bug修复
This commit is contained in:
wangwenrui
2020-03-12 14:10:37 +08:00
parent 20f982a049
commit 32bcf09c73
7 changed files with 125 additions and 73 deletions

View File

@@ -261,11 +261,11 @@ export default {
},
metric_name: '',
};
if(chartInfo.type === 'stackArea'){
seriesItem.theData.type='line';
seriesItem.theData.stack=chartInfo.title
seriesItem.theData.areaStyle={};
}
// if(chartInfo.type === 'stackArea'){
// seriesItem.theData.type='line';
// // seriesItem.theData.stack=chartInfo.title
// seriesItem.theData.areaStyle={};
// }
// 图表中每条线的名字,后半部分
let host = '';//up,
if(queryItem.metric.__name__){
@@ -284,7 +284,7 @@ export default {
if(host.endsWith(',')){host = host.substr(0,host.length-1);}
host +="}";
//处理legend别名
let alias=this.dealLegendAlias(host,chartItem.elements[innerPos].legend);
let alias=this.$refs.editChart[index].dealLegendAlias(host,chartItem.elements[innerPos].legend);
legend.push({name:host,alias:alias});
// 图表中每条线的名字,去掉最后的逗号与空格:metric名称, 标签1=a,标签2=c
seriesItem.theData.name = host;
@@ -397,24 +397,6 @@ export default {
chartBox[index].style.width = `${(size / 12) * 100}%`;
});
},
dealLegendAlias:function(legend,expression){
if(/\{\{.+\}\}/.test(expression)){
let labelValue=expression.replace(/(\{\{.+?\}\})/g,function(i){
let label=i.substr(i.indexOf('{{')+2,i.indexOf('}}')-i.indexOf('{{')-2)
let reg=new RegExp(label+'=".+?"')
let value=null;
if(reg.test(legend)){
let find=legend.match(reg)[0];
value=find.substr(find.indexOf('"')+1,find.lastIndexOf('"')-find.indexOf('"')-1);
}
return value?value:label;
})
return labelValue
}else{
return expression;
}
},
getNewTime(time, num) {
const date = new Date(time);
const newDate = new Date(parseInt(date.getTime(), 10) + num);