diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue index 321cb9f05..2dbb34782 100644 --- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue +++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue @@ -1139,6 +1139,8 @@ export default { valueMappingSort: 'asc', expressArr: [''], legends: [''], + expressAllArr: [''], + legendsAll: [''], tooltipShow: true, valueMappingShow: true, panelName: 'topologyName', @@ -1180,6 +1182,8 @@ export default { valueMappingSort: 'asc', /* desc */ expressArr: [''], legends: [''], + expressAllArr: [''], + legendsAll: [''], tooltipShow: true, valueMappingShow: true, panelName: 'topologyName', @@ -1261,6 +1265,10 @@ export default { data.data.expressArr.push('') data.data.legends.push('') } + if (data.data.expressAllArr.length === 0 && event !== 'node') { + data.data.expressAllArr.push('') + data.data.legendsAll.push('') + } this.props = { node: data, line: null, @@ -1806,8 +1814,8 @@ export default { item.data.legends = [''] } if (!item.data.expressAllArr.length) { - item.data.expressArr = [''] - item.data.legends = [''] + item.data.expressAllArr = [''] + item.data.legendsAll = [''] } item.animateType = item.data.animateType if (item.type === 0) { @@ -1946,6 +1954,14 @@ export default { return true } }) + item.data.expressAllArr = item.data.expressAllArr.filter((expression, i) => { + if (!expression) { + item.data.legendsAll.splice(i, 1) + return false + } else { + return true + } + }) }) if (this.penToolTipScale == getTopology(this.topologyIndex).data.scale) { getTopology(this.topologyIndex).data.scale = this.oldScale diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index c78c4027b..6becd93eb 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -1286,6 +1286,10 @@ export default { data.data.expressArr.push('') data.data.legends.push('') } + if (data.data.expressAllArr.length === 0 && event !== 'node') { + data.data.expressAllArr.push('') + data.data.legendsAll.push('') + } this.props = { node: data, line: null, @@ -1961,6 +1965,14 @@ export default { return true } }) + item.data.expressAllArr = item.data.expressAllArr.filter((expression, i) => { + if (!expression) { + item.data.legendsAll.splice(i, 1) + return false + } else { + return true + } + }) }) if (this.penToolTipScale == getTopology(this.topologyIndex).data.scale) { getTopology(this.topologyIndex).data.scale = this.oldScale