@dolphinweex/weex-harmony 0.1.90 → 0.1.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dolphinweex/weex-harmony",
-  "version": "0.1.90",
+  "version": "0.1.92",
   "description": "weex harmony adapter",
   "main": "index.js",
   "files": [

package/src/components/midea-common-weex-view.vue

@@ -215,15 +215,18 @@ export default {
       
       children.forEach((child, index) => {
         const rect = child.getBoundingClientRect();
-        this.debugLog(`子级 ${index}: top=${rect.top}, bottom=${rect.bottom}, height=${rect.height}`);
+        // 转换为相对于父元素的坐标，避免视口绝对坐标中负 top 导致高度被持续放大
+        const relTop = rect.top - parentRect.top;
+        const relBottom = rect.bottom - parentRect.top;
+        this.debugLog(`子级 ${index}: top=${relTop}, bottom=${relBottom}, height=${rect.height}`);
         if (rect.height > 0) {
-          maxBottom = Math.max(maxBottom, rect.bottom);
-          minTop = Math.min(minTop, rect.top);
+          maxBottom = Math.max(maxBottom, relBottom);
+          minTop = Math.min(minTop, Math.max(0, relTop)); // 负偏移从0算起，不向上扩展
         }
         totalOffsetHeight += (child.offsetHeight || 0);
       });
       
-      // 优先使用 getBoundingClientRect 计算出的相对高度
+      // 优先使用相对坐标计算高度，不受视口滚动或容器偏移影响
       let height = (maxBottom > minTop) ? (maxBottom - minTop) : 0;
       
       this.debugLog(`计算高度详情: rectHeight=${height}, totalOffsetHeight=${totalOffsetHeight}, parentRectTop=${parentRect.top}`);
@@ -350,43 +353,24 @@ export default {
       this.debugLog(`计算得到elementHeight=${elementHeight}px`);
       
       if (elementHeight > 0) {
-        // 默认不按当前视口剩余高度裁剪，避免可滚动页面中 iframe 被错误截断。
-        // plugin-menu 页面保持原有“限制在可视区”策略。
+        // isPluginMenu=false：始终不按视口裁剪，保持原逻辑不变。
+        // isPluginMenu=true：改为不裁剪，避免多组件时下方 iframe 被裁成一条线、且裁剪值同步到父级压扁整块。
         let maxHeight = Number.POSITIVE_INFINITY;
-        this.debugLog(`初始maxHeight=${maxHeight}px (isPluginMenu=${this.isPluginMenu})`);
-        
         if (this.isPluginMenu) {
-          maxHeight = window.innerHeight;
-          if (this.$refs.iframe) {
-            try {
-              const rect = this.$refs.iframe.getBoundingClientRect();
-              this.debugLog(`iframe位置: top=${rect.top}, left=${rect.left}, width=${rect.width}, height=${rect.height}`);
-              if (rect.top > 0) {
-                maxHeight = window.innerHeight - rect.top;
-                this.debugLog(`plugin-menu 调整后maxHeight=${maxHeight}px (top=${rect.top})`);
-              }
-            } catch (e) {
-              this.debugWarn('获取 iframe 位置失败:', e);
-            }
-          } else {
-            this.debugWarn(`this.$refs.iframe 不存在`);
-          }
-          maxHeight = Math.max(maxHeight, 0);
+          maxHeight = Number.POSITIVE_INFINITY; // 仅对 plugin-menu 取消视口裁剪，不影响 isPluginMenu=false
         }
-        
-        this.debugLog(`最终maxHeight=${maxHeight}px`);
+        this.debugLog(`maxHeight=${maxHeight} (isPluginMenu=${this.isPluginMenu})`);
 
-        // 非 plugin-menu 不裁剪；plugin-menu 才按 maxHeight 限制
         const finalHeight = elementHeight > maxHeight ? maxHeight : elementHeight;
-        this.debugLog(`finalHeight=${finalHeight}px (isPluginMenu=${this.isPluginMenu}, elementHeight=${elementHeight}, maxHeight=${maxHeight})`);
+        this.debugLog(`finalHeight=${finalHeight}px (elementHeight=${elementHeight}, maxHeight=${maxHeight})`);
 
         // 更新 iframe 高度（考虑 weex scale）
         const scale = weex.config.env.scale || 1;
         let newHeightValue = finalHeight / scale;
 
         // 父级有 style 设置的高度时：若 iframe 计算高度偏小，直接用父级高度
-        // newHeightValue 单位：Weex 虚拟 px；父级 getBoundingClientRect 单位：CSS px
-        // 两者转换关系：CSS px = Weex vp * scale，所以 Weex vp = CSS px / scale
+        // 关键：直接解析 inline style 字符串（rem/px），而不用 getBoundingClientRect，
+        // 避免因为内容撑大或旧代码写入导致取到错误的"当前渲染高度"
         if (this._wrapperEl) {
           try {
             const inlineHeight = this._wrapperEl.style && this._wrapperEl.style.height;
@@ -411,7 +395,7 @@ export default {
         this.debugLog(`计算newHeight=${newHeight} (finalHeight=${finalHeight}, scale=${scale}), 当前height=${this.height}`);
         if (this.height !== newHeight) {
           this.height = newHeight;
-          this.debugLog(`✅ iframe 高度已更新: ${finalHeight}px -> ${newHeight} (embedId: ${this.embedId}, max: ${maxHeight}px)`);
+          this.debugLog(`✅ iframe 高度已更新: ${finalHeight}px -> ${newHeight} (embedId: ${this.embedId})`);
         } else {
           this.debugLog(`⚠️ 高度未变化，不更新 (当前=${this.height}, 新值=${newHeight})`);
         }