diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue index 6be0e832..cb29e836 100644 --- a/src/components/core/d2-layout-main/index.vue +++ b/src/components/core/d2-layout-main/index.vue @@ -34,7 +34,7 @@
- + @@ -71,7 +71,7 @@ export default { ...mapState({ themeActive: state => state.d2admin.themeActive, isGrayMode: state => state.d2admin.isGrayMode, - pageCacheList: state => state.d2admin.pageCacheList + pageUseCacheList: state => state.d2admin.pageUseCacheList }), styleLayoutMainGroup () { return { diff --git a/src/libs/db.js b/src/libs/db.js index 604d87eb..869ddd50 100644 --- a/src/libs/db.js +++ b/src/libs/db.js @@ -6,8 +6,7 @@ const db = low(adapter) db.defaults({ themeActive: [], - pageOpenedList: [], - pageCacheList: [] + pageOpenedList: [] }) .write() diff --git a/src/libs/util.js b/src/libs/util.js index 10039d3c..343338e7 100644 --- a/src/libs/util.js +++ b/src/libs/util.js @@ -68,7 +68,7 @@ util.openNewPage = function (vm, name, argu, query) { vm.$store.commit('d2adminTagIncreate', { tag, argu, query }) } } - vm.$store.commit('d2adminPageSetCurrentName', name) + vm.$store.commit('d2adminPageCurrentSet', name) } /** diff --git a/src/main.js b/src/main.js index 8d142afa..43189fb9 100755 --- a/src/main.js +++ b/src/main.js @@ -104,6 +104,7 @@ new Vue({ } push(frameInRoutes) this.$store.commit('d2admintagPoolSet', tagPool) + // d2adminPageUseCacheList } } }) diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js index bdd91245..ea1d6d4d 100644 --- a/src/store/modules/d2admin.js +++ b/src/store/modules/d2admin.js @@ -19,20 +19,24 @@ export default { ], // 当前页面 pageCurrent: '', - // 使用缓存的页面 (需要在页面中写 name) - pageCacheList: [], - // 不使用缓存的页面 - pageDisableCacheList: [ - 'no-cache' - ] + // 使用缓存的页面 + pageUseCacheList: [] }, mutations: { + /** + * 设置使用缓存的页面 + * @param {state} state vuex state + * @param {array} name pageUseCacheList + */ + d2adminPageUseCacheList (state, list) { + state.pageUseCacheList = list + }, /** * 设置当前激活的页面 name * @param {state} state vuex state * @param {string} name new name */ - d2adminPageSetCurrentName (state, name) { + d2adminPageCurrentSet (state, name) { state.pageCurrent = name }, /** @@ -75,21 +79,6 @@ export default { let newTag = tag newTag.argu = argu || newTag.argu newTag.query = query || newTag.query - // 检查这个页面是不是属于不使用缓存的页面 - if (!util.isOneOf(newTag.name, state.pageDisableCacheList)) { - // 在缓存页面的列表加入这个页面的 name - state.pageCacheList.push(newTag.name) - // 更新设置到数据库 - const setting = db.get('pageCacheList').find({uuid: util.uuid()}) - if (setting.value()) { - setting.assign({value: state.pageCacheList}).write() - } else { - db.get('pageCacheList').push({ - uuid: util.uuid(), - value: state.pageCacheList - }).write() - } - } // 添加进当前显示的页面数组 state.pageOpenedList.push(newTag) // 更新设置到数据库