From f218ab7df8ddc35b6177005c385c52ede7c4a8b5 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 10 Sep 2018 15:30:32 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 26205ebf26a34b47060c3685cb4d969140e94f61 [formerly 26205ebf26a34b47060c3685cb4d969140e94f61 [formerly 26205ebf26a34b47060c3685cb4d969140e94f61 [formerly 26205ebf26a34b47060c3685cb4d969140e94f61 [formerly 659e4b42eec3fb5106a46f8c06c4b62170e4385e [formerly 33bd817d31a89ff29b25860e8e553198f426966b]]]]]
Former-commit-id: e9c520cc0f970cf63f834a8a4f1de806465e054c
Former-commit-id: 3ab6ec0c07d8739e484ebde242beebbf761e9a11
Former-commit-id: 44e9aaa39c1d5becbfab509fcb80b15c4e11bf18 [formerly 9bf3ab07eac16679f064a20af7b5483c36b11503]
Former-commit-id: 624cbcde01906949ce2ca04c7f522fe6c078bc62
Former-commit-id: 2f0ff3c6614b44b17fba9305acd199b145f07273
Former-commit-id: 8ff08e2826218d1a3f6276f367c81f628fe38970
Former-commit-id: 2bd544a5f39a5e8c3e88082d517f33ed3f49f7f2
Former-commit-id: 45586821281ab265e08b09b1af718d30964db101
---
 package-lock.json.REMOVED.git-id              |  1 +
 .../theme/theme-base.scss.REMOVED.git-id      |  2 +-
 .../components/header-size/index.vue          | 45 +++++++++++++++++++
 .../components/header-user/index.vue          |  2 +-
 src/layout/header-aside/layout.vue            |  2 +
 src/store/modules/d2admin/index.js            |  4 +-
 src/store/modules/d2admin/modules/size.js     | 38 ++++++++++++++++
 7 files changed, 91 insertions(+), 3 deletions(-)
 create mode 100644 package-lock.json.REMOVED.git-id
 create mode 100644 src/layout/header-aside/components/header-size/index.vue
 create mode 100644 src/store/modules/d2admin/modules/size.js

diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id
new file mode 100644
index 00000000..09d4bdd0
--- /dev/null
+++ b/package-lock.json.REMOVED.git-id
@@ -0,0 +1 @@
+0db501622270146313d905a0a5f39854fb2494ac
\ No newline at end of file
diff --git a/src/assets/style/theme/theme-base.scss.REMOVED.git-id b/src/assets/style/theme/theme-base.scss.REMOVED.git-id
index 0313b944..a92d8174 100644
--- a/src/assets/style/theme/theme-base.scss.REMOVED.git-id
+++ b/src/assets/style/theme/theme-base.scss.REMOVED.git-id
@@ -1 +1 @@
-76c08deda5f3f6bd81e91aeb695cae984eab131e
\ No newline at end of file
+875522462ce00aa53ebb933ad8a70561bf30dfc5
\ No newline at end of file
diff --git a/src/layout/header-aside/components/header-size/index.vue b/src/layout/header-aside/components/header-size/index.vue
new file mode 100644
index 00000000..a59be8ee
--- /dev/null
+++ b/src/layout/header-aside/components/header-size/index.vue
@@ -0,0 +1,45 @@
+<template>
+  <el-dropdown placement="bottom" size="small" @command="handleChange">
+    <el-button class="d2-mr btn-text can-hover" type="text">
+      <d2-icon name="font" style="font-size: 16px;"/>
+    </el-button>
+    <el-dropdown-menu slot="dropdown">
+      <el-dropdown-item command="medium">
+        <d2-icon :name="iconName('medium')" class="d2-mr-5"/>
+        大
+      </el-dropdown-item>
+      <el-dropdown-item command="small">
+        <d2-icon :name="iconName('small')" class="d2-mr-5"/>
+        中
+      </el-dropdown-item>
+      <el-dropdown-item command="mini">
+        <d2-icon :name="iconName('mini')" class="d2-mr-5"/>
+        小
+      </el-dropdown-item>
+    </el-dropdown-menu>
+  </el-dropdown>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex'
+export default {
+  name: 'd2-size-control',
+  computed: {
+    ...mapState('d2admin/size', [
+      'value'
+    ])
+  },
+  methods: {
+    ...mapMutations('d2admin/size', [
+      'set'
+    ]),
+    handleChange (value) {
+      this.$ELEMENT.size = value
+      this.set(value)
+    },
+    iconName (name) {
+      return name === this.value ? 'dot-circle-o' : 'circle-o'
+    }
+  }
+}
+</script>
diff --git a/src/layout/header-aside/components/header-user/index.vue b/src/layout/header-aside/components/header-user/index.vue
index 735d6c90..9ad21d2b 100644
--- a/src/layout/header-aside/components/header-user/index.vue
+++ b/src/layout/header-aside/components/header-user/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dropdown class="d2-mr">
+  <el-dropdown size="small" class="d2-mr">
     <span class="btn-text">你好 {{info.name}}</span>
     <el-dropdown-menu slot="dropdown">
       <el-dropdown-item @click.native="logOff">
diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue
index 3a15413c..bc93c903 100644
--- a/src/layout/header-aside/layout.vue
+++ b/src/layout/header-aside/layout.vue
@@ -29,6 +29,7 @@
           <d2-header-error-log/>
           <d2-header-fullscreen/>
           <d2-header-theme/>
+          <d2-header-size/>
           <d2-header-user/>
         </div>
       </div>
@@ -92,6 +93,7 @@ export default {
     'd2-tabs': () => import('./components/tabs'),
     'd2-header-fullscreen': () => import('./components/header-fullscreen'),
     'd2-header-search': () => import('./components/header-search'),
+    'd2-header-size': () => import('./components/header-size'),
     'd2-header-theme': () => import('./components/header-theme'),
     'd2-header-user': () => import('./components/header-user'),
     'd2-header-error-log': () => import('./components/header-error-log')
diff --git a/src/store/modules/d2admin/index.js b/src/store/modules/d2admin/index.js
index 2cc2fbc3..3b844113 100644
--- a/src/store/modules/d2admin/index.js
+++ b/src/store/modules/d2admin/index.js
@@ -11,6 +11,7 @@ import gray from './modules/gray'
 import page from './modules/page'
 import transition from './modules/transition'
 import search from './modules/search'
+import size from './modules/size'
 
 export default {
   namespaced: true,
@@ -27,6 +28,7 @@ export default {
     gray,
     page,
     transition,
-    search
+    search,
+    size
   }
 }
diff --git a/src/store/modules/d2admin/modules/size.js b/src/store/modules/d2admin/modules/size.js
new file mode 100644
index 00000000..ebc13b8f
--- /dev/null
+++ b/src/store/modules/d2admin/modules/size.js
@@ -0,0 +1,38 @@
+export default {
+  namespaced: true,
+  state: {
+    // 尺寸
+    value: 'medium' // small mini
+  },
+  mutations: {
+    /**
+     * @description 设置尺寸
+     * @param {Object} state vuex state
+     * @param {String} size 尺寸
+     */
+    set (state, size) {
+      // store 赋值
+      state.value = size
+      // 持久化
+      this.dispatch('d2admin/db/set', {
+        dbName: 'sys',
+        path: 'size.value',
+        value: state.value,
+        user: true
+      })
+    },
+    /**
+     * @description 从持久化数据读取尺寸设置
+     * @param {Object} state vuex state
+     */
+    async asideCollapseLoad (state) {
+      // store 赋值
+      state.value = await this.dispatch('d2admin/db/get', {
+        dbName: 'sys',
+        path: 'size.value',
+        defaultValue: 'medium',
+        user: true
+      })
+    }
+  }
+}

From 93864d15fe5dc8aabe72c3c6f77f35ad1f1eb4ca Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 10 Sep 2018 15:33:23 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 94aa06a61f156ce7b3279f4d1445c6da95e8d8d6 [formerly 94aa06a61f156ce7b3279f4d1445c6da95e8d8d6 [formerly 94aa06a61f156ce7b3279f4d1445c6da95e8d8d6 [formerly 94aa06a61f156ce7b3279f4d1445c6da95e8d8d6 [formerly ff538ef2a8e6d7bd1cf5465adc350ff3d601d3e4 [formerly 8ca356d0a5fbf58cd8444ab7328e7d22c8d31f16]]]]]
Former-commit-id: 4c6635e00512059d9687b95ab08a5d9b71390251
Former-commit-id: a72b64407c8d5ec88b85e9e180c370d2fbf8166b
Former-commit-id: d9d3eac1b359ef8495be85d1974f7e6152969a54 [formerly 137d2c4365e97e6f19aa84a679c89fec7d01f9c0]
Former-commit-id: ebf9c6a3eab896314dd243c2a9fbb1ec5a00c5cd
Former-commit-id: 8caccdb4d5249d5e6b0663988a917314e5be2a78
Former-commit-id: 5e6fec3a7957420680e2813e71722f94d3fd7370
Former-commit-id: ed5c457666254c09cef50a6177df495e0cbf028a
Former-commit-id: 0db1023243356d58e402a2e26c4370e7cd2c15e4
---
 src/layout/header-aside/components/header-size/index.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/layout/header-aside/components/header-size/index.vue b/src/layout/header-aside/components/header-size/index.vue
index a59be8ee..d08f1f48 100644
--- a/src/layout/header-aside/components/header-size/index.vue
+++ b/src/layout/header-aside/components/header-size/index.vue
@@ -5,16 +5,13 @@
     </el-button>
     <el-dropdown-menu slot="dropdown">
       <el-dropdown-item command="medium">
-        <d2-icon :name="iconName('medium')" class="d2-mr-5"/>
-        大
+        <d2-icon :name="iconName('medium')" class="d2-mr-5"/>大
       </el-dropdown-item>
       <el-dropdown-item command="small">
-        <d2-icon :name="iconName('small')" class="d2-mr-5"/>
-        中
+        <d2-icon :name="iconName('small')" class="d2-mr-5"/>中
       </el-dropdown-item>
       <el-dropdown-item command="mini">
-        <d2-icon :name="iconName('mini')" class="d2-mr-5"/>
-        小
+        <d2-icon :name="iconName('mini')" class="d2-mr-5"/>小
       </el-dropdown-item>
     </el-dropdown-menu>
   </el-dropdown>

From 49f1826a0714010bec9cedf55435a92b791f50e5 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 10 Sep 2018 16:12:02 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 7d1d4807b8eafd3c988dec37bd316baf80ec10f5 [formerly 7d1d4807b8eafd3c988dec37bd316baf80ec10f5 [formerly 7d1d4807b8eafd3c988dec37bd316baf80ec10f5 [formerly 7d1d4807b8eafd3c988dec37bd316baf80ec10f5 [formerly fda58ba8fa5c3cdfae1de4366df5d1b3d22507b3 [formerly 481965dd045bdd23f0f3c652adb796565ecbac05]]]]]
Former-commit-id: 00db3f5c336c4f30dca75b8f99781d93633cf153
Former-commit-id: d7ce382da9d9f9d2cd11942c4a2af168a4e6c56b
Former-commit-id: 0fb053cd87d684266aca8b4853697b1c1053368a [formerly acb361a704ea067cf9d8e301d32ae556fce40bbe]
Former-commit-id: 0d527215fb720240156f1c0463134c6ed362133d
Former-commit-id: 227fe2db815a7d560fd526129b7756270f00b2ec
Former-commit-id: 6db371b0ba8b11fb9f71aa1e852cc51bc649c88d
Former-commit-id: 460c5ef5fadb48c1ae6885e145612c73da958735
Former-commit-id: 1de24c9653769294fcf3bf096f5a40b317370c7e
---
 .../components/header-size/index.vue          | 23 +++++++++++++++----
 .../header-aside/components/tabs/index.vue    |  1 +
 src/pages/login/page.vue                      |  2 +-
 src/plugin/d2admin/index.js                   | 16 +++++++++++--
 src/store/modules/d2admin/modules/account.js  |  4 +++-
 src/store/modules/d2admin/modules/size.js     |  6 ++---
 6 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/src/layout/header-aside/components/header-size/index.vue b/src/layout/header-aside/components/header-size/index.vue
index d08f1f48..96135019 100644
--- a/src/layout/header-aside/components/header-size/index.vue
+++ b/src/layout/header-aside/components/header-size/index.vue
@@ -4,14 +4,17 @@
       <d2-icon name="font" style="font-size: 16px;"/>
     </el-button>
     <el-dropdown-menu slot="dropdown">
+      <el-dropdown-item command="">
+        <d2-icon :name="iconName('default')" class="d2-mr-5"/>默认
+      </el-dropdown-item>
       <el-dropdown-item command="medium">
-        <d2-icon :name="iconName('medium')" class="d2-mr-5"/>大
+        <d2-icon :name="iconName('medium')" class="d2-mr-5"/>中
       </el-dropdown-item>
       <el-dropdown-item command="small">
-        <d2-icon :name="iconName('small')" class="d2-mr-5"/>中
+        <d2-icon :name="iconName('small')" class="d2-mr-5"/>小
       </el-dropdown-item>
       <el-dropdown-item command="mini">
-        <d2-icon :name="iconName('mini')" class="d2-mr-5"/>小
+        <d2-icon :name="iconName('mini')" class="d2-mr-5"/>最小
       </el-dropdown-item>
     </el-dropdown-menu>
   </el-dropdown>
@@ -26,13 +29,25 @@ export default {
       'value'
     ])
   },
+  watch: {
+    value: {
+      handler (val) {
+        console.log('handler')
+        this.$ELEMENT.size = val
+      },
+      immediate: true
+    }
+  },
   methods: {
     ...mapMutations('d2admin/size', [
       'set'
     ]),
     handleChange (value) {
-      this.$ELEMENT.size = value
       this.set(value)
+      this.$message({
+        message: `设置尺寸成功 ${value}`,
+        type: 'success'
+      })
     },
     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 7f093e0c..b1a0c01e 100644
--- a/src/layout/header-aside/components/tabs/index.vue
+++ b/src/layout/header-aside/components/tabs/index.vue
@@ -30,6 +30,7 @@
       class="d2-multiple-page-control-btn"
       flex-box="0">
       <el-dropdown
+        size="default"
         split-button
         @click="handleControlBtnClick"
         @command="command => handleControlItemClick(command)">
diff --git a/src/pages/login/page.vue b/src/pages/login/page.vue
index c7b46bef..c0a08c96 100644
--- a/src/pages/login/page.vue
+++ b/src/pages/login/page.vue
@@ -9,7 +9,7 @@
       <!-- 表单部分 -->
       <div class="form-group">
         <el-card>
-          <el-form ref="loginForm" label-position="top" :rules="rules" :model="formLogin">
+          <el-form ref="loginForm" label-position="top" :rules="rules" :model="formLogin" size="default">
             <el-form-item  prop="username">
               <el-input type="text" v-model="formLogin.username" placeholder="用户名">
                 <i slot="prepend" class="fa fa-user-circle-o"></i>
diff --git a/src/plugin/d2admin/index.js b/src/plugin/d2admin/index.js
index c27d7f42..6af7047b 100644
--- a/src/plugin/d2admin/index.js
+++ b/src/plugin/d2admin/index.js
@@ -3,6 +3,8 @@ import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 // flex 布局库
 import 'flex.css'
+// store
+import store from '@/store/index'
 // 组件
 import '@/components'
 // svg 图标
@@ -15,9 +17,19 @@ import pluginLog from '@/plugin/log'
 import pluginOpen from '@/plugin/open'
 
 export default {
-  install (Vue, options) {
+  async install (Vue, options) {
+    // 获得用户设置的全局尺寸
+    const size = await store.dispatch('d2admin/db/get', {
+      dbName: 'sys',
+      path: 'size.value',
+      defaultValue: '',
+      user: true
+    })
+    console.log('size: ', size)
     // Element
-    Vue.use(ElementUI)
+    Vue.use(ElementUI, {
+      size
+    })
     // 插件
     Vue.use(pluginError)
     Vue.use(pluginExport)
diff --git a/src/store/modules/d2admin/modules/account.js b/src/store/modules/d2admin/modules/account.js
index 9aab7091..78569bd9 100644
--- a/src/store/modules/d2admin/modules/account.js
+++ b/src/store/modules/d2admin/modules/account.js
@@ -108,8 +108,10 @@ export default {
       this.commit('d2admin/transition/load')
       // DB -> store 持久化数据加载上次退出时的多页列表
       this.commit('d2admin/page/openedLoad')
-      // DB -> store 持久化数据加载这个用户之前设置的侧边栏折叠状态
+      // DB -> store 持久化数据加载侧边栏折叠状态
       this.commit('d2admin/menu/asideCollapseLoad')
+      // DB -> store 持久化数据加载全局尺寸
+      this.commit('d2admin/size/load')
     }
   }
 }
diff --git a/src/store/modules/d2admin/modules/size.js b/src/store/modules/d2admin/modules/size.js
index ebc13b8f..b500e033 100644
--- a/src/store/modules/d2admin/modules/size.js
+++ b/src/store/modules/d2admin/modules/size.js
@@ -2,7 +2,7 @@ export default {
   namespaced: true,
   state: {
     // 尺寸
-    value: 'medium' // small mini
+    value: '' // medium small mini
   },
   mutations: {
     /**
@@ -25,12 +25,12 @@ export default {
      * @description 从持久化数据读取尺寸设置
      * @param {Object} state vuex state
      */
-    async asideCollapseLoad (state) {
+    async load (state) {
       // store 赋值
       state.value = await this.dispatch('d2admin/db/get', {
         dbName: 'sys',
         path: 'size.value',
-        defaultValue: 'medium',
+        defaultValue: 'default',
         user: true
       })
     }

From e8e427170f2280304dbee551035da25b825a5d3f Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 10 Sep 2018 16:13:45 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E4=BF=AE=E6=94=B9=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: bbfa8c1f1912a953f083c43e3dfc66cbb8a94c38 [formerly bbfa8c1f1912a953f083c43e3dfc66cbb8a94c38 [formerly bbfa8c1f1912a953f083c43e3dfc66cbb8a94c38 [formerly bbfa8c1f1912a953f083c43e3dfc66cbb8a94c38 [formerly b0471716a10855a99f9eeec56c5d90466ca78984 [formerly 615abfaf14069173e666265406d43b7c001cbc6b]]]]]
Former-commit-id: 218d3d292b96ace88068c5151de0e4db31ec0045
Former-commit-id: 83f58431c1fe8d0e505c1b529971a3532eacec74
Former-commit-id: 9a6dd3e351174e96efc38db9815056aa3e37c68a [formerly d122a952d4566d7c512488ddb419706aa7a5e218]
Former-commit-id: d7cee2c9d8f6d46e0218662a8c62589c49f5406f
Former-commit-id: 393f897a4b405e4d182f0a1d590634d65aede702
Former-commit-id: 77c05c97905e96a99f1b5ec358b432052e5edd55
Former-commit-id: b7fb5d555038f979df68dd44ea976710a5ae689c
Former-commit-id: f572f37e0a9fb37edd68ad3c48266b2eb0d1444c
---
 src/layout/header-aside/components/header-size/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/layout/header-aside/components/header-size/index.vue b/src/layout/header-aside/components/header-size/index.vue
index 96135019..b13b0783 100644
--- a/src/layout/header-aside/components/header-size/index.vue
+++ b/src/layout/header-aside/components/header-size/index.vue
@@ -23,16 +23,17 @@
 <script>
 import { mapState, mapMutations } from 'vuex'
 export default {
-  name: 'd2-size-control',
+  name: 'd2-header-size',
   computed: {
     ...mapState('d2admin/size', [
       'value'
     ])
   },
   watch: {
+    // 注意 这里是关键
+    // 因为需要访问 this.$ELEMENT 所以只能在这里使用这种方式
     value: {
       handler (val) {
-        console.log('handler')
         this.$ELEMENT.size = val
       },
       immediate: true

From fea87f6e7faac0cd4b856d258946cd6e02049a5f Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 10 Sep 2018 16:53:53 +0800
Subject: [PATCH 5/5] keepAlive

Former-commit-id: 4e2c99a5eb914796080ee784db3c7805741e529a [formerly 4e2c99a5eb914796080ee784db3c7805741e529a [formerly 4e2c99a5eb914796080ee784db3c7805741e529a [formerly 4e2c99a5eb914796080ee784db3c7805741e529a [formerly 0673d79b0c2bf8f305834ec81cbf966776452d8c [formerly e086649eb11bbf0161279601fedc27f61306cf6c]]]]]
Former-commit-id: bc0fbc7b16fbb174c50b1ebac650112de349017d
Former-commit-id: 525a8205e35fc7e21666fc9c902be67356a0a901
Former-commit-id: e84543902a51d1d26008d67ff8de0e1848ee3af3 [formerly 5af200b4d0c4a75ae10ead931e9767e66e2742fb]
Former-commit-id: 5d4c68bf8fced815af9808cc63500272ecdfb214
Former-commit-id: af97711a8a7dfead7ea572bbc0a6169ef79a2ce3
Former-commit-id: e0feb7ebcfbf746a859c25435f087ec7dc9d5f85
Former-commit-id: 43cb13c42677b7d08f8971990716593ec37dba96
Former-commit-id: b06a25b1d92afe7faffc795122d99d6ce7d563f4
---
 src/layout/header-aside/layout.vue        |  2 +-
 src/store/modules/d2admin/modules/page.js | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue
index bc93c903..b90f977a 100644
--- a/src/layout/header-aside/layout.vue
+++ b/src/layout/header-aside/layout.vue
@@ -108,12 +108,12 @@ export default {
   },
   computed: {
     ...mapState('d2admin', {
+      keepAlive: state => state.page.keepAlive,
       grayActive: state => state.gray.active,
       transitionActive: state => state.transition.active,
       asideCollapse: state => state.menu.asideCollapse
     }),
     ...mapGetters('d2admin', {
-      keepAlive: 'page/keepAlive',
       themeActiveSetting: 'theme/activeSetting'
     }),
     /**
diff --git a/src/store/modules/d2admin/modules/page.js b/src/store/modules/d2admin/modules/page.js
index 8d88d517..c2f51013 100644
--- a/src/store/modules/d2admin/modules/page.js
+++ b/src/store/modules/d2admin/modules/page.js
@@ -9,15 +9,18 @@ export default {
     // 当前显示的多页面列表
     opened: setting.page.opened,
     // 当前页面
-    current: ''
+    current: '',
+    // 需要缓存的页面 name
+    keepAlive: []
   },
-  getters: {
+  mutations: {
     /**
-     * @description 从当前所有打开的多标签页里返回需要缓存的页面 name
-     * @param {*} state vuex state
+     * @class keepAlive
+     * @description 从已经打开的页面记录中更新需要缓存的页面记录
+     * @param {Object} state vuex state
      */
-    keepAlive (state) {
-      return state.opened.filter(item => {
+    updateKeepAliveFromOpened (state) {
+      state.keepAlive = state.opened.filter(item => {
         if (item.meta) {
           if (item.meta.notCache) {
             return false
@@ -25,9 +28,7 @@ export default {
         }
         return true
       }).map(e => e.name)
-    }
-  },
-  mutations: {
+    },
     /**
      * @class current
      * @description 打开一个新的页面