From c256f7f44d6c67d5cd398e790a3026b2294000f4 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 21 Jun 2023 14:51:01 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2901=20fix=EF=BC=9ARecord=20rules=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8BMetric=E6=97=B6=E5=B1=95=E5=BC=80=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3=E4=BF=9D=E5=AD=98Chart=EF=BC=8C=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E5=BC=80=E5=85=B3=E6=9C=AA=E8=A2=AB=E8=A6=86=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bottomBox/tabs/recordRulesQuery.vue       |  1 +
 .../project/meta2d/CanvasContextMenu.vue      |  7 +++++++
 .../common/project/meta2d/meta2dMain.vue      | 19 +++++++++++++++++++
 .../common/project/meta2d/topologyTopTool.vue | 11 +----------
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/recordRulesQuery.vue b/nezha-fronted/src/components/common/bottomBox/tabs/recordRulesQuery.vue
index 62bb69d89..56764a619 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/recordRulesQuery.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/recordRulesQuery.vue
@@ -175,6 +175,7 @@ export default {
     },
     viewGraph () {
       this.$refs.recordRulesQueryTab.viewGraph()
+      this.dropdownHandler(true)
     },
     dropdownHandler (show) {
       if (!show) {
diff --git a/nezha-fronted/src/components/common/project/meta2d/CanvasContextMenu.vue b/nezha-fronted/src/components/common/project/meta2d/CanvasContextMenu.vue
index 4c6ba566c..bfaeba3aa 100644
--- a/nezha-fronted/src/components/common/project/meta2d/CanvasContextMenu.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/CanvasContextMenu.vue
@@ -65,6 +65,7 @@ export default {
       historiesLength: 0
     }
   },
+  inject: ['option'],
   props: {
     meta2dId: {
       require: true
@@ -81,10 +82,16 @@ export default {
     undo () { // 撤销
       getTopology(this.meta2dId).undo()
       // getTopology(this.meta2dId).inactive()
+      if (this.option.map) {
+        getTopology(this.meta2dId).showMap()
+      }
       bus.$emit('changeSelectPens', [])
     },
     redo () { // 重做
       getTopology(this.meta2dId).redo()
+      if (this.option.map) {
+        getTopology(this.meta2dId).showMap()
+      }
       // getTopology(this.meta2dId).inactive()
       bus.$emit('changeSelectPens', [])
     },
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue
index f0968ef7e..25296f851 100644
--- a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue
@@ -131,6 +131,11 @@ import { globalStore } from '@meta2d/core'
 export default {
   name: 'meta2dMain',
   mixins: [meta2dMainCalc, topoUtil],
+  provide () {
+    return {
+      option: this.option
+    }
+  },
   props: {
     meta2dId: {}, // 唯一id 不可重复
     iconArray: {
@@ -160,6 +165,20 @@ export default {
       default: true
     },
   },
+  data () {
+    return {
+      option: {
+        lineName: 'curve',
+        lineWidth: 1,
+        fromArrow: '',
+        toArrow: 'triangleSolid',
+        scale: 100,
+        grid: false,
+        rule: false,
+        map: false
+      },
+    }
+  },
   computed: {
   },
   components: {
diff --git a/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue b/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue
index ad60f8b26..00d4db522 100644
--- a/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue
@@ -98,18 +98,9 @@ import { deepClone, s8 } from '@meta2d/core'
 import lineData from './js/defaultPenLineData'
 export default {
   name: 'topologyTopTool',
+  inject: ['option'],
   data () {
     return {
-      option: {
-        lineName: 'curve',
-        lineWidth: 1,
-        fromArrow: '',
-        toArrow: 'triangleSolid',
-        scale: 100,
-        grid: false,
-        rule: false,
-        map: false
-      },
       dragstartFlag: false,
       drawLineFlag: false,
       scaleNum: 100,