@dolphinweex/weex-vue-render 0.2.104 → 0.2.106

package/dist/index.common.js

@@ -2674,11 +2674,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 +2734,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 +2755,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);
@@ -2801,10 +2810,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
 }
 
@@ -4112,6 +4129,7 @@ function initEnv (viewportInfo, envInfo) {
     weexVersion: device_display.weexVersion,
     osName: device_display.osName,
     statusBarHeight: device_display.statusBarHeight,
+    navigationBarHeight: device_display.navigationBarHeight,
     safeAreaBottomHeight: device_display.safeAreaBottomHeight,
     isImmersion: device_display.isImmersion ? "true" : "false",
     
@@ -8977,7 +8995,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';
@@ -9076,7 +9093,6 @@ 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') {
@@ -9180,7 +9196,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);

package/package.json

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