From 63fa0d5e25fe8b82c0daccaf05d22bc49d7a04ac Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Thu, 16 May 2019 16:00:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20picker=E3=80=81pick?=
 =?UTF-8?q?er-view=20=E7=BB=84=E4=BB=B6=E6=BB=9A=E5=8A=A8=E5=81=9C?=
 =?UTF-8?q?=E6=AD=A2=E8=BF=87=E6=85=A2=E7=9A=84=E9=97=AE=E9=A2=98=20fixed?=
 =?UTF-8?q?=20#278=20fixed=20#367?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/view/components/picker-view-column/index.vue | 4 ++++
 src/core/view/mixins/scroller/Scroll.js               | 6 +++---
 src/core/view/mixins/scroller/Scroller.js             | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/core/view/components/picker-view-column/index.vue b/src/core/view/components/picker-view-column/index.vue
index 117850a95..f6791bbb0 100644
--- a/src/core/view/components/picker-view-column/index.vue
+++ b/src/core/view/components/picker-view-column/index.vue
@@ -1,6 +1,8 @@
 <script>
 import touchtrack from 'uni-mixins/touchtrack'
 import scroller from 'uni-mixins/scroller/index'
+import { Friction } from 'uni-mixins/scroller/Friction'
+import { Spring } from 'uni-mixins/scroller/Spring'
 
 export default {
   name: 'PickerViewColumn',
@@ -108,6 +110,8 @@ export default {
         enableX: false,
         enableSnap: true,
         itemSize: this.indicatorHeight,
+        friction: new Friction(0.0001),
+        spring: new Spring(2, 90, 20),
         onSnap: (index) => {
           if ((!isNaN(index)) && index !== this.current) {
             this.current = index
diff --git a/src/core/view/mixins/scroller/Scroll.js b/src/core/view/mixins/scroller/Scroll.js
index 80f9e3f37..adcf16bc8 100644
--- a/src/core/view/mixins/scroller/Scroll.js
+++ b/src/core/view/mixins/scroller/Scroll.js
@@ -1,10 +1,10 @@
 import { Friction } from './Friction'
 import { Spring } from './Spring'
 
-export function Scroll (extent) {
+export function Scroll (extent, friction, spring) {
   this._extent = extent
-  this._friction = new Friction(0.01)
-  this._spring = new Spring(1, 90, 20)
+  this._friction = friction || new Friction(0.01)
+  this._spring = spring || new Spring(1, 90, 20)
   this._startTime = 0
   this._springing = false
   this._springOffset = 0
diff --git a/src/core/view/mixins/scroller/Scroller.js b/src/core/view/mixins/scroller/Scroller.js
index e68d59dad..eeca0e0cc 100644
--- a/src/core/view/mixins/scroller/Scroller.js
+++ b/src/core/view/mixins/scroller/Scroller.js
@@ -53,7 +53,7 @@ export function Scroller (element, options) {
   }
 
   this._position = 0
-  this._scroll = new Scroll(this._extent)
+  this._scroll = new Scroll(this._extent, options.friction, options.spring)
   this._onTransitionEnd = this.onTransitionEnd.bind(this)
   this.updatePosition()
 }
-- 
GitLab