diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue index 17eb68ee1..f9a323bc2 100644 --- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue +++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue @@ -501,7 +501,6 @@ export default { } else if (item.yAxisIndex == 1) { className = 'yAxis-icon nz-icon nz-icon-youzongzhou' } - str += `
@@ -538,7 +537,6 @@ export default { } color = self.stackTotalColorRight } - str += `
diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js index e63252db9..daa4999ef 100644 --- a/nezha-fronted/src/components/chart/chartMixin.js +++ b/nezha-fronted/src/components/chart/chartMixin.js @@ -117,9 +117,8 @@ export default { if (!this.dataLink.length) { s.cursor = 'default' } - - if (s.param && s.param.nullType) { - s.connectNulls = s.param.nullType !== 'null' + if (chartInfo.param && chartInfo.param.nullType) { + s.connectNulls = chartInfo.param.nullType !== 'null' } else { s.connectNulls = false } diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js index 8813150ff..a5e081bea 100644 --- a/nezha-fronted/src/components/common/js/tools.js +++ b/nezha-fronted/src/components/common/js/tools.js @@ -1061,6 +1061,9 @@ export function hideTableTooltip () { /* 数字转换保留小数,数字很小时转为科学计数法, dot为保留几位小数 */ export function formatScientificNotation (value, dot = 2) { + if (isNaN(value) || value === null) { + return value + } let val = value ? parseFloat(Number(value).toFixed(dot)) : 0 if (val === 0) { val = Number(value).toPrecision(dot + 1)