支持 router-view 的 keep alive 模式

lihuakkk · Aug 24, 2017 · 85c05e3 · 85c05e3
1 parent 49f3e7f
commit 85c05e3
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 88 deletions.
diff --git a/demo/App.vue b/demo/App.vue
@@ -1,5 +1,7 @@
 <template>
   <div id="app">
-    <router-view></router-view>
+    <keep-alive>
+      <router-view></router-view>
+    </keep-alive>
   </div>
 </template>
diff --git a/demo/components/Index.vue b/demo/components/Index.vue
@@ -40,11 +40,6 @@
         陈妍希
         <img src="../assets/arrow-right.png" class="arrow-right">
       </router-link>
-
-      <router-link class="row" tag="label" to="/keepAlive">
-        Keep Alive
-        <img src="../assets/arrow-right.png" class="arrow-right">
-      </router-link>
     </scroller>
 
     <!-- github corner -->

diff --git a/demo/components/KeepAlive.vue b/demo/components/KeepAlive.vue
diff --git a/demo/components/RefreshAndInfinite.vue b/demo/components/RefreshAndInfinite.vue
@@ -54,6 +54,8 @@
       },
 
       infinite(done) {
+        console.log('infinite called..')
+        
         setTimeout(() => {
           let start = this.bottom + 1
 

diff --git a/demo/main.js b/demo/main.js
@@ -18,7 +18,6 @@ import LoadMoreAndNoData from './components/LoadMoreAndNoData.vue'
 import Snapping from './components/Snapping.vue'
 import CustomSpinner from './components/CustomSpinner.vue'
 import NoContent from './components/NoContent.vue'
-import KeepAlive from './components/KeepAlive.vue'
 import LoadMoreAndNoData2 from './components/LoadMoreAndNoData2.vue'
 
 const routes = [
@@ -31,7 +30,6 @@ const routes = [
   { path: '/loadMoreAndNoData', component: LoadMoreAndNoData },
   { path: '/snapping', component: Snapping },
   { path: '/noContent', component: NoContent },
-  { path: '/keepAlive', component: KeepAlive },
   { path: '/loadMoreAndNoData2', component: LoadMoreAndNoData2 }
 ]
 

diff --git a/src/components/Scroller.vue b/src/components/Scroller.vue
@@ -297,7 +297,7 @@
       }
     },
 
-    mounted() {
+    activated () {
       this.container = document.getElementById(this.containerId)
       this.container.style.width = this.w
       this.container.style.height = this.h
@@ -385,7 +385,7 @@
       }, 10);
     },
 
-    destroyed() {
+    deactivated () {
       clearInterval(this.resizeTimer);
       if (this.infiniteTimer) clearInterval(this.infiniteTimer);
     },