From 436c9271054bccd6d89cfdc32236cd71ba158828 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 30 Jun 2018 19:59:04 +0800
Subject: [PATCH] no message

Former-commit-id: 39ce7cc5f4fedfbc532ce0dd84969566f2ac9ea9 [formerly 7260132cf9457c2add2123dcdf753b6a2685a6fa] [formerly 39ce7cc5f4fedfbc532ce0dd84969566f2ac9ea9 [formerly 7260132cf9457c2add2123dcdf753b6a2685a6fa] [formerly 39ce7cc5f4fedfbc532ce0dd84969566f2ac9ea9 [formerly 7260132cf9457c2add2123dcdf753b6a2685a6fa] [formerly 7260132cf9457c2add2123dcdf753b6a2685a6fa [formerly 6a0f8169e55aef3a06ad4ad1a886ccefbb89c7c6 [formerly 7c6206c877e9d669c7549f216a743ba7749f568c]]]]]
Former-commit-id: c3d91f0f3530405ede6dd6d0b3af0f4182098792
Former-commit-id: 12e4b2e828fc38cf1825ce4e3205abe7914bab20
Former-commit-id: 4c6031327259be12bc930cc1b99257bfac590672 [formerly 78a40e795c2429e3fc8d42bc790c59dbec7c5911]
Former-commit-id: d164c4db1803cd684bf9806e4d044b5032e0612e
Former-commit-id: 9df3d0fe1a100cf6d1bed1ef46fe79f4330aa277
Former-commit-id: edf76528ce6ecd10f92dbc2c65e8fb3bacd3b86b
Former-commit-id: 485555b0759bf336c15a561343a7ad6a150a2aee
Former-commit-id: 2177d168625cf72c301207b8be4efb254be963e5
---
 package.json                                 |  1 -
 src/components/core/d2-layout-main/index.vue |  5 ++---
 src/main.js                                  |  6 +-----
 src/router/routes.js.REMOVED.git-id          |  2 +-
 src/store/modules/d2admin.js                 | 12 +-----------
 5 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 1c7b2f58..8426f1b4 100755
--- a/package.json
+++ b/package.json
@@ -26,7 +26,6 @@
     "highlight.js": "^9.12.0",
     "js-cookie": "^2.2.0",
     "lodash.clonedeep": "^4.5.0",
-    "lodash.get": "^4.4.2",
     "lodash.uniqueid": "^4.0.1",
     "lowdb": "^1.0.0",
     "marked": "^0.3.9",
diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index cb29e836..1871996c 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -34,7 +34,7 @@
           </div>
           <div class="d2-layout-main-body">
             <transition name="fade-transverse">
-              <keep-alive :include="pageUseCacheList">
+              <keep-alive>
                 <router-view/>
               </keep-alive>
             </transition>
@@ -70,8 +70,7 @@ export default {
   computed: {
     ...mapState({
       themeActive: state => state.d2admin.themeActive,
-      isGrayMode: state => state.d2admin.isGrayMode,
-      pageUseCacheList: state => state.d2admin.pageUseCacheList
+      isGrayMode: state => state.d2admin.isGrayMode
     }),
     styleLayoutMainGroup () {
       return {
diff --git a/src/main.js b/src/main.js
index e47e1ace..f624d9b3 100755
--- a/src/main.js
+++ b/src/main.js
@@ -57,6 +57,7 @@ import pluginOpen from '@/plugin/open'
 // 插件 支持百万级数据的表格
 import bigdataTable from '@/plugin/vue-bigdata-table'
 
+// 打包的设置 用户获取路径
 import buildConfig from '../config/index'
 
 Vue.use(ElementUI)
@@ -94,22 +95,17 @@ 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)
-      console.log('tagPool', tagPool)
       this.$store.commit('d2adminTagPoolSet', tagPool)
-      this.$store.commit('d2adminPageUseCacheListSet', pageUseCacheList)
     }
   }
 })
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index b3e92774..9a319d1d 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-e5b63ace9e1672fcf1badc8cbb5889e21060b67f
\ No newline at end of file
+c33ea8b29ae79d4d8fd278159427b1f326d0d9a9
\ No newline at end of file
diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 6dbb95a4..54cdc24e 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -18,19 +18,9 @@ export default {
       { name: 'index', title: '首页' }
     ],
     // 当前页面
-    pageCurrent: '',
-    // 使用缓存的页面
-    pageUseCacheList: []
+    pageCurrent: ''
   },
   mutations: {
-    /**
-     * 设置使用缓存的页面
-     * @param {state} state vuex state
-     * @param {array} name pageUseCacheList
-     */
-    d2adminPageUseCacheList (state, list) {
-      state.pageUseCacheList = list
-    },
     /**
      * 设置当前激活的页面 name
      * @param {state} state vuex state