@dolphinweex/weex-vue-render 0.2.112 → 0.2.114

package/dist/index.common.js

@@ -5165,13 +5165,9 @@ var style = {
           return weex.utils.px2rem($0, rootValue)
         })
       }
-      if (typeof value === 'number') {
-        if (bindingStyleNamesForNumber2Px.indexOf(propKey) > -1) {
-          const scale = weex.config.env.scale
-          return (scale * value) + 'px'; 
-        }else{
-          return weex.utils.px2rem(value + '', rootValue)
-        }
+        if (typeof value === 'number') {
+        // 没单位的数字按设计稿 px 转 rem  pad旋转会动态计算 
+        return weex.utils.px2rem(value + '', rootValue)
       }
       // 辅助函数：将kebab-case转换为camelCase
       const kebabToCamel = (str) => {
@@ -8912,6 +8908,9 @@ var slideMixin = {
           return
         }
       }
+      if (weex.sliderChange) {
+        return
+      }
       if (!this.scrollable || this.frameCount<=1) {
         __renderLog('[weex-slider] _handleTouchStart return: not scrollable', {
           scrollable: this.scrollable,
@@ -8978,6 +8977,13 @@ var slideMixin = {
       }
     },
     _handleTouchMove: function _handleTouchMove (event) {
+      if (weex.sliderChange) {
+        // 手势中途被打断时清掉起点，避免 flag 恢复后按旧 startX 改 left
+        if (this._touchParams) {
+          delete this._touchParams
+        }
+        return
+      }
       var tp = this._touchParams;
       if (!tp || !this.scrollable || this.frameCount<=1 || this._sliding) {
         if (this._sliding) {
@@ -11310,9 +11316,14 @@ function transitionOnce (vnode, config, callback) {
     dom && weex.utils.fireLazyload(dom, true);
   
     var ended = false;
+    var eventFinishTimer = null;
     var cleanup = function () {
       if (ended) { return }
       ended = true;
+      if (eventFinishTimer) {
+        clearTimeout(eventFinishTimer);
+        eventFinishTimer = null;
+      }
       if (endEvent) {
         dom.removeEventListener(endEvent, transitionEndHandler);
       }
@@ -11320,14 +11331,26 @@ function transitionOnce (vnode, config, callback) {
         dom.style[styleName] = '';
       }
     };
-    var transitionEndHandler = function (event) {
-      event && event.stopPropagation();
+    var finish = function () {
+      if (ended) { return }
       clearTimeout(timerId);
       cleanup();
-      setTimeout(()=>{
-        callback && callback(); // 兼容嵌套动画
-      })
+      callback && callback();
+    };
+    var transitionEndHandler = function (event) {
+      event && event.stopPropagation();
+      // transitionend 会针对 opacity、transform 等属性分别触发。
+      // 只处理当前节点，并等配置时长结束及最后一个属性事件稳定后再回调。
+      if (!event || event.target !== dom || ended) { return }
+      if (eventFinishTimer) {
+        clearTimeout(eventFinishTimer);
+      }
+      var remaining = Math.max(0, duration + delay - (Date.now() - startTime));
+      eventFinishTimer = setTimeout(function () {
+        finish();
+      }, remaining + 16);
     };
+    var startTime = Date.now();
     if (endEvent) {
       dom.style[styleName] = transitionValue;
       dom.addEventListener(endEvent, transitionEndHandler);
@@ -11335,8 +11358,7 @@ function transitionOnce (vnode, config, callback) {
     var totalMs = (duration + delay) + 60; // 兜底计时器，避免不触发 transitionend 时卡死
     var timerId = setTimeout(function () {
       if (ended) { return }
-      cleanup();
-      callback && callback();
+      finish();
     }, totalMs);
     nextFrame(function () {
       // 修改 transform：translate让它支持传3个参数，且第三个参数无效

package/package.json

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