From dd8e18afd9340864e957a5da017d01b6060f11a5 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 2 Sep 2022 09:44:16 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20chart=20diagra?=
 =?UTF-8?q?m=E6=89=93=E4=B8=8D=E5=BC=80=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/ChartDiagram/diagram.vue    | 15 ++++++++-------
 .../common/project/L5/services/canvas.js          |  4 ++--
 .../src/components/common/project/topologyL5.vue  |  5 ++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
index 4c2eb1d64..48fda71bf 100644
--- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
+++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
@@ -154,10 +154,9 @@
               <CanvasContextMenu :index="topologyIndexF" :props.sync="props"></CanvasContextMenu>
             </div>
             <!--所有节点上的小图标-->
-            <div v-for="(item,index) in nodesArr" v-if="!editTopologyFlag&&item.data.iconToolState&&!fromPrev"
+            <div v-for="(item,index) in nodesArr"
                  :key="index"
-                 v-show="(item.rect.y - (48*(fromOverView?penToolTipScale:1)) > -10) && (item.rect.center.x - (24*(fromOverView?penToolTipScale:1)) > - 10)"
-                 :style="{position: 'absolute',top:item.rect.y - (48*(fromOverView?penToolTipScale:1))+'px',left:item.rect.center.x - (24*(fromOverView?penToolTipScale:1)) +'px',transform:'scale('+(fromOverView?penToolTipScale:1)+')'}"
+                 v-if="false"
                  class="network-pop"
             >
 
@@ -696,7 +695,8 @@ export default {
       if (this.fromTopologyDialog && !this.isPreview) {
         setTimeout(() => {
           this.topologyLoading = false
-          getTopology(this.topologyIndex).open(data)
+          console.log(data)
+          getTopology(this.topologyIndex).open(data || {})
           getTopology(this.topologyIndex).centerView()
           getTopology(this.topologyIndex).resize()
           this.editTopology()
@@ -706,7 +706,7 @@ export default {
           if (!getTopology(this.topologyIndex)) {
             return
           }
-          getTopology(this.topologyIndex).open(data)
+          getTopology(this.topologyIndex).open(data || {})
           getTopology(this.topologyIndex).lock(1)
           this.objChange = false
           let flag = false
@@ -852,7 +852,8 @@ export default {
             gridSize: 10,
             gridColor: '#ededed',
             lineWidth: 1,
-            ruleColor: '#4e4e4e'
+            ruleColor: '#4e4e4e',
+            pens:[]
           }
           this.projectInfoShow = true
           this.projectAlertShow = true
@@ -1750,7 +1751,7 @@ export default {
         const domRect = dom ? dom.getBoundingClientRect() : {}
         getTopology(this.topologyIndex).canvasPos = domRect
         if (this.fromOverView) {
-          getTopology(this.topologyIndex).open(this.oldTopologyData)
+          getTopology(this.topologyIndex).open(this.oldTopologyData  || {})
         }
         let flag = false
         const position = {
diff --git a/nezha-fronted/src/components/common/project/L5/services/canvas.js b/nezha-fronted/src/components/common/project/L5/services/canvas.js
index 405bc1a49..09a1a7efe 100644
--- a/nezha-fronted/src/components/common/project/L5/services/canvas.js
+++ b/nezha-fronted/src/components/common/project/L5/services/canvas.js
@@ -176,7 +176,7 @@ export const imageTemp = {
   }
 }
 export const imageTemp2 = {
-  name: 'rectangleImg',
+  name: 'rectangleImg2',
   icon: 'icon-image',
   data: {
     type: 0,
@@ -193,7 +193,7 @@ export const imageTemp2 = {
     color: '#000000',
     background: '#ffffff00',
     animatePos: 0,
-    name: 'rectangleImg',
+    name: 'rectangleImg2',
     lineDashOffset: 0,
     text: '',
     textOffsetX: 0,
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index 1bb9ce7be..1a6dc01ef 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -713,7 +713,7 @@ export default {
         if (!getTopology(this.topologyIndex)) {
           return
         }
-        getTopology(this.topologyIndex).open(data)
+        getTopology(this.topologyIndex).open(data || {})
         getTopology(this.topologyIndex).lock(1)
         this.objChange = false
         let flag = false
@@ -1551,7 +1551,6 @@ export default {
             break
           }
           case 'scale': {
-
             let dom = document.getElementById('topology-canvas' + this.topologyIndexF)
             let domRect = dom ? dom.getBoundingClientRect() : {}
             if (getTopology(this.topologyIndex)) {
@@ -2222,7 +2221,7 @@ 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)
+          getTopology(this.topologyIndex).open(this.oldTopologyData || {})
         }
         let flag = false