Merge branch 'develop' into feature/headermenu-scroll

Former-commit-id: 82039d00173295785498485193767faa85975db9 [formerly 82039d00173295785498485193767faa85975db9 [formerly 82039d00173295785498485193767faa85975db9 [formerly 82039d00173295785498485193767faa85975db9 [formerly f2f6907eead2dc347e9f960cd22214905b9d3ae2 [formerly 941bad68f597ae2073569e5f77004e9fe32e5237]]]]]
Former-commit-id: ddca9a7423317cc209e97412791b001a14d4e077
Former-commit-id: 2e61f8586ce996397bf50b8e83dbff48badc1fc8
Former-commit-id: b25ec95ca475a12639e54cb33ad2422432b4c121 [formerly fcc94fcb2e8ed5b3c7f24911c0279d3230f812cb]
Former-commit-id: 037705c17d588cd319db4d26c214bb3a48829458
Former-commit-id: 309a1eabb1112f116c06743bee2b391913cf4094
Former-commit-id: cf9f50fbdbafbd26f5bb81e7920836f6bb13eea7
Former-commit-id: c744fb3031977e93baa48604fe33c449f0e32471
Former-commit-id: fc30fe9f534928e493bfe637ffb7ea3c6c38c662

src/layout/header-aside/components/header-fullscreen/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 export default {
   computed: {
     ...mapState('d2admin/fullscreen', [
@@ -19,7 +19,7 @@ export default {
     ])
   },
   methods: {
-    ...mapMutations('d2admin/fullscreen', [
+    ...mapActions('d2admin/fullscreen', [
       'toggle'
     ])
   }

src/layout/header-aside/components/header-size/index.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex'
+import { mapState, mapMutations, mapActions } from 'vuex'
 export default {
   name: 'd2-header-size',
   computed: {
@@ -51,9 +51,11 @@ export default {
   },
   methods: {
     ...mapMutations({
-      sizeSet: 'd2admin/size/set',
       pageKeepAliveClean: 'd2admin/page/keepAliveClean'
     }),
+    ...mapActions({
+      sizeSet: 'd2admin/size/set'
+    }),
     handleChange (value) {
       this.sizeSet(value)
     },

src/layout/header-aside/components/header-theme/components/d2-theme-list/index.vue

@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 export default {
   name: 'd2-theme-list',
   data () {
@@ -36,7 +36,7 @@ export default {
     ])
   },
   methods: {
-    ...mapMutations('d2admin/theme', [
+    ...mapActions('d2admin/theme', [
       'set'
     ]),
     handleSelectTheme (name) {

src/layout/header-aside/components/tabs/index.vue

@@ -59,7 +59,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 export default {
   components: {
     D2Contextmenu: () => import('../contextmenu'),
@@ -89,7 +89,7 @@ export default {
     ])
   },
   methods: {
-    ...mapMutations('d2admin/page', [
+    ...mapActions('d2admin/page', [
       'close',
       'closeLeft',
       'closeRight',
@@ -101,7 +101,6 @@ export default {
      */
     handleContextmenu (event) {
       let target = event.target
-
       // 解决 https://github.com/d2-projects/d2-admin/issues/54
       let flag = false
       if (target.className.indexOf('el-tabs__item') > -1) flag = true
@@ -109,7 +108,6 @@ export default {
         target = target.parentNode
         flag = true
       }
-
       if (flag) {
         event.preventDefault()
         event.stopPropagation()

src/layout/header-aside/layout.vue

@@ -81,7 +81,7 @@
 </template>
 
 <script>
-import { mapState, mapGetters, mapMutations } from 'vuex'
+import { mapState, mapGetters, mapActions } from 'vuex'
 import mixinSearch from './mixins/search'
 export default {
   name: 'd2-layout-header-aside',
@@ -129,14 +129,14 @@ export default {
     }
   },
   methods: {
-    ...mapMutations({
-      menuAsideCollapseToggle: 'd2admin/menu/asideCollapseToggle'
-    }),
+    ...mapActions('d2admin/menu', [
+      'asideCollapseToggle'
+    ]),
     /**
      * 接收点击切换侧边栏的按钮
      */
     handleToggleAside () {
-      this.menuAsideCollapseToggle()
+      this.asideCollapseToggle()
     }
   }
 }