@dolphinweex/weex-harmony 0.1.88 → 0.1.90

package/package.json

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

package/src/components/baseSameLayer.vue

@@ -77,11 +77,11 @@ export default {
     }
   },
   created() {
-    const componentType = this.embedType.replace('native/','')
-    this.embedId = `embedId_${this._uid}_${this.generateNaiveId()}_${componentType}`
+    this.embedId = `embedId_${this._uid}_${this.generateNaiveId()}`
     console.log("[sameLayerRendering] web component created.");
     weexModule.callNative("transferSameLayerArgs", {
       componentId: this.embedId,
+      embedType: this.embedType,
       ...this.hosSameLayerArgs,
     });
   },
@@ -157,6 +157,7 @@ export default {
         this.$nextTick(() => {
           weexModule.callNative("transferSameLayerArgs", {
             componentId: this.embedId,
+            embedType: this.embedType,
             ...newVal,
           });
         });

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

@@ -126,32 +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;
-      }
+    this.refreshWrapperAndParent();
+    if (!this._wrapperEl) {
+      this.debugWarn(`未找到 iframe 父级 .midea-common-weex-view`);
     }
     
     // 优化手势处理性能
@@ -182,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);
@@ -194,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 =
@@ -246,6 +232,13 @@ export default {
       if (height <= 0) {
         height = totalOffsetHeight;
       }
+
+      // 结合元素本身尺寸指标，减少某些内核下 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);
       
       return height;
     },
@@ -331,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;
@@ -355,56 +350,68 @@ export default {
       this.debugLog(`计算得到elementHeight=${elementHeight}px`);
       
       if (elementHeight > 0) {
-        // 限制最大高度，防止死循环
-        // 策略：使用 window.innerHeight 减去 iframe 距离视口顶部的距离
-        let maxHeight = window.innerHeight;
-        this.debugLog(`初始maxHeight(window.innerHeight)=${maxHeight}px`);
+        // 默认不按当前视口剩余高度裁剪，避免可滚动页面中 iframe 被错误截断。
+        // plugin-menu 页面保持原有“限制在可视区”策略。
+        let maxHeight = Number.POSITIVE_INFINITY;
+        this.debugLog(`初始maxHeight=${maxHeight}px (isPluginMenu=${this.isPluginMenu})`);
         
-        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}`);
-            // 如果 top > 0，说明 iframe 顶部在视口下方或视口内，减去 top 得到剩余可用高度
-            // 如果 top <= 0，说明 iframe 顶部已滚出视口上方，此时最大高度限制为 window.innerHeight (防止无限增高)
-            if (rect.top > 0) {
-              maxHeight = window.innerHeight - rect.top;
-              this.debugLog(`调整后maxHeight=${maxHeight}px (top=${rect.top})`);
+        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);
             }
-          } catch (e) {
-            this.debugWarn('获取 iframe 位置失败:', e);
+          } else {
+            this.debugWarn(`this.$refs.iframe 不存在`);
           }
-        } else {
-          this.debugWarn(`this.$refs.iframe 不存在`);
+          maxHeight = Math.max(maxHeight, 0);
         }
         
-        // 确保 maxHeight 不为负数
-        maxHeight = Math.max(maxHeight, 0);
         this.debugLog(`最终maxHeight=${maxHeight}px`);
 
-        // 如果计算出的高度超过了最大限制，则使用最大限制
-        const finalHeight = !this.isPluginMenu ?  elementHeight > maxHeight ? maxHeight : elementHeight : elementHeight
+        // 非 plugin-menu 不裁剪；plugin-menu 才按 maxHeight 限制
+        const finalHeight = elementHeight > maxHeight ? maxHeight : elementHeight;
         this.debugLog(`finalHeight=${finalHeight}px (isPluginMenu=${this.isPluginMenu}, elementHeight=${elementHeight}, maxHeight=${maxHeight})`);
 
-        // 更新包装器高度
-        if (this._wrapperEl) {
-          this._wrapperEl.style.height = `${finalHeight}px`;
-          this.debugLog(`更新包装器高度: ${finalHeight}px`);
-        } else {
-          this.debugLog(`包装器元素不存在`);
-        }
-        
         // 更新 iframe 高度（考虑 weex scale）
         const scale = weex.config.env.scale || 1;
-        const newHeight = `${finalHeight / scale}px`;
+        let newHeightValue = finalHeight / scale;
+
+        // 父级有 style 设置的高度时：若 iframe 计算高度偏小，直接用父级高度
+        // newHeightValue 单位：Weex 虚拟 px；父级 getBoundingClientRect 单位：CSS px
+        // 两者转换关系：CSS px = Weex vp * scale，所以 Weex vp = CSS px / scale
+        if (this._wrapperEl) {
+          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 = `${finalHeight}px`;
-            this.debugLog(`更新父级元素高度: ${finalHeight}px`);
-          }
         } else {
           this.debugLog(`⚠️ 高度未变化，不更新 (当前=${this.height}, 新值=${newHeight})`);
         }

package/src/components/midea-ijkplayer-view.vue

@@ -257,7 +257,7 @@ export default {
     onPreviewImageClick(res) {
       this.$emit('onPreviewImageClick', res);
     },
-    onCaptureCompletion(){
+    onCaptureCompletion(res){
       this.$emit('onCaptureCompletion', res);
     }
   },