Browse Source

fix:修复scroll组件 vertical-scroll 模式 不能设置动画的执行时间

richard1015 6 years ago
parent
commit
38c0c206ca

+ 2 - 1
src/packages/scroller/demo.vue

@@ -36,6 +36,7 @@
                 :is-un-more="isUnMore1" 
                 :is-un-more="isUnMore1" 
                 :is-loading="isLoading1"
                 :is-loading="isLoading1"
                 :type="'vertical'"
                 :type="'vertical'"
+                :propsTime="0"
                 @loadMore="loadMoreVert"
                 @loadMore="loadMoreVert"
                 @pulldown="pulldown"
                 @pulldown="pulldown"
             > 
             > 
@@ -121,7 +122,7 @@ export default {
                 this.isUnMore1 = false;
                 this.isUnMore1 = false;
                 this.listData1 = new Array(20);
                 this.listData1 = new Array(20);
                 this.page1 = 2;
                 this.page1 = 2;
-            }, 300);
+            }, 3000);
         },
         },
 
 
 
 

+ 2 - 1
src/packages/scroller/doc.md

@@ -123,7 +123,7 @@ export default {
                 this.isUnMore1 = false;
                 this.isUnMore1 = false;
                 this.listData1 = new Array(20);
                 this.listData1 = new Array(20);
                 this.page1 = 2;
                 this.page1 = 2;
-            }, 300);
+            }, 3000);
         },
         },
 
 
 
 
@@ -169,6 +169,7 @@ export default {
 | stretch | 拉伸范围 | Number | 100
 | stretch | 拉伸范围 | Number | 100
 | isUnMore | 是否没有更多 | Boolean | false
 | isUnMore | 是否没有更多 | Boolean | false
 | isLoading | 是否正在加载 | Boolean | false
 | isLoading | 是否正在加载 | Boolean | false
+| propsTime | type=vertical时,加载成功后pulldownTxt停留时间,单位为 ms | Number | 0
 | threshold | 距离底部多少开始加载 | Number | 100
 | threshold | 距离底部多少开始加载 | Number | 100
 | pulldownTxt | 下拉展示文案 | String | '下拉刷新'
 | pulldownTxt | 下拉展示文案 | String | '下拉刷新'
 | loadMoreTxt | 上拉展示文案 | String | '上拉加载'
 | loadMoreTxt | 上拉展示文案 | String | '上拉加载'

+ 5 - 0
src/packages/scroller/scroller.vue

@@ -9,6 +9,7 @@
                 :pulldown-txt="pulldownTxt"
                 :pulldown-txt="pulldownTxt"
                 :load-more-txt="loadMoreTxt"
                 :load-more-txt="loadMoreTxt"
                 :unload-more-txt="unloadMoreTxt"
                 :unload-more-txt="unloadMoreTxt"
+                :props-time="propsTime"
                 @loadMore="loadMore"
                 @loadMore="loadMore"
                 @pulldown="pulldown"
                 @pulldown="pulldown"
             >
             >
@@ -62,6 +63,10 @@ export default {
         unloadMoreTxt: {
         unloadMoreTxt: {
             type: String,
             type: String,
             default: '没有更多了'
             default: '没有更多了'
+        },
+        propsTime: {
+            type:Number,
+            default: 0
         }
         }
     },
     },
     data() {
     data() {

+ 7 - 7
src/packages/scroller/vertical-scroll.vue

@@ -58,7 +58,7 @@ export default {
         },
         },
         propsTime: {
         propsTime: {
             type:Number,
             type:Number,
-            default: 3000
+            default: 0
         }
         }
     },
     },
     watch: {
     watch: {
@@ -146,12 +146,12 @@ export default {
                         // }, time / 2);
                         // }, time / 2);
                     }
                     }
                 }
                 }
-                if (updateMove == 50 && !this.isLoading) {
-                    clearTimeout(this.timer);
-                    this.timer = setTimeout(() => {
-                        this.setTransform(this.realMove, 'end', null);
-                    }, 3000);
-                }
+                // if (updateMove == 50 && !this.isLoading) {
+                //     clearTimeout(this.timer);
+                //     this.timer = setTimeout(() => {
+                //         this.setTransform(this.realMove, 'end', null);
+                //     }, 3000);
+                // }
                 this.setTransform(updateMove, type, time)
                 this.setTransform(updateMove, type, time)
             } else {
             } else {
                 if (updateMove > 0 && updateMove > this.stretch) {
                 if (updateMove > 0 && updateMove > this.stretch) {