@dolphinweex/weex-vue-render 0.2.106 → 0.2.108

package/dist/index.common.js

@@ -10,7 +10,16 @@ console.log('START WEEX VUE RENDER: 1.0.36, Build 2018-12-29 17:52.');
 
 // 记录当前已经添加过的字体
 const AddedRules = {}
-
+// localStorage.setItem('weexVueRenderLog',true) 开启日志
+function __renderLog(title,log){
+  try{
+    if(localStorage && localStorage.getItem('weexVueRenderLog')){
+        console.log('[weexVueRender]' + title + ': ' + JSON.stringify(log) + ' ' + console.trace());
+    }
+  }catch(e){
+      console.error(`${JSON.stringify(e)}`)
+  }
+}
 function __$styleInject(css, returnValue) {
   if (typeof document === 'undefined') {
     return returnValue;
@@ -2767,7 +2776,7 @@ function init$1 (viewportWidth) {
             deviceWidth: screenWidth * dpr,
             deviceHeight: screenHeight * dpr
           });
-          console.log('[px2rem] poll@' + label + ' applied: fontSize=' + doc.documentElement.style.fontSize + ', scale=' + newScale);
+          __renderLog('[px2rem] poll@' + label + ' applied: fontSize=' + doc.documentElement.style.fontSize + ', scale=' + newScale);
         }
       }, delay);
     };
@@ -5267,14 +5276,27 @@ var inputCommon = {
   },
   
   methods: {
+    /**
+     * 将当前输入框滚动到可视区域中间
+     */
+    scrollIntoViewCenter: function scrollIntoViewCenter () {
+      var el = this.$el;
+      if (!el || typeof el.scrollIntoView !== 'function') { return }
+      setTimeout(function () {
+        el.scrollIntoView({ block: 'center', inline: 'nearest', behavior: 'smooth' });
+      }, 50);
+    },
+
     focus: function focus (autofocus) {
+      var this$1 = this;
       // 当是自动聚焦时才需要主动弹出键盘，否则会导致键盘弹出但是组件失去焦点
       if (autofocus) {
         this.$el && weex.requireModule('bridgeModule').commandInterface(JSON.stringify({ operation: 'showKeyboard'}))
       }
       //dom可能没有被获取到，延迟触发
-      setTimeout(() => {
-        this.$el && this.$el.focus();
+      setTimeout(function () {
+        this$1.$el && this$1.$el.focus();
+        this$1.scrollIntoViewCenter();
       }, 200);
     },
     blur: function blur () {
@@ -5312,6 +5334,13 @@ var inputCommon = {
 
     // support enter key event
     createKeyboardEvent: function createKeyboardEvent (events) {
+      var this$1 = this;
+      // 用户点击聚焦时，同样滚动到页面中间
+      var originFocus = events.focus;
+      events.focus = function (ev) {
+        this$1.scrollIntoViewCenter();
+        originFocus && originFocus.call(this, ev);
+      };
       var customKeyType = this.returnKeyType;
       if (customKeyType) {
         var keyboardEvents = {
@@ -8233,13 +8262,24 @@ var slideMixin = {
     _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;
+      __renderLog('[weex-slider] _slideTo enter', {
+        index: index,
+        isTouchScroll: isTouchScroll,
+        currentIndex: this.currentIndex,
+        preIndex: this._preIndex,
+        sliding: this._sliding,
+        inited: this._inited,
+        frameCount: this.frameCount
+      });
       if (this.frameCount <= 0) {
+        __renderLog('[weex-slider] _slideTo return: frameCount<=0');
         return;
       }
       //一张图片无需滚动操作
       if (this.frameCount <= 1) {
         this.currentIndex = 0;
         this._preIndex = 0;
+        __renderLog('[weex-slider] _slideTo return: frameCount<=1');
         return;
       }
       // 非无限轮播的边界处理
@@ -8255,6 +8295,7 @@ var slideMixin = {
       }
   
       if (this._sliding) {
+        __renderLog('[weex-slider] _slideTo return: already sliding');
         return;
       }
       this._sliding = true;
@@ -8374,14 +8415,19 @@ var slideMixin = {
         }, TRANSITION_TIME);
       }
   
-      if (index !== this._preIndex) {
+      // 先同步内部 index，再派发 change，避免外部 :index 回写再次 _slideTo 闪动
+      var prevIndex = this._preIndex;
+      this.currentIndex = index;
+      this._preIndex = index;
+      __renderLog('[weex-slider] _slideTo sync index before change', {
+        prevIndex: prevIndex,
+        index: index
+      });
+      if (index !== prevIndex) {
         weex.utils.dispatchNativeEvent(this.$el, 'change', {
           index: index
         });
       }
-  
-      this.currentIndex = index;
-      this._preIndex = index;
     },
     // 优化_prepareNodes方法以支持无缝切换
     _prepareNodes: function _prepareNodes() {
@@ -8794,6 +8840,11 @@ var slideMixin = {
       this._clearNodes(2, this._showEndIdx);
       this._showEndIdx = 1;
       this._sliding = false;
+      __renderLog('[weex-slider] _rearrangeNodes clear sliding', {
+        newIndex: newIndex,
+        currentIndex: this.currentIndex,
+        preIndex: this._preIndex
+      });
 
       // set current index to the new index.
       this.currentIndex = newIndex;
@@ -8861,13 +8912,34 @@ var slideMixin = {
         }
       }
       if (!this.scrollable || this.frameCount<=1) {
+        __renderLog('[weex-slider] _handleTouchStart return: not scrollable', {
+          scrollable: this.scrollable,
+          frameCount: this.frameCount
+        });
         return // 🚫 禁止滚动行为
       }
       if(weex.weexSliderTouchStart && !weex.weexSliderTouchBoundary){
+        __renderLog('[weex-slider] _handleTouchStart return: another slider touching');
         return
       }
+      // _sliding 卡住时会导致完全划不动，这里兜底释放
+      if (this._sliding) {
+        __renderLog('[weex-slider] _handleTouchStart force clear stuck _sliding');
+        this._sliding = false;
+        var stuckInner = this.$refs.inner;
+        if (stuckInner) {
+          stuckInner.style.transition = 'none';
+        }
+      }
       weex.weexSliderTouchStart = true
 
+      __renderLog('[weex-slider] _handleTouchStart', {
+        currentIndex: this.currentIndex,
+        preIndex: this._preIndex,
+        sliding: this._sliding,
+        frameCount: this.frameCount
+      });
+
       // 重置velocity相关变量
       this.lastMoveTime = Date.now();
       this.lastMovePosition = event.touches[0].pageX;
@@ -8907,6 +8979,9 @@ var slideMixin = {
     _handleTouchMove: function _handleTouchMove (event) {
       var tp = this._touchParams;
       if (!tp || !this.scrollable || this.frameCount<=1 || this._sliding) {
+        if (this._sliding) {
+          __renderLog('[weex-slider] _handleTouchMove blocked by _sliding');
+        }
         return // 🚫 禁止滚动行为
       }
   
@@ -9059,13 +9134,22 @@ var slideMixin = {
       if (touchSliderInstance == inner) {
         touchSliderInstance= null;
       } else {
+        __renderLog('[weex-slider] _handleTouchEnd return: not active touchSliderInstance', {
+          hasInner: !!inner,
+          sliding: this._sliding,
+          currentIndex: this.currentIndex
+        });
         return;
       }
 
       var tp = this._touchParams;
-      if (!tp) { return }
+      if (!tp) {
+        __renderLog('[weex-slider] _handleTouchEnd return: no _touchParams');
+        return
+      }
       var isV = tp.isVertical;
       if (typeof isV === 'undefined' || isV) {
+        __renderLog('[weex-slider] _handleTouchEnd return: vertical or unset', { isV: isV });
         return
       }
  
@@ -9099,6 +9183,16 @@ var slideMixin = {
           if (newIndex < 0) newIndex = 0;
           if (newIndex >= this.frameCount) newIndex = this.frameCount - 1;
         }
+        __renderLog('[weex-slider] _handleTouchEnd', {
+          offsetX: offsetX,
+          moveRatio: moveRatio,
+          shouldSwitch: shouldSwitch,
+          newIndex: newIndex,
+          currentIndex: this.currentIndex,
+          preIndex: this._preIndex,
+          sliding: this._sliding,
+          animationDuration: animationDuration
+        });
         
         // 如果是复位操作（没有切换页面），使用更平滑的动画
         if (newIndex === this.currentIndex) {
@@ -9152,6 +9246,15 @@ var slideMixin = {
      // 平滑切换到目标页面
      _smoothSlideTo: function _smoothSlideTo(newIndex, duration, moveRatio) {
        var this$1 = this;
+       __renderLog('[weex-slider] _smoothSlideTo enter', {
+         newIndex: newIndex,
+         duration: duration,
+         moveRatio: moveRatio,
+         currentIndex: this.currentIndex,
+         preIndex: this._preIndex,
+         sliding: this._sliding,
+         frameCount: this.frameCount
+       });
        
        if (this.frameCount <= 0) return;
        if (this.frameCount <= 1) {
@@ -9168,7 +9271,10 @@ var slideMixin = {
          }
        }
        
-       if (this._sliding) return;
+       if (this._sliding) {
+         __renderLog('[weex-slider] _smoothSlideTo return: already sliding (stuck?)');
+         return;
+       }
        this._sliding = true;
        
        var inner = this.$refs.inner;
@@ -9287,15 +9393,21 @@ var slideMixin = {
          
          this$1._sliding = false;
          
-         // 触发change事件 - 在设置currentIndex之前比较
-         if (newIndex !== this$1._preIndex) {
+         // 先同步内部 index，再派发 change，避免外部 :index 回写触发 watch→_slideTo 闪动
+         var prevIndex = this$1._preIndex;
+         this$1.currentIndex = newIndex;
+         this$1._preIndex = newIndex;
+         __renderLog('[weex-slider] _smoothSlideTo done, sync before change', {
+           prevIndex: prevIndex,
+           newIndex: newIndex,
+           sliding: this$1._sliding
+         });
+         if (newIndex !== prevIndex) {
            weex.utils.dispatchNativeEvent(this$1.$el, 'change', {
              index: newIndex
            });
          }
          
-         this$1.currentIndex = newIndex;
-         this$1._preIndex = newIndex;
          this$1._emitScrollEvent('scrollend');
       }, duration * 1000);
      },
@@ -9390,18 +9502,31 @@ var slider$1 = {
 
   watch: {
     index: function index () {
-      this.currentIndex = this._normalizeIndex(this.index);
-          this.currentIndex = this._normalizeIndex(this.index);
-          // 如果正在滑动，强制打断并重置状态
-          if (this._sliding) {
-            var inner = this.$refs.inner;
-            if (inner) {
-              inner.style.transition = 'none';
-            }
-            this._sliding = false;
-          }
-          this._slideTo(this.currentIndex);
+      var normalized = this._normalizeIndex(this.index);
+      __renderLog('[weex-slider] watch index', {
+        propIndex: this.index,
+        normalized: normalized,
+        currentIndex: this.currentIndex,
+        preIndex: this._preIndex,
+        sliding: this._sliding
+      });
+      // 已与内部状态一致：手势/内部 change 回写，跳过二次 _slideTo
+      if (normalized === Number(this.currentIndex) && normalized === Number(this._preIndex)) {
+        __renderLog('[weex-slider] watch index skip: already at target');
+        return;
+      }
+      this.currentIndex = normalized;
+      // 如果正在滑动，强制打断并重置状态（仅外部真正切到不同页时）
+      if (this._sliding) {
+        __renderLog('[weex-slider] watch index interrupt sliding');
+        var inner = this.$refs.inner;
+        if (inner) {
+          inner.style.transition = 'none';
         }
+        this._sliding = false;
+      }
+      this._slideTo(this.currentIndex);
+    }
   },
 
   data: function data () {
@@ -11492,7 +11617,7 @@ var dom = {
   addRule: function (key, styles) {
     const rule_key = styles["fontFamily"] + styles["src"]
     if (AddedRules[rule_key]) {
-      console.log("已经添加过字体了，无需再添加", styles.src)
+      __renderLog("已经添加过字体了，无需再添加", styles.src)
       return
     }
 

package/package.json

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