@dolphinweex/weex-vue-render 0.2.42 → 0.2.44

package/dist/index.common.js

@@ -1547,7 +1547,7 @@ function calc(x1, y1, x2, y2, x3, y3, x4, y4) {
  * @event
  * @param  {event} event
  */
-function touchstartHandler(event) {
+const touchstartHandler = throttle(function touchstartHandler(event) {
 
   if (Object.keys(gestures).length === 0) {
     docEl.addEventListener('touchmove', touchmoveHandler, true);
@@ -1603,7 +1603,7 @@ function touchstartHandler(event) {
       touchEvent: event
     });
   }
-}
+},300,true)
 
 /**
  * take over touchmove events, and handle pan and dual related gestures.
@@ -7180,6 +7180,9 @@ function getRefresh (weex) {
     },
     methods: {
       pulling: function pulling (offsetY) {
+        if(weex.sliderHorizontalScrolling){//轮播图滚动中不允许触发
+          return
+        }
         if ( offsetY === void 0 ) offsetY = 0;
 
         this.height = offsetY;
@@ -7737,7 +7740,8 @@ var slideMixin = {
       }
     },
 
-    _slideTo: function _slideTo(index, isTouchScroll) {
+    _slideTo: function _slideTo(index, isTouchScroll, transtionTime = null) {
+      let slideTranstionTime = this.isTransform ? `transform ${transtionTime || TRANSITION_TIME / 1600}s ease-out` : `left ${transtionTime || TRANSITION_TIME / 1600}s ease-out`
       var this$1 = this;
       if (this.frameCount <= 0) {
         return;
@@ -7785,7 +7789,7 @@ var slideMixin = {
             lastNode.style.zIndex = '10';
             
             // 执行向左滑动动画
-            inner.style.transition = this.isTransform ? `transform ${TRANSITION_TIME / 1000}s ease-in-out` : `left ${TRANSITION_TIME / 1000}s ease-in-out`;
+            inner.style.transition = slideTranstionTime;
             this.innerOffset += this._wrapperWidth;
             this._setPosition(inner, this.innerOffset);
   
@@ -7798,7 +7802,7 @@ var slideMixin = {
               this._setPosition(inner, this.innerOffset);
   
               setTimeout(() => {
-                inner.style.transition = this.isTransform ? `transform ${TRANSITION_TIME / 1000}s ease-in-out` : `left ${TRANSITION_TIME / 1000}s ease-in-out`;
+                inner.style.transition = slideTranstionTime;
               }, 50);
             }, TRANSITION_TIME);
   
@@ -7814,7 +7818,7 @@ var slideMixin = {
             inner.appendChild(cloneNode);
   
             // 执行向右滑动动画
-            inner.style.transition = this.isTransform ? `transform ${TRANSITION_TIME / 1000}s ease-in-out` : `left ${TRANSITION_TIME / 1000}s ease-in-out`;
+            inner.style.transition = slideTranstionTime;
             this.innerOffset -= this._wrapperWidth;
             this._setPosition(inner, this.innerOffset);
   
@@ -7830,7 +7834,7 @@ var slideMixin = {
               this._setPosition(inner, 0);
   
               setTimeout(() => {
-                inner.style.transition = this.isTransform ? `transform ${TRANSITION_TIME / 1000}s ease-in-out` : `left ${TRANSITION_TIME / 1000}s ease-in-out`;
+                inner.style.transition = slideTranstionTime;
               }, 50);
             }, TRANSITION_TIME);
   
@@ -7838,13 +7842,13 @@ var slideMixin = {
           } else {
             // 正常切换
             this.innerOffset = -index * this._wrapperWidth;
-            inner.style.transition = this.isTransform ? `transform ${TRANSITION_TIME / 1000}s ease-in-out` : `left ${TRANSITION_TIME / 1000}s ease-in-out`;
+            inner.style.transition = slideTranstionTime;
             this._setPosition(inner, this.innerOffset);
           }
         } else {
           // 非无限轮播的正常切换
           this.innerOffset = -index * this._wrapperWidth;
-          inner.style.transition = this.isTransform ? `transform ${TRANSITION_TIME / 1000}s ease-in-out` : `left ${TRANSITION_TIME / 1000}s ease-in-out`;
+          inner.style.transition = slideTranstionTime;
           this._setPosition(inner, this.innerOffset);
         }
   
@@ -8259,6 +8263,8 @@ var slideMixin = {
       if (!this.scrollable || this.frameCount<=1) {
         return // 🚫 禁止滚动行为
       }
+      this.lastMoveTime = Date.now();
+      this.lastMovePosition = event.touches[0].pageX;
       var touch = event.changedTouches[0];
       this._stopAutoPlay();
       var inner = this.$refs.inner;
@@ -8306,11 +8312,26 @@ var slideMixin = {
       var offsetY = touch.pageY - startY;
       tp.offsetX = offsetX;
       tp.offsetY = offsetY;
+
+      const now = Date.now();
+      const deltaTime = now - this.lastMoveTime;
+      const deltaX = Math.abs(event.touches[0].pageX - this.lastMovePosition);
+      if (deltaTime > 0) {
+        this.velocity = deltaX / deltaTime; // 像素/毫秒
+        // 计算动画时间，速度越大动画时间越短
+        const baseTime = TRANSITION_TIME / 1000; // 基准时间
+        const minTime = 0.1; // 最小动画时间（秒）
+        this.transitionDuration = Math.max(minTime, baseTime / (this.velocity + 1));
+      }
+      
+      this.lastMoveTime = now;
+      this.lastMovePosition = event.touches[0].pageX;
       var isV = tp.isVertical;
       if (typeof isV === 'undefined') {
         isV = tp.isVertical = Math.abs(offsetX) < Math.abs(offsetY);
         if (!isV) {
           this._emitScrollEvent('scrollstart');
+          weex.sliderHorizontalScrolling = true;
         }
       }
       // vertical scroll. just ignore it.
@@ -8393,6 +8414,7 @@ var slideMixin = {
     },
 
     _handleTouchEnd: function _handleTouchEnd (event) {
+      weex.sliderHorizontalScrolling = false;
       var inner = this.$refs.inner;
       if (touchSliderInstance == inner) {
         touchSliderInstance= null;
@@ -8422,6 +8444,7 @@ var slideMixin = {
     },
 
     _handleTouchCancel: function _handleTouchCancel (event) {
+      weex.sliderHorizontalScrolling = false;
       var inner = this.$refs.inner;
       if (touchSliderInstance == inner) {
         touchSliderInstance= null;

package/package.json

@@ -49,5 +49,5 @@
     "type": "git",
     "url": "git+ssh://git@github.com/weexteam/weex-vue-render.git"
   },
-  "version": "0.2.42"
+  "version": "0.2.44"
 }