From ced635e609c7036f13471fbc14e9c730c052df41 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 7 Mar 2023 17:44:38 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2649=20feat=EF=BC=9A=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9=20=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=85=A8=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/project/meta2d/js/meta2dMain.js    |  1 +
 .../common/project/meta2d/js/topoUtil.js      |  2 +-
 .../common/project/meta2d/meta2dElement.vue   |  4 ++--
 .../common/project/meta2d/meta2dHeader.vue    |  5 +++++
 .../common/project/meta2d/meta2dMain.vue      |  4 ++--
 .../common/project/meta2d/topologyTopTool.vue | 21 ++++++++++++++-----
 6 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
index 92d3d16d0..5a833f337 100644
--- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
+++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
@@ -63,6 +63,7 @@ export default {
       meta2d.beforeAddPens = (pens) => { // 添加画笔前
         bus.$emit('changeDrawState')
         const name = 'elements - ' + meta2d.store.data.pens.length
+        console.log('123123123123')
         if (pens.length === 1) {
           if (!pens[0].type) {
             this.nodeInit(pens[0], name)
diff --git a/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js b/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js
index 66316a19d..1e04027c2 100644
--- a/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js
+++ b/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js
@@ -18,8 +18,8 @@ export default {
           this.calcNode(item)
         })
       }
-      getTopology(id).render()
       getTopology(id).centerView()
+      getTopology(id).render()
     },
     calcNode (node) { // 处理节点数据
       node = { id: node.id, ...node.data.params }
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
index 6d6f1c479..f668a9e86 100644
--- a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
@@ -1213,8 +1213,8 @@ export default {
       this.elements[key] = !this.elements[key]
     },
     inputFocus (e) {
-      e.path[2].children[0].setAttribute('tabindex', '0')
-      e.path[2].children[1].setAttribute('tabindex', '1')
+      e.path[2].children[0].setAttribute('tabindex', '-10')
+      e.path[2].children[1].setAttribute('tabindex', '-11')
     },
     inputBlur (e) {
     },
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue
index aff7cbc30..cd7e67990 100644
--- a/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue
@@ -159,6 +159,7 @@ export default {
       this.$nextTick(() => {
         getTopology(this.meta2dId).resize()
         getTopology(this.meta2dId).centerView()
+        getTopology(this.meta2dId).translate(0, 0)
       })
     },
     previewTopology () {
@@ -188,6 +189,10 @@ export default {
       getTopology(this.meta2dId).centerView()
     },
     cancelTopology () {
+      this.$store.commit('setShowTopoScreen', this.topoScreenState)
+      if (this.$refs.topTool.option.map) {
+        getTopology(this.meta2dId).hideMap()
+      }
       this.$emit('exitEdit', true)
     }
   }
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue
index 99d88c721..2a497d6ab 100644
--- a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="meta2d-box list-page" v-my-loading="meta2dLoading" ref="meta2dBox">
+  <div class="meta2d-box list-page" :class="editFlag ? 'topology-dialog' : ''" v-my-loading="meta2dLoading" ref="meta2dBox">
     <meta2dHeader
       ref="header"
       :meta2dId="meta2dId"
@@ -14,7 +14,7 @@
       <div :id="meta2dId" style="height: 100%;width: 100%"></div>
     </div>
     <meta2dProps
-      v-if="editFlag"
+      v-if="editFlag && !isPreview"
       ref="meta2dProps"
       :selectPens.sync="selectPens"
       :querysArray="querysArray"
diff --git a/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue b/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue
index 914f8898b..916b9a1e7 100644
--- a/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue
@@ -1,12 +1,9 @@
 <template>
   <div class="tool-top" id="tool-top"  @mouseup="changeDrawLineFlag(false)">
     <div id="tools-left-drag"
-         class="top-tool-item"
+         class="top-tool-item top-tool-item-delete"
          :title="$t('project.topology.addNode')"
-         :class="dragstartFlag ? 'is-active-meta2d' : ''"
-         draggable="true"
-         @mousedown="changeState('dragstartFlag')"
-         @dragstart.stop="onDragstart($event)">
+         @click="addNode">
       <div
       >
         <i class="nz-icon nz-icon-juxing" />
@@ -185,6 +182,20 @@ export default {
       }
       getTopology(this.meta2dId).canvas.addCaches = deepClone([pen])
     },
+    addNode () {
+      const data = getTopology(this.meta2dId).data()
+      const offestX = data.x
+      const offestY = data.y
+      const pen = {
+        name: 'rectangle',
+        text: 'rectangle',
+        width: 100,
+        height: 100,
+        x: 100 - offestX,
+        y: 100 - offestY
+      }
+      getTopology(this.meta2dId).addPen(pen , true)
+    },
     changeDrawLineFlag () {
       if (this.dragstartFlag) {
         this.dragstartFlag = false