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,