diff --git a/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss b/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss index dcebc8a43..1f805b982 100644 --- a/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss +++ b/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss @@ -16,6 +16,9 @@ border: none !important; } } +.meta2d-chart-hide-header { + height: calc(100% - 78px); +} .meta2d-project{ height: calc(100% - 78px); border: 1px solid; diff --git a/nezha-fronted/src/assets/css/index.scss b/nezha-fronted/src/assets/css/index.scss index 9f4ceabc4..4d037646c 100644 --- a/nezha-fronted/src/assets/css/index.scss +++ b/nezha-fronted/src/assets/css/index.scss @@ -13,7 +13,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; // 避免ele原字体加载 } body { height: 100%; - min-width: 1024px; + min-width: 1400px; margin:0 !important; padding: 0 !important; cursor: default; diff --git a/nezha-fronted/src/components/chart/defaultLineData.js b/nezha-fronted/src/components/chart/defaultLineData.js index b5c5fed06..586a5b103 100644 --- a/nezha-fronted/src/components/chart/defaultLineData.js +++ b/nezha-fronted/src/components/chart/defaultLineData.js @@ -4,7 +4,7 @@ const data = { showHeader: true, name: '', dashboardId: 1244, - groupId: 0, + groupId: undefined, span: 4, height: 4, updateBy: 381, 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/nzTransfer.vue b/nezha-fronted/src/components/common/nzTransfer.vue index d734875f7..bd192c48e 100644 --- a/nezha-fronted/src/components/common/nzTransfer.vue +++ b/nezha-fronted/src/components/common/nzTransfer.vue @@ -8,6 +8,7 @@ :search-msg="searchMsg" :show-history="false" :show-search="false" + :isNzTransfet="true" style="width:100%" @search="search" > 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 c8e6901a6..b28ca3aa7 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue @@ -13,7 +13,11 @@ @saveChart="saveChart" @getNodesArr="getNodesArr" /> -
+
{ + if (this.isNzTransfet) { + const position = inputListDom.getBoundingClientRect() + this.selectDom.top = position.top + 36 + 'px' + this.selectDom.left = position.left + 'px' + return + } if (this.inTransform) { const position = inputListDom.getBoundingClientRect() this.selectDom.top = position.top + 36 + 'px'