@dolphinweex/weex-harmony 0.1.88 → 0.1.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dolphinweex/weex-harmony",
-  "version": "0.1.88",
+  "version": "0.1.89",
   "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

@@ -151,8 +151,16 @@ export default {
       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._rafId = null;
@@ -246,6 +254,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;
     },
@@ -355,55 +370,56 @@ 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})`);
 
-        // 更新包装器高度
+        // 更新 iframe 高度（考虑 weex scale）
+        const scale = weex.config.env.scale || 1;
+        const newHeight = `${finalHeight / scale}px`;
+
+        // 更新包装器高度（与 iframe 显示高度保持一致，避免父容器裁剪）
         if (this._wrapperEl) {
-          this._wrapperEl.style.height = `${finalHeight}px`;
-          this.debugLog(`更新包装器高度: ${finalHeight}px`);
+          this._wrapperEl.style.height = newHeight;
+          this.debugLog(`更新包装器高度: ${newHeight}`);
         } else {
           this.debugLog(`包装器元素不存在`);
         }
-        
-        // 更新 iframe 高度（考虑 weex scale）
-        const scale = weex.config.env.scale || 1;
-        const newHeight = `${finalHeight / scale}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`);
+            this._parentElement.style.height = newHeight;
+            this.debugLog(`更新父级元素高度: ${newHeight}`);
           }
         } 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);
     }
   },