fix：将展开收起按钮抽至header组件内，解决 termail 拖动蒙层显示不全的问题

2021-05-14 10:14:02 +08:00
parent 46d9c8f98f
commit 135c6bbfbb
20 changed files with 47 additions and 57 deletions
--- a/nezha-fronted/src/components/charts/chart-detail.vue
+++ b/nezha-fronted/src/components/charts/chart-detail.vue
@@ -473,7 +473,6 @@ export default {
      this.panelIdInner = panelId
      this.data = chartItem
      this.detail = detail
-      console.log(detail);
      if (this.detail[0] && this.detail[0].type && this.detail[0].type == 'endpointInfo') { // endpointInfo的小图表
        this.$nextTick(() => {
          this.initChart(this.detail[0].data.stateSeries)
--- a/nezha-fronted/src/components/charts/chart-list.vue
+++ b/nezha-fronted/src/components/charts/chart-list.vue
@@ -1490,7 +1490,6 @@ export default {
        //   }
        // })
        Promise.all(arr).then(res => {
-          console.log(res)
          if (res) {
            const basic = res[0].data
            // basic.cabinet = basic.cabinet ? basic.cabinet.name : '-'
@@ -1516,7 +1515,6 @@ export default {
              // principal: basic.dc ? basic.dc.principal : '-',
              // tel: basic.tel,
            }
-            console.log(obj)
            basic && detail.push({
              title: vm.$t('project.chart.basicTitle'),
              type: 'basic',
--- a/nezha-fronted/src/components/cli/webSSH.scss
+++ b/nezha-fronted/src/components/cli/webSSH.scss
@@ -158,8 +158,8 @@
  width:100%;
 }
 /* 上滑resize工具条 */
-.resize-modal{
-
+.cli .resize-modal{
+ width: 100vw !important;
 }
 .sub-list-resize, .sub-list-resize-copy {
  display: flex;
--- a/nezha-fronted/src/components/cli/webSSH.vue
+++ b/nezha-fronted/src/components/cli/webSSH.vue
@@ -7,7 +7,7 @@
        <div class="sub-list-resize-copy">一</div>
      </div>
      <div id="shell-split" class="shell-split shell-iconfont" @mousedown="dragEagle" v-show="!isFullScreen">一</div>-->
-  <div :class="{'shell-service-max': isFullScreen,'shell-service':true}" class="sub-box ani-webSHH-height" data-yunlog-scope="popup" id="shell-service" ref="webSShBox" style="height: 0;background: #000">
+  <div :class="{'shell-service-max': isFullScreen,'shell-service':true}" class="sub-box ani-webSHH-height cli" data-yunlog-scope="popup" id="shell-service" ref="webSShBox" style="height: 0;background: #000">
    <div class="resize-modal">
      <div class="sub-list-resize-copy" style="width: 100%">一</div>
    </div>
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
@@ -95,8 +95,7 @@ export default {
      }
    }
  },
-  created() {
-    console.log(this.$route);
+  created () {
  },
  methods: {
    // 切换tab
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
@@ -148,10 +148,8 @@ export default {
        this.object.type = this.object.module.type
        this.rightBox.editShow = true
      })
-      console.log(1)
    },
    closeRightEditBox (refresh) {
-      console.log(2)
      this.rightBox.editShow = false
      if (refresh) {
        this.delFlag = true
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -243,7 +243,6 @@ export default {
    if (localStorageTableTitle && (localStorageTableTitle.length > this.$refs.dataTable.tableTitle.length)) {
      const arr = localStorageTableTitle.splice(this.$refs.dataTable.tableTitle.length,localStorageTableTitle.length)
      this.tools.customTableTitle = this.tools.customTableTitle.concat(arr)
-      console.log(this.tools.customTableTitle)
    }
    if (!this.fromBottom) {
      this.getTableData()
--- a/nezha-fronted/src/components/common/mixin/table.js
+++ b/nezha-fronted/src/components/common/mixin/table.js
@@ -35,7 +35,6 @@ export default {
          break
        }
        case 'recordTab': {
-          console.log(command, row)
          this.$emit('showBottomBox', 'recordTab', row)
          break
        }
--- a/nezha-fronted/src/components/common/popBox/guide.vue
+++ b/nezha-fronted/src/components/common/popBox/guide.vue
@@ -289,7 +289,6 @@ export default {
  },
  watch: {
    showDialog (n) {
-      console.log(n)
      this.visible = n
    },
    activeIndex (n) {
--- a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
@@ -345,7 +345,6 @@ export default {
      }
    },
    handleSelect (item) {
-      console.log(item)
    }
  }
 }
--- a/nezha-fronted/src/components/common/rightBox/batchModifyEndpoint.vue
+++ b/nezha-fronted/src/components/common/rightBox/batchModifyEndpoint.vue
@@ -541,7 +541,6 @@ export default {
    selectEndpointList: {
      immediate: true,
      handler (n) {
-        console.log(n)
        this.endpointTableData = JSON.parse(JSON.stringify(n))
        this.endpointTableData.forEach(item => {
          item.configs = JSON.parse(item.configs)
--- a/nezha-fronted/src/components/common/rightBox/mibBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/mibBox.vue
@@ -231,7 +231,6 @@ export default {
        this.editMib = JSON.parse(JSON.stringify(n))
        if (this.editMib.models) {
          this.selectedModels = this.editMib.models.split(',')
-          console.log(this.selectedModels)
        } else {
          this.selectedModels = []
        }
--- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
@@ -453,7 +453,6 @@ export default {
      } else {
        this.authType = 0
      }
-      console.log(params)
      this.$refs.moduleForm.validate((valid) => {
        if (valid) {
          this.prevent_opt.save = true
--- a/nezha-fronted/src/components/common/table/nzDataList.vue
+++ b/nezha-fronted/src/components/common/table/nzDataList.vue
@@ -131,7 +131,6 @@ export default {
      bottomBoxWindow.listResize(vm, e)
    },
    showBottomBox (targetTab, row) {
-      console.log(targetTab, row)
      this.bottomBox.targetTab = targetTab
      this.bottomBox.object = JSON.parse(JSON.stringify(row))
      this.bottomBox.showSubList = true
--- a/nezha-fronted/src/components/layout/header.vue
+++ b/nezha-fronted/src/components/layout/header.vue
@@ -1,5 +1,6 @@
 <template>
  <div class="header">
+    <div class="left-menu--pin" :class="!isShrink?'left-menu--pin-normal':'left-menu--pin-reverse'" @click="shrink"><i :class="{'icon-reverse': isShrink,}" class="el-icon-s-fold"></i></div>
    <el-breadcrumb class="nz-breakcrumb" separator="/">
      <el-breadcrumb-item v-for="crumb in breadcrumb" :key="crumb.code">{{$t(crumb.i18n)}}</el-breadcrumb-item>
    </el-breadcrumb>
@@ -177,7 +178,10 @@ export default {
        history.pushState(null, null, document.URL)
        window.addEventListener('popstate', this.cancel, false)
      }
-    }
+    },
+    shrink () {
+      this.$store.commit('isShrink')
+    },
  },
  mounted () {
    this.$i18n.locale = this.language
@@ -212,6 +216,9 @@ export default {
        }
      }
      return breadcrumb
+    },
+    isShrink () {
+      return this.$store.getters.getIsShrink
    }
  },
  beforeDestroy () {
@@ -296,13 +303,34 @@ export default {
    color: white;
    font-size: 6px;
  }
+  .left-menu--pin {
+    width: 20px;
+    font-size: 20px;
+    font-weight: 100;
+    color: #999999;
+    transition: all .4s;
+    height: 100%;
+    line-height: 50px;
+    margin-left: 10px;
+    i {
+      transform: rotateY(0);
+      transition: transform .4s;
+    }
+    i.icon-reverse {
+      transform: rotateY(180deg);
+    }
+  }
+  .left-menu--pin-normal{
+  }
+  .left-menu--pin-reverse{
+  }
 }
 .link-title a {
  color: inherit;
  text-decoration: none;
 }
 .nz-breakcrumb {
-  padding-left: 34px;
+  padding-left: 15px;
  line-height: 50px;

  .el-breadcrumb__item .el-breadcrumb__inner {
--- a/nezha-fronted/src/components/layout/leftMenu.vue
+++ b/nezha-fronted/src/components/layout/leftMenu.vue
@@ -29,7 +29,6 @@
        </el-menu-item>
      </template>
    </el-menu>
-    <div class="left-menu--pin" :class="!isShrink?'left-menu--pin-normal':'left-menu--pin-reverse'" @click="shrink"><i :class="{'icon-reverse': isShrink,}" class="el-icon-s-fold"></i></div>
  </div>
 </template>

@@ -40,7 +39,6 @@ export default {
  },
  data () {
    return {
-      isShrink: localStorage.getItem('nz-left-menu-shrink') == 'true',
      systemName: localStorage.getItem('nz-sys-name'),
      logo: ''
    }
@@ -76,13 +74,12 @@ export default {
    },
    route () {
      return this.$route.path
+    },
+    isShrink () {
+      return this.$store.getters.getIsShrink
    }
  },
  methods: {
-    shrink () {
-      this.isShrink = !this.isShrink
-      localStorage.setItem('nz-left-menu-shrink', this.isShrink)
-    },
    jump (route) {
      if (route === this.route) {
        this.refresh()
@@ -186,32 +183,6 @@ export default {
    width: 6px;
    height: 14px;
  }
-
-  .left-menu--pin {
-    position: fixed;
-    height: 20px;
-    width: 20px;
-    line-height: 20px;
-    font-size: 20px;
-    font-weight: 100;
-    color: #999999;
-    transition: all .4s;
-    i {
-      transform: rotateY(0);
-      transition: transform .4s;
-    }
-    i.icon-reverse {
-      transform: rotateY(180deg);
-    }
-  }
-  .left-menu--pin-normal{
-    top: 15px;
-    left: 250px;
-  }
-  .left-menu--pin-reverse{
-    top: 15px;
-    left: 74px;
-  }
  >.el-menu.header-logo {
    border-right: none;
    >.el-menu-item {
--- a/nezha-fronted/src/components/page/config/system.vue
+++ b/nezha-fronted/src/components/page/config/system.vue
@@ -768,7 +768,6 @@ export default {
    },
    handleLogoChange (file, fileList) {
      const imageTypes = ['image/jpeg', 'image/jpg', 'image/png']
-      console.log(file.raw.type)
      const isImage = imageTypes.some(t => file.raw.type === t)
      const isLt2M = file.raw.size / 1024 / 1024 < 2

--- a/nezha-fronted/src/components/page/config/user.vue
+++ b/nezha-fronted/src/components/page/config/user.vue
@@ -122,7 +122,6 @@ export default {
            pin: '',
            pinChange: ''
          }
-          console.log(this.object);
          this.rightBox.show = true
        }
      })
--- a/nezha-fronted/src/components/page/monitor/project/projectList.vue
+++ b/nezha-fronted/src/components/page/monitor/project/projectList.vue
@@ -127,7 +127,6 @@ export default {
  computed: {
  },
  created () {
-    console.log(this.$store.state.currentProject)
  },
  mounted () {
  },
--- a/nezha-fronted/src/store/index.js
+++ b/nezha-fronted/src/store/index.js
@@ -33,7 +33,8 @@ const store = new Vuex.Store({
    overViewProject: {},
    dcDataRefresh: false,
    showTopoScreen: false,
-    logo: ''
+    logo: '',
+    isShrink: localStorage.getItem('nz-left-menu-shrink') == 'true'
  },
  getters: {
    getLinkData (state) {
@@ -63,7 +64,10 @@ const store = new Vuex.Store({
    getLogo (state) {
      console.log('get logo', state)
      return state.logo
-    }
+    },
+    getIsShrink (state) {
+      return state.isShrink
+    },
  },
  mutations: {
    /* 监听对象变化，用于顶部菜单与底部内容的同步 */
@@ -138,6 +142,10 @@ const store = new Vuex.Store({
    setLogo (state, logo) {
      console.log('set log', logo)
      state.logo = logo
+    },
+    isShrink (state) {
+      state.isShrink = !state.isShrink
+      localStorage.setItem('nz-left-menu-shrink',  state.isShrink)
    }
  },
  actions: {