@dolphinweex/weex-vue-render 0.2.41 → 0.2.43

package/dist/index.common.js

@@ -3373,8 +3373,8 @@ function watchAppear (context, fireNow) {
          * 此处延时执行是临时规避措施，后续需要优化
         */
         if (i == 0) {
-          setTimeout(() => {
-            detectAppear(el, visibleData, dir);
+        setTimeout(() => {
+          detectAppear(el, visibleData, dir);
           }, 1);
         } else {
           detectAppear(el, visibleData, dir);
@@ -6056,8 +6056,9 @@ var scrollable$1 = {
           this._loadmoreReset = false;
           var el = this.$el;
           if (el) {
-            var eventName = this.weexType === 'scroller' ? 'loadmore' : 'loading';
-            weex.utils.dispatchNativeEvent(el, eventName);
+            // 根据weex官方文档查：loading组件是loading，其余都是loadmore
+            // var eventName = this.weexType === 'scroller' ? 'loadmore' : 'loading';
+            weex.utils.dispatchNativeEvent(el, 'loadmore');
           }
         }
       }
@@ -7047,6 +7048,8 @@ function getLoading () {
     },
     watch: {
       height: function height (val) {
+        // 最大150像素
+        val = Math.min(val, 150);
         var offset = val + "px";
         this.$el.style.height = offset;
         this.$el.style.bottom = 0;
@@ -7734,7 +7737,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;
@@ -7782,7 +7786,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);
   
@@ -7795,7 +7799,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);
   
@@ -7811,7 +7815,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);
   
@@ -7827,7 +7831,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);
   
@@ -7835,13 +7839,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);
         }
   
@@ -8256,6 +8260,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;
@@ -8303,6 +8309,20 @@ 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);
@@ -8413,7 +8433,7 @@ var slideMixin = {
         var reset = Math.abs(offsetX / this._wrapperWidth) < 0.2;
         var direction = offsetX > 0 ? 1 : -1;
         var newIndex = reset ? this.currentIndex : (this.currentIndex - direction);
-        this._slideTo(newIndex, true);
+        this._slideTo(newIndex, true ,this.transitionDuration);
       }
       delete this._touchParams;
     },

package/package.json

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