From 451006713f2065cd6db60f7daa19aa100d3fd350 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 20 Jun 2023 15:12:58 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2893=20fix=EF=BC=9ATopo=20=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E7=94=BB=E5=B8=83=E5=85=83=E7=B4=A0=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=B7=B3=E8=BD=AC=20Element=20=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/project/meta2d/js/meta2dMainCalc.js | 4 +++-
 .../src/components/common/project/meta2d/meta2dCanvas.vue | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js
index 1b7a1825c..f5e8012c0 100644
--- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js
+++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js
@@ -301,7 +301,9 @@ export default {
       setTimeout(() => {
         this.selectPens = pens
         this.modulesDiff(pens[0])
-        this.$refs.meta2dProps && (this.$refs.meta2dProps.isUpdate = true)
+        this.$nextTick(() => {
+          this.$refs.meta2dProps && (this.$refs.meta2dProps.isUpdate = true)
+        })
       }, 200)
     },
     topoClick (params, e) { // 点击节点
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue
index cf359e609..c88a5ea93 100644
--- a/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue
@@ -70,7 +70,7 @@
                   <span class="hide-input-nzName text-ellipsis" v-if="!editFlag[index]">
                     {{item.nzName}}
                   </span>
-                  <i @click="changeEditFlag(index)" v-if="!editFlag[index]"  class="nz-icon nz-icon-edit1"/>
+                  <i @click.stop="changeEditFlag(index)" v-if="!editFlag[index]"  class="nz-icon nz-icon-edit1"/>
                 </span>
               <span>
                   <span @click.stop="penChange(item, 'locked')" class="pen-tools-item" :title="!item.locked?$t('overall.locked'): $t('overall.unlocked')">
@@ -204,7 +204,7 @@ export default {
         getTopology(this.meta2dId).active([item])
         getTopology(this.meta2dId).render()
         // getTopology(this.meta2dId).setValue(item)
-        bus.$emit('changeSelectPens', [item])
+        // bus.$emit('changeSelectPens', [item])
       })
     },
     penChange (item, key) {
@@ -222,7 +222,7 @@ export default {
           getTopology(this.meta2dId).active([item])
           getTopology(this.meta2dId).render()
           // getTopology(this.meta2dId).setValue(item)
-          bus.$emit('changeSelectPens', [item])
+          // bus.$emit('changeSelectPens', [item])
         }
       }
       if (key === 'locked') {
@@ -237,7 +237,7 @@ export default {
           getTopology(this.meta2dId).active([item])
           getTopology(this.meta2dId).render()
           // getTopology(this.meta2dId).setValue(item)
-          bus.$emit('changeSelectPens', [item])
+          // bus.$emit('changeSelectPens', [item])
         }
       }
       getTopology(this.meta2dId).setValue(obj)