@dolphinweex/weex-harmony 0.1.89 → 0.1.91

package/package.json

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

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

@@ -126,40 +126,9 @@ export default {
     } else {
       this.debugWarn(`未找到iframe元素`);
     }
-    // 从父组件根节点内查找：既是 .midea-common-weex-view，又包含当前 iframe 的 embedId
-    const findWrapperFromParent = () => {
-      const parentEl = this.$parent && this.$parent.$el;
-      if (!parentEl) return null;
-
-      const candidates = parentEl.querySelectorAll(".midea-common-weex-view");
-      // 用 CSS.escape 规避特殊字符（低端内核可用兜底）
-      const idSelector =
-        window.CSS && CSS.escape
-          ? `#${CSS.escape(this.embedId)}`
-          : `[id="${this.embedId}"]`;
-
-      for (const el of candidates) {
-        if (el.querySelector(idSelector)) return el;
-      }
-      return null;
-    };
-    this._wrapperEl = findWrapperFromParent(); // 保存容器引用
-    
-    // 直接获取父级元素，如果 hmcomponentindex 属性存在且值为 midea-common-weex-view，则保存引用
-    const parentEl = this.$el;
-    if (parentEl) {
-      const hmComponentIndex = parentEl.getAttribute('hmcomponentindex');
-      if (hmComponentIndex === 'midea-common-weex-view') {
-        this._parentElement = parentEl;
-      } else {
-        // 兜底：多数场景 this.$el 就是可控容器，避免因属性缺失导致无法同步高度
-        this._parentElement = parentEl;
-      }
-    }
-    // 包装器找不到时兜底到当前组件根节点
-    if (!this._wrapperEl && this.$el) {
-      this._wrapperEl = this.$el;
-      this.debugLog(`包装器兜底为当前组件根节点`);
+    this.refreshWrapperAndParent();
+    if (!this._wrapperEl) {
+      this.debugWarn(`未找到 iframe 父级 .midea-common-weex-view`);
     }
     
     // 优化手势处理性能
@@ -190,6 +159,14 @@ export default {
     window.addEventListener("message", this._onMessage, false);
   },
   methods: {
+    refreshWrapperAndParent() {
+      const iframeNode = this.$refs.iframe;
+      if (!iframeNode) return;
+      const directParent = iframeNode.parentElement;
+      // 按约定：iframe 的直接父级就是业务容器（midea-common-weex-view*）
+      this._wrapperEl = directParent || null;
+      this._parentElement = this._wrapperEl;
+    },
     debugLog(...args) {
       if (this.isDebug) {
         console.log('cdj----plugin@midea-common-weex-view.vue', ...args);
@@ -202,6 +179,7 @@ export default {
     },
     onPageFinish() {
       this.debugLog(`onPageFinish 触发: embedId=${this.embedId}`);
+      this.refreshWrapperAndParent();
       if (this.$refs["iframe"]) {
         this.debugLog(`iframe引用存在，准备注入全局变量`);
         this.$refs["iframe"].contentWindow.$midea_harmony_native =
@@ -256,11 +234,11 @@ export default {
       }
 
       // 结合元素本身尺寸指标，减少某些内核下 getBoundingClientRect 低估问题
-      const selfRect = parentRect.height || 0;
-      const selfScroll = el.scrollHeight || 0;
-      const selfOffset = el.offsetHeight || 0;
-      const selfClient = el.clientHeight || 0;
-      height = Math.max(height, selfRect, selfScroll, selfOffset, selfClient);
+      // const selfRect = parentRect.height || 0;
+      // const selfScroll = el.scrollHeight || 0;
+      // const selfOffset = el.offsetHeight || 0;
+      // const selfClient = el.clientHeight || 0;
+      // height = Math.max(height, selfRect, selfScroll, selfOffset, selfClient);
       
       return height;
     },
@@ -346,6 +324,8 @@ export default {
     // 根据元素高度更新 iframe 高度
     updateIframeHeightFromElement(element) {
       this.debugLog(`updateIframeHeightFromElement 调用: element=${!!element}, embedId=${this.embedId}`);
+      // 每次更新前刷新一次，防止动态重渲染导致引用丢失
+      this.refreshWrapperAndParent();
       if (!element) {
         this.debugWarn(`updateIframeHeightFromElement: element为空`);
         return;
@@ -370,57 +350,49 @@ 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;
-        const newHeight = `${finalHeight / scale}px`;
+        let newHeightValue = finalHeight / scale;
 
-        // 更新包装器高度（与 iframe 显示高度保持一致，避免父容器裁剪）
+        // 父级有 style 设置的高度时：若 iframe 计算高度偏小，直接用父级高度
+        // 关键：直接解析 inline style 字符串（rem/px），而不用 getBoundingClientRect，
+        // 避免因为内容撑大或旧代码写入导致取到错误的"当前渲染高度"
         if (this._wrapperEl) {
-          this._wrapperEl.style.height = newHeight;
-          this.debugLog(`更新包装器高度: ${newHeight}`);
-        } else {
-          this.debugLog(`包装器元素不存在`);
+          try {
+            const inlineHeight = this._wrapperEl.style && this._wrapperEl.style.height;
+            const parentHasExplicitHeight = !!(
+              inlineHeight && inlineHeight !== "auto" && inlineHeight !== "100%"
+            );
+            if (parentHasExplicitHeight) {
+              const wrapperCssPx = this._wrapperEl.getBoundingClientRect().height || 0;
+              const wrapperWeexVp = wrapperCssPx / scale;
+              this.debugLog(`父级有显式高度: inlineHeight=${inlineHeight}, wrapperCssPx=${wrapperCssPx}, wrapperWeexVp=${wrapperWeexVp}, calcWeexVp=${newHeightValue}`);
+              if (wrapperWeexVp > 0 && newHeightValue < wrapperWeexVp) {
+                this.debugLog(`iframe 偏小，使用父级高度: ${newHeightValue} -> ${wrapperWeexVp}`);
+                newHeightValue = wrapperWeexVp;
+              }
+            }
+          } catch (e) {
+            this.debugWarn("读取父级高度失败:", e);
+          }
         }
 
+        const newHeight = `${newHeightValue}px`;
         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)`);
-          // 如果父级元素存在且符合条件，也给父级元素设置同样显示高度，防止内容被截断
-          if (this._parentElement) {
-            this._parentElement.style.height = newHeight;
-            this.debugLog(`更新父级元素高度: ${newHeight}`);
-          }
+          this.debugLog(`✅ iframe 高度已更新: ${finalHeight}px -> ${newHeight} (embedId: ${this.embedId})`);
         } else {
           this.debugLog(`⚠️ 高度未变化，不更新 (当前=${this.height}, 新值=${newHeight})`);
         }