diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue index 1cf19fbf..e79dea7a 100644 --- a/src/layout/header-aside/layout.vue +++ b/src/layout/header-aside/layout.vue @@ -44,7 +44,7 @@
- + @@ -83,7 +83,7 @@ export default { asideCollapse: state => state.menu.asideCollapse }), ...mapGetters('d2admin', { - keepAliveInclude: 'page/keepAliveInclude', + keepAlive: 'page/keepAlive', themeActiveSetting: 'theme/activeSetting' }), /** diff --git a/src/pages/demo/playground/store/sys/index.vue b/src/pages/demo/playground/store/sys/index.vue index 321fcb3f..e532e4bd 100644 --- a/src/pages/demo/playground/store/sys/index.vue +++ b/src/pages/demo/playground/store/sys/index.vue @@ -111,8 +111,8 @@
+ :data="keepAlive" + :options="{ rootObjectKey: 'keepAlive', maxDepth: 1 }"/>
@@ -156,7 +156,7 @@ export default { pageopened: state => state.page.opened }), ...mapGetters('d2admin', { - keepAliveInclude: 'page/keepAliveInclude', + 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 b7eb4da1..f1c02acb 100644 --- a/src/store/modules/d2admin/modules/page.js +++ b/src/store/modules/d2admin/modules/page.js @@ -23,7 +23,7 @@ export default { * @description 从当前所有打开的多标签页里返回需要缓存的页面 name * @param {*} state vuex state */ - keepAliveInclude (state) { + keepAlive (state) { return state.opened.filter(item => { if (item.meta) { if (item.meta.notCache) { @@ -53,7 +53,7 @@ export default { }) if (pageOpend) { // 页面以前打开过 但是新的页面可能 name 一样,参数不一样 - this.commit('d2admin/page/openedUpdateItem', { + this.commit('d2admin/page/openedUpdate', { index: pageOpendIndex, params, query @@ -62,7 +62,11 @@ export default { // 页面以前没有打开过 let page = state.pool.find(t => t.name === name) if (page) { - this.commit('d2admin/page/add', { tag: page, params, query }) + this.commit('d2admin/page/add', { + tag: page, + params, + query + }) } } this.commit('d2admin/page/currentSet', name) @@ -82,7 +86,7 @@ export default { * @param {Object} state vuex state * @param {Object} param { index, params, query } 路由信息 */ - openedUpdateItem (state, { index, params, query }) { + openedUpdate (state, { index, params, query }) { // 更新页面列表某一项 let page = state.opened[index] page.params = params || page.params