From 4914304cd19f2c186afa274e9153d45dde622803 Mon Sep 17 00:00:00 2001
From: ustbhuangyi <280309453@qq.com>
Date: Tue, 28 Nov 2017 17:32:19 +0800
Subject: [PATCH] scroll.vue add options prop which is totally match the
 better-scroll options

---
 example/pages/scroll.vue         | 12 +++++--
 src/components/scroll/scroll.vue | 55 ++++++++++++++++----------------
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/example/pages/scroll.vue b/example/pages/scroll.vue
index 284f5314..ee12224b 100644
--- a/example/pages/scroll.vue
+++ b/example/pages/scroll.vue
@@ -46,9 +46,7 @@
           <cube-scroll
               ref="scroll"
               :data="items"
-              :scrollbar="scrollbarObj"
-              :pull-down-refresh="pullDownRefreshObj"
-              :pull-up-load="pullUpLoadObj"
+              :options="scrollOptions"
               @pulling-down="onPullingDown"
               @pulling-up="onPullingUp">
             <template v-if="customPullDown" slot="pulldown" slot-scope="props">
@@ -188,6 +186,13 @@
       }
     },
     computed: {
+      scrollOptions() {
+        return {
+          pullDownRefresh: this.pullDownRefreshObj,
+          pullUpLoad: this.pullUpLoadObj,
+          scrollbar: this.scrollbarObj
+        }
+      },
       scrollbarObj: function () {
         return this.scrollbar ? {fade: this.scrollbarFade} : false
       },
@@ -311,6 +316,7 @@
           color: #666
           &.rotate
             transform: rotate(180deg)
+
   .scroll-list-wrap
     position relative
     height: 480px
diff --git a/src/components/scroll/scroll.vue b/src/components/scroll/scroll.vue
index a4d6bdc8..9f79fa2d 100644
--- a/src/components/scroll/scroll.vue
+++ b/src/components/scroll/scroll.vue
@@ -58,6 +58,14 @@
   const EVENT_PULLING_DOWN = 'pulling-down'
   const EVENT_PULLING_UP = 'pulling-up'
 
+  const DEFAULT_OPTIONS = {
+    click: true,
+    probeType: 1,
+    scrollbar: false,
+    pullDownRefresh: false,
+    pullUpLoad: false
+  }
+
   export default {
     name: COMPONENT_NAME,
     props: {
@@ -67,13 +75,11 @@
           return []
         }
       },
-      probeType: {
-        type: Number,
-        default: 1
-      },
-      click: {
-        type: Boolean,
-        default: true
+      options: {
+        type: Object,
+        default() {
+          return {}
+        }
       },
       listenScroll: {
         type: Boolean,
@@ -87,15 +93,6 @@
         type: String,
         default: DIRECTION_V
       },
-      scrollbar: {
-        default: false
-      },
-      pullDownRefresh: {
-        default: false
-      },
-      pullUpLoad: {
-        default: false
-      },
       refreshDelay: {
         type: Number,
         default: 20
@@ -113,14 +110,22 @@
       }
     },
     computed: {
+      pullUpLoad() {
+        return this.options.pullUpLoad
+      },
+      pullDownRefresh() {
+        return this.options.pullDownRefresh
+      },
       pullUpTxt() {
-        const moreTxt = this.pullUpLoad && this.pullUpLoad.txt && this.pullUpLoad.txt.more || DEFAULT_LOAD_TXT_MORE
-        const noMoreTxt = this.pullUpLoad && this.pullUpLoad.txt && this.pullUpLoad.txt.noMore || DEFAULT_LOAD_TXT_NO_MORE
+        const pullUpLoad = this.pullUpLoad
+        const moreTxt = pullUpLoad && pullUpLoad.txt && pullUpLoad.txt.more || DEFAULT_LOAD_TXT_MORE
+        const noMoreTxt = pullUpLoad && pullUpLoad.txt && pullUpLoad.txt.noMore || DEFAULT_LOAD_TXT_NO_MORE
 
         return this.pullUpDirty ? moreTxt : noMoreTxt
       },
       refreshTxt() {
-        return this.pullDownRefresh && this.pullDownRefresh.txt || DEFAULT_REFRESH_TXT
+        const pullDownRefresh = this.pullDownRefresh
+        return pullDownRefresh && pullDownRefresh.txt || DEFAULT_REFRESH_TXT
       }
     },
     created() {
@@ -140,15 +145,10 @@
           this.$refs.list.style.minHeight = `${getRect(this.$refs.wrapper).height + 1}px`
         }
 
-        let options = {
-          probeType: this.probeType,
-          click: this.click,
+        let options = Object.assign({}, DEFAULT_OPTIONS, {
           scrollY: this.direction === DIRECTION_V,
-          scrollX: this.direction === DIRECTION_H,
-          scrollbar: this.scrollbar,
-          pullDownRefresh: this.pullDownRefresh,
-          pullUpLoad: this.pullUpLoad
-        }
+          scrollX: this.direction === DIRECTION_H
+        }, this.options)
 
         this.scroll = new BScroll(this.$refs.wrapper, options)
 
@@ -297,6 +297,7 @@
     position: relative
     z-index: 1
     background-color: $scroll-content-bgc
+
   .cube-scroll-item
     height: 60px
     line-height: 60px
-- 
GitLab