@@ -153,7 +153,6 @@
this.packageTypeInfo();
}else if(type == 'range'){
this.noStyleSuggestions={range:suggestions.getRateRange()}
- this.showSuggestions=this.deepClone(this.noStyleSuggestions)
}
},
packageTypeInfo:function(){
@@ -267,7 +266,6 @@
this.$set(this.noStyleSuggestions,'metrics',this.tempStoreMetric)
// this.$set(this.noStyleSuggestions,'operators',suggestions.getOperators())
this.$set(this.noStyleSuggestions,'functions',suggestions.getFunctions())
- this.showSuggestions=this.deepClone(this.noStyleSuggestions)
},
queryValues:function(){
let labelValuesReg=/\{((\w*?(=|!=|=~|!~).*?,{0,1})+?)\}/
@@ -298,7 +296,6 @@
let values=this.labelValues.get(label);
this.noStyleSuggestions={values:values}
- this.showSuggestions=this.deepClone(this.noStyleSuggestions)
}
}
},
@@ -362,11 +359,9 @@
})
this.noStyleSuggestions={labels:labels}
- this.showSuggestions=this.deepClone(this.noStyleSuggestions);
//console.log('change labels',this.showSuggestions)
}else{
this.noStyleSuggestions={};
- this.showSuggestions=this.deepClone(this.noStyleSuggestions)
}
})
},
@@ -532,12 +527,12 @@
filterItems:function(input){ //过滤下拉选显示
let suggestions=this.deepClone(this.noStyleSuggestions)
- let hasResolve=false;
new Promise((resolve => {
- let counter = 0;
+ let start = new Date().getTime();
+ let result={};
this.orders.forEach(key=>{
let typeValues=suggestions[key];
- this.showSuggestions[key]=[];
+ result[key]=[];
typeValues&&typeValues.forEach(item=>{
let index=item.insertText.toLowerCase().indexOf(input.toLowerCase());
//console.log('index',index,'input',input)
@@ -549,20 +544,17 @@
let middle=label.substring(index,index+input.length)
let suf=label.substring(index+input.length,label.length)
item.label=`${pre}
${middle}${suf}`
- this.showSuggestions[key].push(item);
- if(++counter > 20){
- hasResolve=true;
- resolve();
- }
+ result[key].push(item);
}
});
- if(this.showSuggestions[key].length<1){
- delete this.showSuggestions[key]
+ if(result[key].length<1){
+ delete result[key]
}
})
- if(!hasResolve){
- resolve();
- }
+ this.showSuggestions=result;
+ let end = new Date().getTime();
+ console.log("filter time:",(end - start),'ms')
+ resolve();
})).then(()=>{
if(Object.keys(this.showSuggestions).length>0){
this.showType=true;
diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
index da7ae54d1..1e7440fc4 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
@@ -412,19 +412,22 @@
let maxValue=0;
let minValue=0;
if(chartInfo.unit &&dataArg.length>0){
- maxValue=dataArg[0].data[0][1];
- minValue=dataArg[0].data[0][1];
+ maxValue=0;
+ minValue=0;
for(let j = 0; j < dataArg.length ; j++){
for (let i = 0; i < dataArg[j].data.length - 1; i++) {
- maxValue = (maxValue < Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : maxValue);
- minValue = (minValue > Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : minValue);
+ if(dataArg[j].data[i+1][1]!=='NaN'){
+ maxValue = (maxValue < Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : maxValue);
+ minValue = (minValue > Number(dataArg[j].data[i+1][1]) ? Number(dataArg[j].data[i+1][1]) : minValue);
+ }
}
}
}
let chartUnit=chartInfo.unit?chartInfo.unit:2;
let unit=chartDataFormat.getUnit(chartUnit);
+ minValue=minValue>0?0:minValue;
+ maxValue=maxValue-minValue;
maxValue=chartDataFormat.formatDatas(maxValue,unit.type,'ceil',unit.ascii);
- minValue=chartDataFormat.formatDatas(minValue,unit.type,'floor',unit.ascii);
let oldValue=maxValue;
let dot=0;
if(maxValue==1){
@@ -443,7 +446,6 @@
dot++;
}
let copies=chartDataFormat.copies(oldValue,unit.type);
- // console.log(oldValue,copies,maxValue);
let oldDot=2;
if(maxValue<=1){
oldDot=dot>6?6:dot;
@@ -456,7 +458,7 @@
unit,
oldDot
}
- }
+ },
},
mounted() {
this.chartInit();
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 320d74766..c7e7c0989 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -322,11 +322,28 @@
message: this.$t("tip.deleteSuccess")
});
let chartList=this.$refs.chartList.dataList;
+ let nextChart=null,prevChart=null
for (let i =0;i< chartList.length;i++){
if(chartList[i].id === data.id){
chartList.splice(i,1);
- break;
}
+ if(data.next != -1){
+ if(chartList[i].id === data.next){
+ nextChart = chartList[i]
+ }
+ }
+ if(data.prev != 0){
+ if(chartList[i].id === data.prev){
+ prevChart = chartList[i]
+ }
+ }
+ }
+ if(nextChart&&prevChart){ //删除图表为中间位置
+ prevChart.next = nextChart.id;
+ nextChart.prev = prevChart.id;
+ }else{
+ if(!nextChart) prevChart.next = -1;
+ if(!prevChart) nextChart.prev = 0;
}
// this.getTableData(); //删除相关图表后，刷新面板数据
} else {
@@ -356,6 +373,7 @@
if(this.$refs.chartList){
this.$refs.chartList.initData(params);
}
+ this.panelReloadOnlyPanel();
},
/*图表相关操作--end*/
diff --git a/nezha-fronted/static/template/en/asset-template.xlsx b/nezha-fronted/static/template/en/asset-template.xlsx
deleted file mode 100644
index 26275ce29..000000000
Binary files a/nezha-fronted/static/template/en/asset-template.xlsx and /dev/null differ
diff --git a/nezha-fronted/static/template/en/endpoint-template.xlsx b/nezha-fronted/static/template/en/endpoint-template.xlsx
deleted file mode 100644
index d141ac4c1..000000000
Binary files a/nezha-fronted/static/template/en/endpoint-template.xlsx and /dev/null differ