From a7af1acbf4d4dc6a82ca57e8edf58235f7854d07 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 14 Sep 2018 15:09:58 +0800
Subject: [PATCH] no message

Former-commit-id: a98f0dc7f8c8202102557ec44a29081de09ef657 [formerly a98f0dc7f8c8202102557ec44a29081de09ef657 [formerly a98f0dc7f8c8202102557ec44a29081de09ef657 [formerly a98f0dc7f8c8202102557ec44a29081de09ef657 [formerly f244e1fdd164c1b79a79bb5a6b747ee86b9d8589 [formerly 9a88fe535b9d40bff1dcca1e9c312ab81c0961b5]]]]]
Former-commit-id: 80f45f42407a12231dcb32861eae95da8b8f27d5
Former-commit-id: 294d0beb7890b73dd462900f6634b9ed43dda50b
Former-commit-id: f639bbc1de8e27b18262e84545ff22b8556c402a [formerly 0f01b98c3d1b41eaa511bb56813d860105da930f]
Former-commit-id: 9a33c6b83d309a76711c4fad397c149dac55a8b5
Former-commit-id: f556363312d2e505acc24ec531e787fc3863f9fc
Former-commit-id: 4433f382bc7c25d437eabfab96e4a7b0dbca28b5
Former-commit-id: eb558eb22372f558e8d93ae8dac07c40016e2644
Former-commit-id: 963b8effbe52965ae14a77172a37c50dcfd6cf56
---
 .../components/header-size/index.vue             | 16 +++++++---------
 .../header-aside/components/tabs/index.vue       |  6 ++----
 src/router/index.js                              |  2 +-
 src/store/modules/d2admin/modules/account.js     |  2 +-
 .../d2admin/modules/page.js.REMOVED.git-id       |  2 +-
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/layout/header-aside/components/header-size/index.vue b/src/layout/header-aside/components/header-size/index.vue
index 2ed28cc7..a8a6f234 100644
--- a/src/layout/header-aside/components/header-size/index.vue
+++ b/src/layout/header-aside/components/header-size/index.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations, mapActions } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 export default {
   name: 'd2-header-size',
   computed: {
@@ -38,7 +38,7 @@ export default {
           // 设置 element 全局尺寸
           this.$ELEMENT.size = val
           // 清空缓存设置
-          this.keepAliveClean()
+          this.pageKeepAliveClean()
           // 刷新此页面
           const { path, query } = this.$route
           this.$router.replace({
@@ -50,14 +50,12 @@ export default {
     }
   },
   methods: {
-    ...mapMutations('d2admin/page', [
-      'keepAliveClean'
-    ]),
-    ...mapActions('d2admin/size', [
-      'set'
-    ]),
+    ...mapActions({
+      pageKeepAliveClean: 'd2admin/page/keepAliveClean',
+      sizeSet: 'd2admin/size/set'
+    }),
     handleChange (value) {
-      this.set(value)
+      this.sizeSet(value)
     },
     iconName (name) {
       return name === this.value ? 'dot-circle-o' : 'circle-o'
diff --git a/src/layout/header-aside/components/tabs/index.vue b/src/layout/header-aside/components/tabs/index.vue
index b1a0c01e..d1a77676 100644
--- a/src/layout/header-aside/components/tabs/index.vue
+++ b/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()
diff --git a/src/router/index.js b/src/router/index.js
index 244d44db..4cf7d272 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -57,7 +57,7 @@ router.afterEach(to => {
   const app = router.app
   const { name, params, query } = to
   // 多页控制 打开新的页面
-  app.$store.commit('d2admin/page/open', { name, params, query })
+  app.$store.dispatch('d2admin/page/open', { name, params, query })
   // 更改标题
   util.title(to.meta.title)
 })
diff --git a/src/store/modules/d2admin/modules/account.js b/src/store/modules/d2admin/modules/account.js
index 493130a9..f213b960 100644
--- a/src/store/modules/d2admin/modules/account.js
+++ b/src/store/modules/d2admin/modules/account.js
@@ -102,7 +102,7 @@ export default {
         // DB -> store 加载页面过渡效果设置
         await dispatch('d2admin/transition/load', null, { root: true })
         // DB -> store 持久化数据加载上次退出时的多页列表
-        commit('d2admin/page/openedLoad', null, { root: true })
+        await dispatch('d2admin/page/openedLoad', null, { root: true })
         // DB -> store 持久化数据加载侧边栏折叠状态
         await dispatch('d2admin/menu/asideCollapseLoad', null, { root: true })
         // DB -> store 持久化数据加载全局尺寸
diff --git a/src/store/modules/d2admin/modules/page.js.REMOVED.git-id b/src/store/modules/d2admin/modules/page.js.REMOVED.git-id
index a85c9a13..682a8b12 100644
--- a/src/store/modules/d2admin/modules/page.js.REMOVED.git-id
+++ b/src/store/modules/d2admin/modules/page.js.REMOVED.git-id
@@ -1 +1 @@
-9abf067fc9ee38d5c28f4b1450b9df450c2583bc
\ No newline at end of file
+3cac6fb289611555b60a92937c3b5ba99e7b9ec1
\ No newline at end of file