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

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;

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;

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,

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) {

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"
         ></search-input>

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', [])
     },

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

@@ -13,7 +13,11 @@
       @saveChart="saveChart"
       @getNodesArr="getNodesArr"
     />
-    <div class="meta2d-main" :class="isChart ? 'meta2d-chart': 'meta2d-project'" @contextmenu="onContextMenu($event)" style="position: relative" :style="{border: editFlag ? '1px solid' : ''}">
+    <div class="meta2d-main" :class="{
+      'meta2d-chart-hide-header': !showHeader,
+      'meta2d-chart': isChart,
+      'meta2d-project': !isChart
+    }" @contextmenu="onContextMenu($event)" style="position: relative" :style="{border: editFlag ? '1px solid' : ''}">
       <div v-for="(item,index) in nodesArr" v-if="!editFlag && project"
            :key="index"
            v-show="(item.y + offsetY - 48 > -20) && (item.x + item.width/2 + offsetX - 24 > - 20)"
@@ -127,6 +131,11 @@ import { globalStore } from '@meta2d/core'
 export default {
   name: 'meta2dMain',
   mixins: [meta2dMainCalc, topoUtil],
+  provide () {
+    return {
+      option: this.option
+    }
+  },
   props: {
     meta2dId: {}, // 唯一id 不可重复
     iconArray: {
@@ -156,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: {

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,
@@ -277,10 +268,12 @@ export default {
     undo () { // 撤销
       getTopology(this.meta2dId).undo()
       // getTopology(this.meta2dId).inactive()
+      this.showMap()
       bus.$emit('changeSelectPens', [])
     },
     redo () { // 重做
       getTopology(this.meta2dId).redo()
+      this.showMap()
       // getTopology(this.meta2dId).render()
       // getTopology(this.meta2dId).inactive()
       bus.$emit('changeSelectPens', [])

nezha-fronted/src/components/common/searchInput.vue

@@ -501,6 +501,7 @@ export default {
     defaultItem: {},
     defaultValue: {},
     inTransform: {},
+    isNzTransfet: {},
     position: {
       type: String,
       default: ''
@@ -1544,6 +1545,12 @@ export default {
       const inputListDom = this.$refs['input-center-box']
       if (inputListDom) {
         this.$nextTick(() => {
+          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'