@dolphinweex/weex-vue-render 0.2.105 → 0.2.107

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;
@@ -2674,11 +2683,17 @@ var info = {
 
 /**
  * set root font-size for rem units. If already been set, just skip this.
+ * 横竖屏切换时应用短边作为设计宽度：避免页面在「窗口仍横屏」时 init，把 rem 锁成 83.7（长边/10），
+ * 而正常竖屏基准应为 ~38.8；横屏布局仍沿用同一套 rem/scale。
  */
 function setRootFont (width, viewportWidth, force) {
   var doc = window.document;
-  var rem = width * 750 / viewportWidth / 10;
   if (!doc.documentElement) { return }
+  var clientW = doc.documentElement.clientWidth || width;
+  var clientH = doc.documentElement.clientHeight || width;
+  // 短边基准：与竖屏 init 对齐，横屏下也不要把 rem 放大到长边
+  var designWidth = Math.min(clientW, clientH) || width;
+  var rem = designWidth * 750 / viewportWidth / 10;
   var rootFontSize = doc.documentElement.style.fontSize;
   if (!rootFontSize || force) {
     doc.documentElement.style.fontSize = rem + 'px';
@@ -2728,11 +2743,15 @@ function init$1 (viewportWidth) {
     }
 
     dpr = info.dpr = window.devicePixelRatio;
-    screenWidth = doc.documentElement.clientWidth;
-    screenHeight = doc.documentElement.clientHeight;
-
+    // 用短边作为 rem/scale/deviceWidth 基准，避免横屏态下打开页面把 rem 锁成「长边/10」
+    var rawW = doc.documentElement.clientWidth;
+    var rawH = doc.documentElement.clientHeight;
+    screenWidth = Math.min(rawW, rawH) || rawW;
+    screenHeight = Math.max(rawW, rawH) || rawH;
     var resetDeviceHeight = function () {
-      screenHeight = doc.documentElement.clientHeight;
+      var rw = doc.documentElement.clientWidth;
+      var rh = doc.documentElement.clientHeight;
+      screenHeight = Math.max(rw, rh) || rh;
       var env = window.weex && window.weex.config.env;
       info.deviceHeight = env.deviceHeight = screenHeight * dpr;
     };
@@ -2745,11 +2764,10 @@ function init$1 (viewportWidth) {
       setTimeout(function () {
         var newWidth = doc.documentElement.clientWidth;
         var newHeight = doc.documentElement.clientHeight;
-        console.log('[px2rem] poll@' + label + ': clientWidth=' + newWidth + ' (was ' + screenWidth + ')');
-        if (newWidth > screenWidth && window.orientation === 0) {
-          console.log('[px2rem] poll@' + label + ' FIX triggered: ' + screenWidth + ' -> ' + newWidth);
-          screenWidth = newWidth;
-          screenHeight = newHeight;
+        var designW = Math.min(newWidth, newHeight) || newWidth;
+        if (designW > screenWidth && Math.abs(window.orientation || 0) !== 90) {
+          screenWidth = designW;
+          screenHeight = Math.max(newWidth, newHeight) || newHeight;
           setRootFont(screenWidth, _viewportWidthForFix, true);
           var newScale = screenWidth / _viewportWidthForFix;
           document.documentElement.style.setProperty('--harmory-density-scale', newScale);
@@ -2758,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);
     };
@@ -2801,10 +2819,18 @@ function init$1 (viewportWidth) {
  * @return new scale.
  */
 function resetViewport (viewportWidth) {
+  var doc = window.document;
+  if (doc && doc.documentElement) {
+    var rawW = doc.documentElement.clientWidth;
+    var rawH = doc.documentElement.clientHeight;
+    screenWidth = Math.min(rawW, rawH) || rawW || screenWidth;
+    screenHeight = Math.max(rawW, rawH) || rawH || screenHeight;
+  }
   setRootFont(screenWidth, viewportWidth, true);
   setMetaViewport(viewportWidth);
   var newScale = screenWidth / viewportWidth;
   info.scale = newScale;
+  document.documentElement.style.setProperty('--harmory-density-scale', newScale);
   return newScale
 }
 
@@ -8216,13 +8242,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;
       }
       // 非无限轮播的边界处理
@@ -8238,6 +8275,7 @@ var slideMixin = {
       }
   
       if (this._sliding) {
+        __renderLog('[weex-slider] _slideTo return: already sliding');
         return;
       }
       this._sliding = true;
@@ -8357,14 +8395,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() {
@@ -8777,6 +8820,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;
@@ -8844,13 +8892,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;
@@ -8890,6 +8959,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 // 🚫 禁止滚动行为
       }
   
@@ -8978,7 +9050,6 @@ var slideMixin = {
               // 第一张在列表开头，不能脱离文档流，否则会导致当前最后一张区域出现黑块。
               // 这里保留其布局位置，只做视觉位移到最右侧。
               var firstNode = this._cells[0].elm;
-              console.log('cdj-touchmove-last-to-first', { currentIndex: this.currentIndex, preIndex: this._preIndex, frameCount: this.frameCount });
               firstNode.style.position = this.isTransform ? '' : 'relative';
               this._setPosition(firstNode, this.frameCount * this._wrapperWidth);
               firstNode.style.opacity = '1';
@@ -9043,13 +9114,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
       }
  
@@ -9077,13 +9157,22 @@ var slideMixin = {
         }
         
         var newIndex = shouldSwitch ? (this.currentIndex - direction) : this.currentIndex;
-        console.log('cdj-touchend-decision', { currentIndex: this.currentIndex, preIndex: this._preIndex, newIndex: newIndex, moveRatio: moveRatio, velocity: this.velocity, shouldSwitch: shouldSwitch, duration: animationDuration });
         
         // 边界检查
         if (!this.infinite || this.infinite === 'false') {
           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) {
@@ -9137,6 +9226,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) {
@@ -9153,7 +9251,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;
@@ -9181,7 +9282,6 @@ var slideMixin = {
          if (newIndex < 0) {
            // 从第一张向右滑到最后一张
            newIndex = this.frameCount - 1;
-          console.log('cdj-smooth-boundary-first-to-last', { targetIndex: newIndex, innerOffset: this.innerOffset, wrapperWidth: this._wrapperWidth });
            lastNode = this._cells[newIndex].elm;
            lastNode.style.position = 'absolute';
            this._setPosition(lastNode, -this._wrapperWidth);
@@ -9273,15 +9373,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);
      },
@@ -9376,18 +9482,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 () {
@@ -11478,7 +11597,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.105"
+  "version": "0.2.107"
 }