n20-common-lib 2.7.0-beta → 2.7.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.7.0-beta",
+  "version": "2.7.0-beta.1",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/assets/css/cl-layout-header.scss

@@ -284,13 +284,23 @@ $--header-color: #3d4a57;
   top: 48px;
   left: 190px;
   width: calc(100% - 190px);
+  padding-left: 105px;
 
-  .header_flex-base {
-    flex-basis: 33.33%;
-  }
+  .menu {
+    &-system-item {
+      flex: 0 0 33.33%;
+      padding-top: 32px;
+    }
+
+    &-system-child {
+      padding-top: 16px;
+      padding-left: 32px;
+    }
 
-  .header_menu_box {
-    padding-top: 48px;
-    padding-left: 105px;
+    &-first-item {
+      flex: 0 0 33.33%;
+      margin-bottom: 16px;
+    }
   }
+
 }

package/src/assets/css/normalize.scss

@@ -379,6 +379,12 @@ iframe {
   }
 }
 
+
+
+
+
+
+
 /* 旋转图标90度
 -------------- */
 .rotate90 {

package/src/components/Layout/HeaderWrap/indexN.vue

@@ -29,30 +29,7 @@
         <use xlink:href="#n20-icon-lujing"></use>
       </svg>
     </div>
-    <menuDrawer custom-class="header-menu-drawer" :visible.sync="menuDrawer" :with-header="false">
-      <div class="pointer flex-box flex-wrap header_menu_box">
-        <div v-for="(item, i) in headerSystem" :key="i" class="flex-column flex-s flex-v header_flex-base">
-          <div class="flex-box flex-v" @click="clickSystem(item)">
-            <svg
-              style="width: 2em; height: 2em; vertical-align: -0.15em; fill: currentColor; overflow: hidden"
-              aria-hidden="true"
-            >
-              <use :xlink:href="item.icon"></use>
-            </svg>
-            <span class="m-l-s">{{ item.NAME }}</span>
-          </div>
-          <div
-            class="flex-box flex-wrap flex-v"
-            style="padding-left: 36px; padding-bottom: 32px"
-            v-if="item.menuTree.length"
-          >
-            <div class="header_flex-base p-b-ss" v-for="(row, i) in item.menuTree" :key="i" @click="clickMenu(row)">
-              {{ row.title }}
-            </div>
-          </div>
-        </div>
-      </div>
-    </menuDrawer>
+    <menuDrawer :visible.sync="menuDrawer" :menus="headerSystem" :callback="getTreeList"></menuDrawer>
 
     <span v-if="byLabel && !inBack" class="header-uif-by">{{ byLabel }}</span>
     <!-- YSCW -->
@@ -465,6 +442,7 @@ export default {
   methods: {
     handleChangeSystem() {
       this.menuDrawer = true
+      this.getTreeList({}, null)
       let system_list = JSON.parse(localStorage.getItem('SYSTEM_LIST'))
       let menuTree = JSON.parse(sessionStorage.getItem('menuTree'))
       let length = system_list.length
@@ -498,7 +476,7 @@ export default {
         }
         system_list[i].menuTree = []
         for (let j = 0; j < menuTree.length; j++) {
-          if (system_list[i].NO === menuTree[j].systemNo) {
+          if (system_list[i].NO === menuTree[j].systemNo && menuTree[j].isBackmenu === '1') {
             system_list[i].menuTree.push(menuTree[j])
           }
         }
@@ -530,17 +508,6 @@ export default {
       let layoutMenus = siteTree2menus(data || [])
       sessionStorage.setItem('menuTree', JSON.stringify(layoutMenus))
     },
-    async clickSystem(item) {
-      await this.getTreeList(item)
-      // localStorage.setItem('pageInType', 'toFront')
-      window.localStorage.setItem('pageInSystemNo', item.NO)
-      // 切换系统的时候清除缓存的页签
-      window.sessionStorage.removeItem('tab-list')
-      let { base = '/' } = this.$router.options
-      if (!/\/$/.test(base)) base += '/'
-
-      window.location.href = window.location.origin + base + 'dashboard/workplace'
-    },
 
     handleUser() {
       this.$refs.userDropMenu.offset = 1000

package/src/components/Layout/HeaderWrap/menuDrawer.vue

@@ -1,27 +1,77 @@
+<template>
+  <el-drawer
+    :visible.sync="drawer"
+    custom-class="header-menu-drawer"
+    :with-header="false"
+    :appendToBody="true"
+    direction="ttb"
+    size="45%"
+  >
+    <div class="pointer flex-box flex-wrap">
+      <div v-for="(item, i) in menus" :key="i" class="menu-system-item">
+        <div class="flex-box flex-v" @click="clickSystem(item)">
+          <svg
+            style="width: 2em; height: 2em; vertical-align: -0.15em; fill: currentColor; overflow: hidden"
+            aria-hidden="true"
+          >
+            <use :xlink:href="item.icon"></use>
+          </svg>
+          <span class="m-l-s">{{ item.NAME }}</span>
+        </div>
+        <div v-if="item.menuTree.length" class="flex-box flex-wrap menu-system-child">
+          <div v-for="(row, i) in item.menuTree" :key="i" class="menu-first-item" @click="clickMenu(row)">
+            {{ row.title }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </el-drawer>
+</template>
+
 <script>
-import { Drawer } from 'element-ui'
 export default {
   name: 'MenuDrawer',
-  extends: Drawer,
   props: {
-    modal: {
+    menus: {
+      type: Array,
+      default: () => []
+    },
+    visible: {
       type: Boolean,
       default: false
     },
-    direction: {
-      type: String,
-      default: 'ttb',
-      validator(val) {
-        return ['ltr', 'rtl', 'ttb', 'btt'].indexOf(val) !== -1
+    callback: {
+      type: Function,
+      default: () => {}
+    }
+  },
+  computed: {
+    drawer: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
       }
+    }
+  },
+  methods: {
+    async clickSystem(item) {
+      // localStorage.setItem('pageInType', 'toFront')
+      window.localStorage.setItem('pageInSystemNo', item.NO)
+      // 切换系统的时候清除缓存的页签
+      window.sessionStorage.removeItem('tab-list')
+      let { base = '/' } = this.$router.options
+      if (!/\/$/.test(base)) base += '/'
+
+      window.location.href = window.location.origin + base + 'dashboard/workplace'
     },
-    appendToBody: {
-      type: Boolean,
-      default: true
-    },
-    size: {
-      type: [Number, String],
-      default: '40%'
+    clickMenu(row) {
+      if (row?.children?.length) {
+        this.$router.push(row.children[0].route)
+      } else {
+        this.$router.push(row.route)
+      }
     }
   }
 }