From b907e2beb21bb07efc827739f383c9638af8abe1 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 18 Mar 2021 10:59:19 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E5=9B=BE=E7=89=87=E6=97=A0=E6=B3=95=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=9A=84bug=20=E4=BB=A5=E5=8F=8A=E5=88=87=E6=8D=A2project?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=9B=B4=E6=8D=A2project=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/package.json | 2 +- .../components/common/project/L5/CanvasProps.vue | 2 +- .../src/components/common/project/topologyL5.vue | 13 ++++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/nezha-fronted/package.json b/nezha-fronted/package.json index ef0735deb..03720947f 100644 --- a/nezha-fronted/package.json +++ b/nezha-fronted/package.json @@ -16,7 +16,7 @@ "@topology/activity-diagram": "^0.3.0", "@topology/chart-diagram": "^0.3.0", "@topology/class-diagram": "^0.3.0", - "@topology/core": "^0.3.2", + "@topology/core": "^0.4.17", "@topology/flow-diagram": "^0.3.0", "@topology/layout": "^0.3.0", "@topology/sequence-diagram": "^0.3.0", diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue index 6713164f1..320c7c6d9 100644 --- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue +++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue @@ -680,7 +680,7 @@
- +
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index 6ab4cc020..8daeb9321 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -679,6 +679,10 @@ methods:{ init(){ canvasOptions.on=this.onMessage; + if(getTopology(this.topologyIndex)){ + getTopology(this.topologyIndex).open({}); + getTopology(this.topologyIndex).render() + } this.reload(); }, @@ -797,6 +801,8 @@ let canvas=new Topology('topology-canvas'+this.topologyIndexF,canvasOptions); canvas.open(data); setTopology(this.topologyIndex,canvas); + }else{ + getTopology(this.topologyIndex).open(data); } this.topologyLoading=false; if(!getTopology(this.topologyIndex).data.name){ @@ -879,7 +885,9 @@ this.projectInfoShow=data.data.projectInfo; this.projectAlertShow=data.data.alertInfo; } - + if(!data.bkImage){ + data.bkImage=undefined; + } Promise.all(promiseArr).then(res=>{ res.forEach((response,index)=>{ let item=data.pens[index]; @@ -2059,6 +2067,9 @@ zoomMap(num){ getTopology(this.topologyIndex).scaleTo(getTopology(this.topologyIndex).data.scale+num); }, + penToBottom(){ + getTopology(this.topologyIndex).bottom() + }, }, destroyed(){ getTopology(this.topologyIndex).destroy();