From 27ab18faa002e0ac2b6dba36e165ba628480c316 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 19:29:01 +0800
Subject: [PATCH] no message
Former-commit-id: 5a98ab9fad1cd3487d5975a13be18e7e974ac943 [formerly 5a98ab9fad1cd3487d5975a13be18e7e974ac943 [formerly 5a98ab9fad1cd3487d5975a13be18e7e974ac943 [formerly 5a98ab9fad1cd3487d5975a13be18e7e974ac943 [formerly 435c4d936c2f8ab5eea278e4432a0df286286f01 [formerly f87cff38d27cea83e7a7fd974aff47bac7801bc7]]]]]
Former-commit-id: 848af72c6b5e06521da331a7d35c2ef802d17a22
Former-commit-id: ae82c772d169467c14849964521f203c819bc4cf
Former-commit-id: 75e0c51e1a5a1720a40d48b2319f69fa0dcd9dfd [formerly 8732955133a2a8df5b4c4ed780161a27b8468dc8]
Former-commit-id: e0404cd785b26d49dd4309fa182d921679401c17
Former-commit-id: 8073756eb1b1431acc4f31798822e453304d6545
Former-commit-id: 4c642306a6aaa3daf3f6cafaaae40129e879e6d4
Former-commit-id: e18a58a22d64f6ec527909074a193716f163489b
Former-commit-id: 9b9eeb009de56ee3405ac4be0eed2551f1ed06d8
---
src/main.js | 9 +++++++--
src/menu/index.js.REMOVED.git-id | 2 +-
src/pages/demo/playground/page-cache/index.vue | 17 +++++++++++++++++
src/router/routes.js.REMOVED.git-id | 2 +-
src/store/modules/d2admin.js | 3 +--
5 files changed, 27 insertions(+), 6 deletions(-)
create mode 100644 src/pages/demo/playground/page-cache/index.vue
diff --git a/src/main.js b/src/main.js
index 43189fb9..e47e1ace 100755
--- a/src/main.js
+++ b/src/main.js
@@ -92,19 +92,24 @@ new Vue({
* 处理路由 得到每一级的路由设置
*/
getAllTagFromRoutes () {
+ // 所有加载在主框架内的页面
const tagPool = []
+ // 所有需要被缓存的页面组件 name
+ const pageUseCacheList = []
const push = function (routes) {
routes.forEach(route => {
if (route.children) {
push(route.children)
} else {
+ console.log('alive', route.meta.alive)
tagPool.push(route)
}
})
}
push(frameInRoutes)
- this.$store.commit('d2admintagPoolSet', tagPool)
- // d2adminPageUseCacheList
+ console.log('tagPool', tagPool)
+ this.$store.commit('d2adminTagPoolSet', tagPool)
+ this.$store.commit('d2adminPageUseCacheListSet', pageUseCacheList)
}
}
})
diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index b1c5f226..a8f0a8fb 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-7562f0a732bab9f663056b29032ad38a3cfcae86
\ No newline at end of file
+a741ca1e629d094296537193224186be0fe27007
\ No newline at end of file
diff --git a/src/pages/demo/playground/page-cache/index.vue b/src/pages/demo/playground/page-cache/index.vue
new file mode 100644
index 00000000..153f7817
--- /dev/null
+++ b/src/pages/demo/playground/page-cache/index.vue
@@ -0,0 +1,17 @@
+
+
+ page-name
+
+
+
+
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index d11962f2..b3e92774 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-bd6085cdedc8b795441980caba311c098d002f0d
\ No newline at end of file
+e5b63ace9e1672fcf1badc8cbb5889e21060b67f
\ No newline at end of file
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index ea1d6d4d..6dbb95a4 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -66,7 +66,7 @@ export default {
* @param {state} state vuex state
* @param {Array} tagPool tags
*/
- d2admintagPoolSet (state, tagPool) {
+ d2adminTagPoolSet (state, tagPool) {
state.tagPool = tagPool
},
/**
@@ -91,7 +91,6 @@ export default {
value: state.pageOpenedList
}).write()
}
- console.log('d2adminTagIncreate')
},
/**
* 切换全屏