util user menu releases

Former-commit-id: 236acdba4bc6cbd5921647fd5c1ee0258f43c143 [formerly 236acdba4bc6cbd5921647fd5c1ee0258f43c143 [formerly 236acdba4bc6cbd5921647fd5c1ee0258f43c143 [formerly 236acdba4bc6cbd5921647fd5c1ee0258f43c143 [formerly cd607a12b20a3d53a1967ee6012a35e03e3d31fe [formerly 645a010d0d8f84a370c509c39c560d93eaa8ae4f]]]]]
Former-commit-id: fd4e72b6a4dc7cb2731c0b5fbf343dab6c251d3f
Former-commit-id: 68305cd58cbd1927373a79c1b507de3c4f3d9924
Former-commit-id: 48312890868f48d5524b0de0dda489f2b2c57b0a [formerly fec91cd8f508ffe42c5e254dcee018c879f3d51e]
Former-commit-id: 9e300a2baafd1eae86bb69a052f15b904724856e
Former-commit-id: eaafbb0a410a49a286eb8e666b6784b96c9df371
Former-commit-id: ccef5438dddbe9762bd3574b33aab49bc1edee58
Former-commit-id: d2ca5c406860c43079d78a80d18ca2b1ed87f776
Former-commit-id: d4648c6865bff45b24aea999b60381b78417b802

src/layout/header-aside/components/menu-side/index.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="d2-layout-header-aside-menu-side">
     <el-menu
-      :collapse="isMenuAsideCollapse"
+      :collapse="asideCollapse"
       :unique-opened="true"
       :default-active="active"
       ref="menu"
       @select="handleMenuSelect">
-      <template v-for="(menu, menuIndex) in menuAside">
+      <template v-for="(menu, menuIndex) in aside">
         <d2-layout-header-aside-menu-item v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
         <d2-layout-header-aside-menu-sub v-else :menu="menu" :key="menuIndex"/>
       </template>
     </el-menu>
-    <div v-if="menuAside.length === 0 && !isMenuAsideCollapse" class="d2-layout-header-aside-menu-empty" flex="dir:top main:center cross:center">
+    <div v-if="aside.length === 0 && !asideCollapse" class="d2-layout-header-aside-menu-empty" flex="dir:top main:center cross:center">
       <d2-icon name="inbox"/>
       <span>没有侧栏菜单</span>
     </div>
@@ -41,14 +41,14 @@ export default {
     }
   },
   computed: {
-    ...mapState('d2admin', [
-      'menuAside',
-      'isMenuAsideCollapse'
+    ...mapState('d2admin/menu', [
+      'aside',
+      'asideCollapse'
     ])
   },
   watch: {
     // 折叠和展开菜单的时候销毁 better scroll
-    isMenuAsideCollapse (val) {
+    asideCollapse (val) {
       this.scrollDestroy()
       setTimeout(() => {
         this.scrollInit()
@@ -59,7 +59,7 @@ export default {
       handler (val) {
         this.active = val[val.length - 1].path
         this.$nextTick(() => {
-          if (this.menuAside.length > 0) {
+          if (this.aside.length > 0) {
             this.$refs.menu.activeIndex = this.active
           }
         })