refactor(view): add keepAlive check

vuejs · Jan 14, 2020 · 97bedf2 · 97bedf2
1 parent e6cb3d0
commit 97bedf2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/components/view.js b/src/components/view.js
@@ -26,10 +26,11 @@ export default {
     let depth = 0
     let inactive = false
     while (parent && parent._routerRoot !== parent) {
-      if (parent.$vnode && parent.$vnode.data.routerView) {
+      const vnodeData = parent.$vnode ? parent.$vnode.data : {}
+      if (vnodeData.routerView) {
         depth++
       }
-      if (parent._directInactive && parent._inactive) {
+      if (vnodeData.keepAlive && parent._directInactive && parent._inactive) {
         inactive = true
       }
       parent = parent.$parent