解决菜单缓存的bug

jshERP-web/src/components/layouts/RouteView.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="main">
-  <keep-alive>
+    <keep-alive>
-    <router-view v-if="keepAlive" />
+      <router-view v-if="keepAlive" />
-  </keep-alive>
+    </keep-alive>
-  <router-view v-if="!keepAlive" />
+    <router-view v-if="!keepAlive" />
   </div>
 </template>
 
@@ -14,6 +14,6 @@
       keepAlive () {
         return this.$route.meta.keepAlive
       }
-    },
+    }
   }
 </script>

jshERP-web/src/components/layouts/TabLayout.vue

@@ -1,8 +1,6 @@
 <template>
   <global-layout @dynamicRouterShow="dynamicRouterShow">
-    <!-- update-begin- author:sunjianlei --- date:20191009 --- for: 提升右键菜单的层级 -->
     <contextmenu :itemList="menuItemList" :visible.sync="menuVisible" style="z-index: 9999;" @select="onMenuSelect"/>
-    <!-- update-end- author:sunjianlei --- date:20191009 --- for: 提升右键菜单的层级 -->
     <a-tabs
       @contextmenu.native="e => onContextmenu(e)"
       v-if="multipage"
@@ -20,7 +18,7 @@
     </a-tabs>
     <div style="margin: 4px 4px 0;">
       <transition name="page-toggle">
-        <keep-alive v-if="multipage">
+        <keep-alive v-if="multipage" :include="includedComponents">
           <router-view v-if="reloadFlag"/>
         </keep-alive>
         <template v-else>
@@ -36,9 +34,9 @@
   import Contextmenu from '@/components/menu/Contextmenu'
   import { mixin, mixinDevice } from '@/utils/mixin.js'
   import { triggerWindowResizeEvent } from '@/utils/util'
-  import Vue from 'vue'
-
   const indexKey = '/dashboard/analysis'
+  import Vue from 'vue'
+  import { CACHE_INCLUDED_ROUTES } from "@/store/mutation-types"
 
   export default {
     name: 'TabLayout',
@@ -53,7 +51,6 @@
         linkList: [],
         activePage: '',
         menuVisible: false,
-        changeType: 0, //0-不刷新 1-刷新
         menuItemList: [
           { key: '4', icon: 'reload', text: '刷 新' },
           { key: '1', icon: 'arrow-left', text: '关闭左侧' },
@@ -63,13 +60,11 @@
         reloadFlag:true
       }
     },
-    /* update_begin author:wuxianquan date:20190828 for: 关闭当前tab页，供子页面调用 ->望菜单能配置外链，直接弹出新页面而不是嵌入iframe #428 */
     provide(){
       return{
         closeCurrent:this.closeCurrent
       }
     },
-    /* update_end author:wuxianquan date:20190828 for: 关闭当前tab页，供子页面调用->望菜单能配置外链，直接弹出新页面而不是嵌入iframe #428 */
     computed: {
       multipage() {
         //判断如果是手机模式，自动切换为单页面模式
@@ -78,19 +73,33 @@
         } else {
           return this.$store.state.app.multipage
         }
+      },
+      includedComponents() {
+        const includedRouters = Vue.ls.get(CACHE_INCLUDED_ROUTES)
+        //console.log("includedRouters：" + includedRouters)
+        //加入到 cache_included_routes
+        if (this.$route.meta.componentName) {
+          let cacheRouterArray = Vue.ls.get(CACHE_INCLUDED_ROUTES) || []
+          if(!cacheRouterArray.includes(this.$route.meta.componentName)){
+            cacheRouterArray.push(this.$route.meta.componentName)
+            //console.log("Vue ls set componentName ：" + this.$route.meta.componentName)
+            Vue.ls.set(CACHE_INCLUDED_ROUTES, cacheRouterArray)
+            //console.log("Vue ls includedRouterArrays ：" + Vue.ls.get(CACHE_INCLUDED_ROUTES))
+            return cacheRouterArray;
+          }
+        }
+        return includedRouters;
       }
     },
     created() {
       if (this.$route.path != indexKey) {
         this.addIndexToFirst()
       }
-      // update-begin-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常
       let storeKey = 'route:title:' + this.$route.fullPath
       let routeTitle = this.$ls.get(storeKey)
       if (routeTitle) {
         this.$route.meta.title = routeTitle
       }
-      // update-end-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常
       this.pageList.push(this.$route)
       this.linkList.push(this.$route.fullPath)
       this.activePage = this.$route.fullPath
@@ -104,26 +113,17 @@
         if (!this.multipage) {
           this.linkList = [newRoute.fullPath]
           this.pageList = [Object.assign({},newRoute)]
-        // update-begin-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题，需要根据后台的路由配置来实现是否缓存
         } else if(indexKey==newRoute.fullPath) {
           //首页时 直接刷新
-          this.routeReload()
-        // update-end-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题，需要根据后台的路由配置来实现是否缓存
         }else if (this.linkList.indexOf(newRoute.fullPath) < 0) {
           this.linkList.push(newRoute.fullPath)
           this.pageList.push(Object.assign({},newRoute))
-          // update-begin-author:sunjianlei date:20200103 for: 如果新增的页面配置了缓存路由，那么就强制刷新一遍
-          this.routeReload()
-          // update-end-author:sunjianlei date:20200103 for: 如果新增的页面配置了缓存路由，那么就强制刷新一遍
         } else if (this.linkList.indexOf(newRoute.fullPath) >= 0) {
           let oldIndex = this.linkList.indexOf(newRoute.fullPath)
           let oldPositionRoute = this.pageList[oldIndex]
           this.pageList.splice(oldIndex, 1, Object.assign({},newRoute,{meta:oldPositionRoute.meta}))
           //给菜单id赋值，用于调用之后控制按钮的显示
           Vue.ls.set('funId', oldPositionRoute.meta.id, 7 * 24 * 60 * 60 * 1000)
-          if(this.changeType) {
-            this.routeReload()
-          }
         }
       },
       'activePage': function(key) {
@@ -140,16 +140,14 @@
           }
         }
       },
-      // update-begin-author:sunjianlei date:20191223 for: 修复从单页模式切换回多页模式后首页不居第一位的 BUG
+      //从单页模式切换回多页模式后首页要居第一位
       device() {
         if (this.multipage && this.linkList.indexOf(indexKey) === -1) {
           this.addIndexToFirst()
         }
       },
-      // update-end-author:sunjianlei date:20191223 for: 修复从单页模式切换回多页模式后首页不居第一位的 BUG
     },
     methods: {
-      // update-begin-author:sunjianlei date:20191223 for: 修复从单页模式切换回多页模式后首页不居第一位的 BUG
       // 将首页添加到第一位
       addIndexToFirst() {
         this.pageList.splice(0, 0, {
@@ -163,9 +161,7 @@
         })
         this.linkList.splice(0, 0, indexKey)
       },
-      // update-end-author:sunjianlei date:20191223 for: 修复从单页模式切换回多页模式后首页不居第一位的 BUG
+      //动态更改页面标题
-
-      // update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题
       changeTitle(title) {
         let projectTitle = window.SYS_TITLE
         // 首页特殊处理
@@ -175,16 +171,10 @@
           document.title = title + ' · ' + projectTitle
         }
       },
-      // update-end-author:sunjianlei date:20200120 for: 动态更改页面标题
-
       changePage(key) {
-        //切换页签
-        this.changeType = 0
         this.activePage = key
       },
       tabCallBack() {
-        //切换页签
-        this.changeType = 0
         this.$nextTick(() => {
           triggerWindowResizeEvent()
         })
@@ -201,11 +191,26 @@
           this.$message.warning('这是最后一页，不能再关闭了啦')
           return
         }
+        //console.log("this.pageList ",this.pageList );
+        let removeRoute = this.pageList.filter(item => item.fullPath == key)
         this.pageList = this.pageList.filter(item => item.fullPath !== key)
         let index = this.linkList.indexOf(key)
         this.linkList = this.linkList.filter(item => item !== key)
         index = index >= this.linkList.length ? this.linkList.length - 1 : index
         this.activePage = this.linkList[index]
+        //update-begin--Author:scott  Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842
+        //关闭页面则从缓存cache_included_routes中删除路由，下次点击菜单会重新加载页面
+        let cacheRouterArray = Vue.ls.get(CACHE_INCLUDED_ROUTES) || []
+        if (removeRoute && removeRoute[0]) {
+          let componentName = removeRoute[0].meta.componentName
+          //console.log("key: ", key);
+          //console.log("componentName: ", componentName);
+          if(cacheRouterArray.includes(componentName)){
+            cacheRouterArray.splice(cacheRouterArray.findIndex(item => item === componentName), 1)
+            Vue.ls.set(CACHE_INCLUDED_ROUTES, cacheRouterArray)
+          }
+        }
+        //update-end--Author:scott  Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842
       },
       onContextmenu(e) {
         const pagekey = this.getPageKey(e.target)
@@ -242,11 +247,10 @@
             break
         }
       },
-      /* update_begin author:wuxianquan date:20190828 for: 关闭当前tab页，供子页面调用->望菜单能配置外链，直接弹出新页面而不是嵌入iframe #428 */
+      //关闭当前tab页，供子页面调用->望菜单能配置外链，直接弹出新页面而不是嵌入iframe
       closeCurrent(){
         this.remove(this.activePage);
       },
-      /* update_end author:wuxianquan date:20190828 for: 关闭当前tab页，供子页面调用->望菜单能配置外链，直接弹出新页面而不是嵌入iframe #428 */
       closeOthers(pageKey) {
         let index = this.linkList.indexOf(pageKey)
         if (pageKey == indexKey || pageKey.indexOf('?ticke=')>=0) {
@@ -285,12 +289,11 @@
           this.activePage = this.linkList[this.linkList.length - 1]
         }
       },
-      //update-begin-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
+      //动态路由title显示配置的菜单title而不是其对应路由的title
-      dynamicRouterShow(key, id, title){
+      dynamicRouterShow(key, id, title, component){
         let keyIndex = this.linkList.indexOf(key)
         if(keyIndex>=0){
           //切换历史页签
-          this.changeType = 0
           let currRouter = this.pageList[keyIndex]
           let meta = Object.assign({},currRouter.meta,{title:title})
           this.pageList.splice(keyIndex, 1, Object.assign({},currRouter,{meta:meta}))
@@ -300,7 +303,10 @@
           }
         } else {
           //打开新的页签
-          this.changeType = 1
+          if(component) {
+            let index = component.lastIndexOf("\/");
+            component = component.substring(index + 1, component.length);
+          }
           this.pageList.push({
             name: title,
             path: key,
@@ -308,16 +314,16 @@
             meta: {
               id: id,
               icon: key,
-              title: title
+              title: title,
+              componentName: component,
+              keepAlive: true
             }
           })
           this.linkList.push(key)
           this.activePage = key
         }
       },
-      //update-end-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
+      //路由刷新
-
-      //update-begin-author:taoyan date:20191008 for:路由刷新
       routeReload(){
         this.reloadFlag = false
         let ToggleMultipage = "ToggleMultipage"
@@ -327,7 +333,6 @@
           this.reloadFlag = true
         })
       }
-      //update-end-author:taoyan date:20191008 for:路由刷新
     }
   }
 </script>
@@ -335,12 +340,7 @@
 <style lang="less">
 
   /*
- * The following styles are auto-applied to elements with
+ * by ji-shenghua qq 75-27-18-920
- * transition="page-transition" when their visibility is toggled
- * by Vue.js.
- *
- * You can easily play with the page transition by editing
- * these styles.
  */
 
   .page-transition-enter {

jshERP-web/src/components/page/GlobalLayout.vue

@@ -153,7 +153,7 @@
       myMenuSelect(value){
         //此处触发动态路由被点击事件
         this.findMenuBykey(this.menus,value.key)
-        this.$emit("dynamicRouterShow",value.key, this.activeMenu.id, this.activeMenu.text)
+        this.$emit("dynamicRouterShow",value.key, this.activeMenu.id, this.activeMenu.text, this.activeMenu.component)
         let storeKey = 'route:title:' + this.activeMenu.url
         this.$ls.set(storeKey, this.activeMenu.text)
       },

jshERP-web/src/store/modules/user.js

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { login, logout } from "@/api/login"
-import { ACCESS_TOKEN, USER_NAME,USER_INFO,UI_CACHE_DB_DICT_DATA,USER_ID,USER_LOGIN_NAME } from "@/store/mutation-types"
+import { ACCESS_TOKEN, USER_NAME,USER_INFO,UI_CACHE_DB_DICT_DATA,USER_ID,USER_LOGIN_NAME,CACHE_INCLUDED_ROUTES } from "@/store/mutation-types"
 import { welcome } from "@/utils/util"
 import { queryPermissionsByUser } from '@/api/api'
 import { getAction } from '@/api/manage'
@@ -113,6 +113,7 @@ const user = {
         Vue.ls.remove(USER_LOGIN_NAME)
         Vue.ls.remove(USER_INFO)
         Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
+        Vue.ls.remove(CACHE_INCLUDED_ROUTES)
         logout().then(() => {
           resolve()
         }).catch(() => {

jshERP-web/src/store/mutation-types.js

@@ -19,7 +19,8 @@ export const ENCRYPTED_STRING = 'ENCRYPTED_STRING'
 export const ENHANCE_PRE = 'enhance_'
 export const UI_CACHE_DB_DICT_DATA = 'UI_CACHE_DB_DICT_DATA'
 export const INDEX_MAIN_PAGE_PATH =  "/dashboard/analysis"
-
+//路由缓存问题，关闭了tab页时再打开就不刷新 #842
+export const CACHE_INCLUDED_ROUTES = 'CACHE_INCLUDED_ROUTES'
 export const CONTENT_WIDTH_TYPE = {
   Fluid: 'Fluid',
   Fixed: 'Fixed'

jshERP-web/src/utils/util.js

@@ -113,6 +113,11 @@ function generateChildRouters (data) {
     if (isURL(URL)) {
       item.url = URL;
     }
+    let componentName =''
+    if(item.component) {
+      let index = item.component.lastIndexOf("\/");
+      componentName = item.component.substring(index + 1, item.component.length);
+    }
     let menu = {
       path: item.url,
       name: item.text,
@@ -122,8 +127,9 @@ function generateChildRouters (data) {
         title: item.text,
         icon: item.icon,
         url: item.url,
-        // permissionList:"",
+        componentName:componentName,
-        // keepAlive:"",
+        keepAlive: true
+        // permissionList:""
       }
     }
     if (item.children && item.children.length > 0) {