n20-common-lib 2.7.0-beta.19 → 2.7.0-beta.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.7.0-beta.19",
+  "version": "2.7.0-beta.20",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -117,4 +117,4 @@
     "last 2 versions",
     "not dead"
   ]
-}
+}

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

@@ -306,6 +306,11 @@ $--header-color: #3d4a57;
     width: 992px;
   }
 
+  &_drawer_layout {
+    display: flex;
+    flex-wrap: wrap;
+  }
+
   &-system-item {
     flex: 0 0 33.33%;
     padding-top: 32px;

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

@@ -513,7 +513,6 @@ export default {
   methods: {
     async handleChangeSystem() {
       let menuTree = JSON.parse(sessionStorage.getItem('allMenuTree'))
-      console.log(menuTree)
       this.setMenuData(menuTree)
     },
     setMenuData(menuTree) {
@@ -533,26 +532,13 @@ export default {
 
           system.icon = icon
           system.menuTree = menuTree?.filter(
-            (menu) => menu.systemNo === system.NO && menu.isBackmenu === '0' && menu.children?.length > 0
+            (menu) =>
+              menu.systemNo === system.NO &&
+              menu.isBackmenu === '0' &&
+              (!menu.children || (menu.children && menu.children?.length > 0))
           )
-          // .map((menu) => ({
-          //   ...menu,
-          //   icon:
-          //     {
-          //       CSZHYW: '#n20-icon-zhcsyw',
-          //       CSYWGL: '#n20-icon-bianzu',
-          //       CSFZJC: '#n20-icon-a-bianzu70',
-          //       CSWY: '#n20-icon-a-bianzu69',
-          //       JTZL: '#n20-icon-a-bianzu3',
-          //       JRWG: '#n20-icon-a-bianzu1',
-          //       JTSKYWGK: '#n20-icon-a-bianzu701',
-          //       JTSKSJFX: '#n20-icon-a-bianzu2'
-          //     }[menu.NO] || ''
-          // }))
-          console.log(system)
           return system
         }).filter((item) => item.menuTree?.length > 0)
-        console.log(this.headerSystem)
       } catch (error) {
         console.log(error)
       }

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

@@ -1,6 +1,6 @@
 <template>
   <div class="pointer menu">
-    <div class="flex-box flex-wrap menu_drawer_box">
+    <div class="menu_drawer_layout menu_drawer_box">
       <div v-for="(item, i) in menus" :key="i" class="menu-system-item">
         <div class="flex-box flex-v" @click="clickSystem(item)">
           <svg
@@ -11,7 +11,7 @@
           </svg>
           <span class="m-l-s menu-system-item_title">{{ item.NAME }}</span>
         </div>
-        <div v-if="item.menuTree.length" class="flex-box flex-wrap menu-system-child">
+        <div v-if="item.menuTree.length" class="menu_drawer_layout menu-system-child">
           <div
             v-for="(row, i) in item.menuTree"
             :key="i"