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

NEZ-1328 fix： line-chart 数值为null时不显示tooltip

Browse Source
This commit is contained in:
zhangyu
2021-11-27 11:42:27 +08:00
parent d15931a5bf
commit dc638be860
3 changed files with 65 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nezha-fronted/src/components/charts/chartPreview.vue
View File

@@ -924,6 +924,7 @@ export default {
formatter: function (params) {
let str = '<div>'
let sum = 0
let showFlag = false
params.forEach((item, i) => {
const tip = legend[item.seriesIndex]
const color = self.bgColorList[item.seriesIndex]
@@ -934,6 +935,10 @@ export default {
[tData.getHours(), tData.getMinutes(), tData.getSeconds()].join(':')
str += '<br/>'
}
showFlag = showFlag || item.data[1]
if (isNaN(item.data[1] + '')) {
return
}
const val = formatScientificNotation(item.data[1], 2)
sum += isNaN(self.numberWithEConvent(val)) ? 0 : Number(self.numberWithEConvent(val))
str += '<div style="white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;display: flex; justify-content: space-between; min-width: 150px; max-width: 600px; line-height: 18px; font-size: 12px;">'
@@ -960,8 +965,12 @@ export default {
str += '</div>'
}
str += '</div>'
if (!showFlag) {
return ''
} else {
return str
}
}
},
legend: {
show: false

27
nezha-fronted/src/components/charts/line-chart-block.vue
View File

@@ -813,6 +813,7 @@ export default {
formatter: function (params) {
let str = '<div>'
let sum = 0
let showFlag = false
let minusFlag = true
params.forEach((item, i) => {
const tip = legend[item.seriesIndex]
@@ -835,6 +836,10 @@ export default {
str += '</div>'
minusFlag = false
}
showFlag = showFlag || item.data[1]
if (isNaN(item.data[1] + '')) {
return
}
const previousItem = params.find((series) => ('Previous ' + item.seriesName) === series.seriesName)
let paramsDot = bus.countDecimals(item.data[1])
if (paramsDot < self.chartDot) {
@@ -887,8 +892,12 @@ export default {
}
str += '</div>'
if (!showFlag) {
return ''
} else {
return str
}
}
},
legend: {
show: false
@@ -1127,6 +1136,7 @@ export default {
formatter: function (params) {
let str = '<div>'
let sum = 0
let showFlag = false
params.forEach((item, i) => {
const tip = self.legendMagicType[item.seriesIndex]
const color = self.bgColorList[item.seriesIndex]
@@ -1141,6 +1151,10 @@ export default {
str += bus.timeFormate(tData)
str += '</div>'
}
showFlag = showFlag || item.data[1]
if (isNaN(item.data[1] + '')) {
return
}
const val = formatScientificNotation(item.data[1], 2)
sum += isNaN(self.numberWithEConvent(val)) ? 0 : Number(self.numberWithEConvent(val))
str += '<div style="white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;display: flex; justify-content: space-between; min-width: 150px; max-width: 600px; line-height: 18px; font-size: 12px;">'
@@ -1163,9 +1177,13 @@ export default {
}
str += '</div>'
if (!showFlag) {
return ''
} else {
return str
}
}
}
})
} else {
getChart(self.chartIndex) && getChart(self.chartIndex).setOption({
@@ -1295,6 +1313,7 @@ export default {
formatter: function (params) {
let str = '<div>'
let sum = 0
let showFlag = false
let minusFlag = true
params.forEach((item, i) => {
const tip = self.legendMagicType[item.seriesIndex]
@@ -1317,6 +1336,10 @@ export default {
str += '</div>'
minusFlag = false
}
showFlag = showFlag || item.data[1]
if (isNaN(item.data[1] + '')) {
return
}
const previousItem = params.find((series) => ('Previous ' + item.seriesName) === series.seriesName)
const val = formatScientificNotation(item.data[1], 2)
sum += isNaN(self.numberWithEConvent(val)) ? 0 : Number(self.numberWithEConvent(val))
@@ -1373,9 +1396,13 @@ export default {
}
str += '</div>'
if (!showFlag) {
return ''
} else {
return str
}
}
}
})
} else {
this.setOption({

9
nezha-fronted/src/components/page/dashboard/overview/chart.vue
View File

@@ -413,6 +413,7 @@ export default {
return params.title
},
defaultTooltipFormatter: function (params) {
let showFlag = false
let minusFlag = true
let str = '<div>'
params instanceof Array || (params = [params])
@@ -436,6 +437,10 @@ export default {
str += '<br/>'
minusFlag = false
}
showFlag = showFlag || item.data[1]
if (isNaN(item.data[1] + '')) {
return
}
const val = Number(item.data[1])
str += '<div style="white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;display: flex; justify-content: space-between; min-width: 150px; max-width: 600px; line-height: 18px; font-size: 12px;">'
str += `<div style="max-width: 500px;white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;"><span style='display:inline-block;margin-right:5px;border-radius:10px;width:15px;height:5px;background-color: ${item.color};}'></span>${alias || item.seriesName}: </div>`
@@ -472,7 +477,11 @@ export default {
str += '</div>'
})
str += '</div>'
if (!showFlag) {
return ''
} else {
return str
}
},
queryAlias: function (i) {
let alias = null