From 0ab5b84ef302cc5db12d91f4d80ee2e95a61d48e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 14 Mar 2023 14:29:33 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2692=20fix=EF=BC=9Aprojetc=20topo=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/css/components/page/monitor/project/project.scss   | 3 ++-
 .../src/components/common/project/meta2d/js/topoUtil.js       | 2 +-
 .../src/components/common/project/meta2d/meta2dCanvas.vue     | 4 +++-
 .../src/components/common/project/meta2d/meta2dElement.vue    | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss b/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss
index 1ba2dacca..9ea6d8d35 100644
--- a/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss
+++ b/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss
@@ -20,6 +20,7 @@
     width: calc(50% - 10px);
     margin-right: 10px;
     min-width: 435px;
+    overflow: hidden;
     //div.page {
     //  textarea {
     //    display: none;
@@ -168,4 +169,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
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 5977db43b..d2a759c3f 100644
--- a/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js
+++ b/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js
@@ -11,7 +11,7 @@ export default {
     },
     initEdit (id) {
       bus.$emit('changeSelectPens', [])
-      getTopology(id).active([])
+      getTopology(id).inactive()
       getTopology(id).lock(0)
       getTopology(id).stopAnimate()
       if (getTopology(id).data().pens) {
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue
index 36f1986d7..5468ef205 100644
--- a/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue
@@ -305,7 +305,9 @@ export default {
       getTopology(this.meta2dId).addPen(pen, true)
     },
     clearSelection () {
-      getTopology(this.meta2dId).active([])
+      // getTopology(this.meta2dId).active([])
+      getTopology(this.meta2dId).inactive()
+      getTopology(this.meta2dId).render()
       bus.$emit('changeSelectPens', [])
     }
   }
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
index 1bb6cceb2..7d37fc184 100644
--- a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
@@ -10,7 +10,7 @@
             {{$t('overall.module')}}
           </div>
           <div v-show="elements.position" class="form-row-content">
-            <el-select v-model="pen.moduleId" @change="change('moduleId')" size="small">
+            <el-select v-model="pen.moduleId" @change="change('moduleId')" size="small" clearable>
               <el-option v-for="item in modules" :value="item.id" :key="item.id" :label="item.name" :disabled="item.disabled"/>
             </el-select>
           </div>