diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue index 029921e26..1e6d88544 100644 --- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue +++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue @@ -698,6 +698,9 @@ export default { if (this.fromTopologyDialog && !this.isPreview) { setTimeout(() => { this.topologyLoading = false + if (!data.pens) { + data.pens = [] + } getTopology(this.topologyIndex).open(data || {}) getTopology(this.topologyIndex).centerView() getTopology(this.topologyIndex).resize() @@ -708,6 +711,9 @@ export default { if (!getTopology(this.topologyIndex)) { return } + if (!data.pens) { + data.pens = [] + } getTopology(this.topologyIndex).open(data || {}) getTopology(this.topologyIndex).lock(1) this.objChange = false @@ -1213,7 +1219,7 @@ export default { }, onUpdateProps (node) { - let obj = this.$loadsh.cloneDeep(node) + const obj = this.$loadsh.cloneDeep(node) delete obj.x delete obj.y delete obj.center @@ -1762,7 +1768,10 @@ export default { const domRect = dom ? dom.getBoundingClientRect() : {} getTopology(this.topologyIndex).canvasPos = domRect if (this.fromOverView) { - getTopology(this.topologyIndex).open(this.oldTopologyData || {}) + if (this.oldTopologyData && !this.oldTopologyData.pens) { + this.oldTopologyData.pens = [] + } + getTopology(this.topologyIndex).open(this.oldTopologyData || {}) } let flag = false const position = { diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index 5d4e3d857..65b611c67 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -713,7 +713,10 @@ export default { if (!getTopology(this.topologyIndex)) { return } - getTopology(this.topologyIndex).open(data || {}) + if (!data.pens) { + data.pens = [] + } + getTopology(this.topologyIndex).open(data) getTopology(this.topologyIndex).lock(1) this.objChange = false let flag = false @@ -1646,7 +1649,7 @@ export default { }, onUpdateProps (node) { // 更新pen - let obj = this.$loadsh.cloneDeep(node) + const obj = this.$loadsh.cloneDeep(node) console.log(obj) delete obj.x delete obj.y @@ -2231,7 +2234,10 @@ export default { let domRect = document.getElementById('topology-canvas' + this.topologyIndex).getBoundingClientRect() getTopology(this.topologyIndex).canvasPos = domRect if (this.fromOverView) { - getTopology(this.topologyIndex).open(this.oldTopologyData || {}) + if (this.oldTopologyData && !this.oldTopologyData.pens) { + this.oldTopologyData.pens = [] + } + getTopology(this.topologyIndex).open(this.oldTopologyData) } let flag = false diff --git a/nezha-fronted/src/components/common/table/settings/agentTable.vue b/nezha-fronted/src/components/common/table/settings/agentTable.vue index fa973f5d9..b20044a36 100644 --- a/nezha-fronted/src/components/common/table/settings/agentTable.vue +++ b/nezha-fronted/src/components/common/table/settings/agentTable.vue @@ -1,5 +1,5 @@ - +