From 4766d70a4cc98e1009543dfc259bb518ad8562f0 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 7 Sep 2022 14:07:13 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2182=20fix=EF=BC=9Aproject=20topology=20?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/ChartDiagram/diagram.vue  | 13 +++++++++++--
 .../src/components/common/project/topologyL5.vue    | 12 +++++++++---
 .../components/common/table/settings/agentTable.vue |  2 +-
 .../components/common/table/settings/userTable.vue  |  4 ++--
 4 files changed, 23 insertions(+), 8 deletions(-)

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 @@
 <template>
-  <div>
+  <div style="height: 100%">
   <el-table
     id="roleTable"
     ref="dataTable"
diff --git a/nezha-fronted/src/components/common/table/settings/userTable.vue b/nezha-fronted/src/components/common/table/settings/userTable.vue
index e7538995a..4500b1fc6 100644
--- a/nezha-fronted/src/components/common/table/settings/userTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/userTable.vue
@@ -1,5 +1,5 @@
 <template>
-<div height="100%">
+<div style="height: 100%">
   <el-table
     id="userTable"
     ref="dataTable"
@@ -118,7 +118,7 @@
       <div v-else>&nbsp;</div>
     </template>
   </el-table>
-  </div>
+</div>
 </template>
 
 <script>