Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7

nezha-fronted/src/assets/css/components/charts/chart-list.scss

@@ -36,14 +36,4 @@
     overflow: hidden; /*避免鼠标第一次放到曲线时，x轴出现滚动条后消失*/
   }
 }
-.chart-list {
+
-  flex: 1;
-  height: auto !important;
-  width: 100%;
-  border-top: 1px solid transparent;
-  box-sizing: border-box;
-  
-  .group-hide-header {
-    height: 40px !important;
-  }
-}

nezha-fronted/src/components/chart/chartList.vue

@@ -1,4 +1,5 @@
 <template>
+  <div id="chart-list">
   <div :id='`chartList${(isGroup ? "Group" : "") + timestamp}`' class="chart-list" v-my-loading="gridLayoutLoading" ref="layoutBox">
     <grid-layout
       ref="layout"
@@ -91,6 +92,7 @@
       ></panel-chart>
     </el-dialog>
   </div>
+  </div>
 </template>
 
 <script>
@@ -862,4 +864,15 @@ export default {
   }
 }
 </script>
-
+<style>
+#chart-list .chart-list {
+  flex: 1;
+  height: auto !important;
+  width: 100%;
+  border-top: 1px solid transparent;
+  box-sizing: border-box;
+}
+#chart-list .group-hide-header {
+    height: 40px !important;
+  }
+</style>

nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue

@@ -120,6 +120,7 @@ import endpointTable from '@/components/common/project/popData/endpointTable'
 import { getTopology, setTopology } from '@/components/common/js/common'
 import topoUtil from '@/components/common/project/meta2d/js/topoUtil'
 import bus from '@/libs/bus'
+import { globalStore } from '@meta2d/core'
 export default {
   name: 'meta2dMain',
   mixins: [meta2dMain, topoUtil],
@@ -199,7 +200,12 @@ export default {
       getTopology(this.meta2dId).off('leave', this.penLeave) // 移出画笔·
       getTopology(this.meta2dId).off('add', this.appPen) // 添加新画笔·
       getTopology(this.meta2dId).off('click', this.topoClick) // click画笔·
-      getTopology(this.meta2dId).destroy()
+      getTopology(this.meta2dId).destroy(true)
+      for (const k in globalStore) {
+        if (!globalStore[k]) {
+          delete globalStore[k]
+        }
+      }
       setTopology(this.meta2dId, null)
     }
     bus.$off('changeSelectPens', this.pensActive)