Pre Merge pull request !456 from smallwei/master

ruoyi-ui/src/cache.js

@@ -0,0 +1,31 @@
+import Vue from 'vue'
+import store from './store'
+Vue.mixin({
+  beforeRouteLeave: function (to, from, next) {
+    let list = store.state.tagsView.visitedViews
+    if (this.$vnode) {
+      if (this.$vnode.parent && this.$vnode.parent.componentInstance && this.$vnode.parent.componentInstance.cache) {
+        if (this.$vnode.componentOptions) {
+          var cache = this.$vnode.parent.componentInstance.cache;
+          var keys = this.$vnode.parent.componentInstance.keys;
+          keys.forEach(key => {
+            let t = {}
+            let i = list.findIndex(tag => {
+              if (key.indexOf(tag.path) !== -1) {
+                t = tag;
+                return true;
+              }
+              return false;
+            })
+            let meta = t.meta || {}
+            if (i == -1 || meta.noCache == true) {
+              keys.splice(i, 1);
+              delete cache[key];
+            }
+          })
+        }
+      }
+    }
+    next();
+  }
+})

ruoyi-ui/src/layout/components/AppMain.vue

@@ -1,7 +1,8 @@
 <template>
   <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
+    <transition name="fade-transform"
-      <keep-alive :include="cachedViews">
+                mode="out-in">
+      <keep-alive>
         <router-view :key="key" />
       </keep-alive>
     </transition>
@@ -12,10 +13,7 @@
 export default {
   name: 'AppMain',
   computed: {
-    cachedViews() {
+    key () {
-      return this.$store.state.tagsView.cachedViews
-    },
-    key() {
       return this.$route.path
     }
   }
@@ -31,7 +29,7 @@ export default {
   overflow: hidden;
 }
 
-.fixed-header+.app-main {
+.fixed-header + .app-main {
   padding-top: 50px;
 }
 
@@ -41,7 +39,7 @@ export default {
     min-height: calc(100vh - 84px);
   }
 
-  .fixed-header+.app-main {
+  .fixed-header + .app-main {
     padding-top: 84px;
   }
 }

ruoyi-ui/src/main.js

@@ -4,7 +4,7 @@ import Cookies from 'js-cookie'
 
 import Element from 'element-ui'
 import './assets/styles/element-variables.scss'
-
+import './cache.js'
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
 import App from './App'