@dolphinweex/weex-harmony 0.1.101 → 0.1.102

package/package.json

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

package/src/components/midea-audio-input-view.vue

@@ -46,6 +46,10 @@ export default {
       type: String,
       default: '确认'
     },
+    userInteractionEnabled:{
+      type: Boolean,
+      default: false
+    }
   },
   computed: {
     hosSameLayerArgs() {
@@ -60,6 +64,7 @@ export default {
         onAudioInputCancel: this.onAudioInputCancel,
         onAudioInputFail: this.onAudioInputFail,
         onAudioInputComplete: this.onAudioInputComplete,
+        userInteractionEnabled: this.userInteractionEnabled
       };
     },
   },

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

@@ -1,7 +1,6 @@
 <template>
   <div>
     <div class="progress-container" v-if="progressText">
-      <img class="progress-loading" src="data:image/gif;base64,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" alt="loading" />
       <text class="progress-text">{{progressText}}</text>
     </div>
     <iframe
@@ -33,7 +32,7 @@ const weexModule = weex.requireModule("weexModule");
 export default {
   data() {
     return {
-      isDebug: false, // 调试开关
+      isDebug: true, // 调试开关
       url: "",
       pluginType: "weex",
       backgroundColor: "transparent",
@@ -50,6 +49,10 @@ export default {
       _useChildrenTotalHeight: false,
       _parentElement: null, // 符合条件的父级元素
       _mutationObserver: null,
+      _debounceTimer: null,
+      _isInternalUpdating: false, // 内部更新锁，防止反馈回路导致反复刷新
+      _pendingUpdate: false, // 锁期间是否有待处理的更新
+      _applyTimer: null,
     };
   },
   components: {
@@ -246,63 +249,6 @@ export default {
       return height;
     },
     
-    isSafeHeightFallbackTarget(el, scroller) {
-      if (!el || !scroller) return false;
-      if (el === scroller) return false;
-      if (!scroller.contains(el)) return false;
-      if (!el.children || el.children.length === 0) return false;
-
-      const className = `${el.className || ''}`;
-      const unsafeKeywords = ['weex-scroller-inner', 'weex-waterfall-inner', 'weex-waterfall-inner-columns'];
-      if (unsafeKeywords.some(keyword => className.includes(keyword))) {
-        this.debugWarn(`fallback 目标命中不安全关键字，放弃使用: ${className}`);
-        return false;
-      }
-
-      const firstChild = el.children[0];
-      if (!firstChild) return false;
-
-      const firstChildClassName = `${firstChild.className || ''}`;
-      if (firstChildClassName.includes('weex-root')) {
-        this.debugLog(`fallback 目标首子节点已是 weex-root，可安全使用: ${className}`);
-        return true;
-      }
-
-      if (el.children.length === 1) {
-        this.debugLog(`fallback 目标仅有一个子节点，允许临时使用: ${className}`);
-        return true;
-      }
-
-      this.debugWarn(`fallback 目标存在多个子节点且无 weex-root 标识，放弃使用: ${className}`);
-      return false;
-    },
-
-    findWeexHeightTarget(doc) {
-      if (!doc) return null;
-      const globalRoot = doc.querySelector('.weex-root');
-      const scroller = doc.querySelector('.weex-scroller-inner');
-      if (scroller) {
-        this.debugLog(`找到 .weex-scroller-inner`);
-        const scrollerRoot = scroller.querySelector('.weex-root');
-        if (scrollerRoot) {
-          this.debugLog(`在 .weex-scroller-inner 内找到 .weex-root`);
-          return scrollerRoot;
-        }
-        const fallbackTarget = scroller.children && scroller.children[0];
-        if (this.isSafeHeightFallbackTarget(fallbackTarget, scroller)) {
-          this.debugLog(`使用安全 fallback 容器: ${fallbackTarget.className || fallbackTarget.tagName}`);
-          return fallbackTarget;
-        }
-        this.debugWarn(`.weex-scroller-inner 内未找到可用目标，继续等待`);
-      }
-      if (globalRoot) {
-        this.debugLog(`使用全局 .weex-root`);
-        return globalRoot;
-      }
-      return null;
-    },
-
-
     // 监听 iframe 内容高度变化
     startWeexRootHeightMonitoring() {
       this.debugLog(`startWeexRootHeightMonitoring 开始: embedId=${this.embedId}`);
@@ -318,7 +264,17 @@ export default {
 
         try {
           const doc = iframe.contentDocument || iframe.contentWindow.document;
-          const target = this.findWeexHeightTarget(doc);
+          let target = null;
+
+          // 1. 优先找 weex-scroller-inner 及其内部的 weex-root
+          const scroller = doc.querySelector('.weex-scroller-inner');
+          if (scroller) {
+            this.debugLog(`找到 .weex-scroller-inner`);
+            target = scroller.querySelector('.weex-root') || scroller.children[0];
+          } else {
+            // 2. 备选找全局 weex-root
+            target = doc.querySelector('.weex-root');
+          }
 
           if (!target) {
             if (attempts >= maxAttempts) {
@@ -353,8 +309,21 @@ export default {
       this.debugLog(`设置 Observers: target=${target ? (target.className || target.tagName) : 'null'}`);
       
       const onUpdate = () => {
+        // 如果正在内部更新高度引起的重排，记录下有变化发生，然后直接跳过
+        if (this._isInternalUpdating) {
+          this._pendingUpdate = true;
+          return;
+        }
+
         this.debugLog(`变化触发更新`);
-        this.updateIframeHeightFromElement(target);
+        if (this._debounceTimer) {
+          clearTimeout(this._debounceTimer);
+        }
+        this._debounceTimer = setTimeout(() => {
+          this.debugLog(`防抖后执行更新`);
+          this.updateIframeHeightFromElement(target);
+          this._debounceTimer = null;
+        }, 200);
       };
 
       if (this._resizeObserver) this._resizeObserver.disconnect();
@@ -400,8 +369,16 @@ export default {
       this.debugLog(`计算得到elementHeight=${elementHeight}px`);
       
       if (elementHeight > 0) {
-        const finalHeight = elementHeight;
-        this.debugLog(`finalHeight=${finalHeight}px (elementHeight=${elementHeight})`);
+        // isPluginMenu=false：始终不按视口裁剪，保持原逻辑不变。
+        // isPluginMenu=true：改为不裁剪，避免多组件时下方 iframe 被裁成一条线、且裁剪值同步到父级压扁整块。
+        let maxHeight = Number.POSITIVE_INFINITY;
+        if (this.isPluginMenu) {
+          maxHeight = Number.POSITIVE_INFINITY; // 仅对 plugin-menu 取消视口裁剪，不影响 isPluginMenu=false
+        }
+        this.debugLog(`maxHeight=${maxHeight} (isPluginMenu=${this.isPluginMenu})`);
+
+        const finalHeight = elementHeight > maxHeight ? maxHeight : elementHeight;
+        this.debugLog(`finalHeight=${finalHeight}px (elementHeight=${elementHeight}, maxHeight=${maxHeight})`);
 
         // 更新 iframe 高度（考虑 weex scale）
         const scale = weex.config.env.scale || 1;
@@ -432,9 +409,34 @@ export default {
 
         const newHeight = `${newHeightValue}px`;
         this.debugLog(`计算newHeight=${newHeight} (finalHeight=${finalHeight}, scale=${scale}), 当前height=${this.height}`);
+        
+        // 增大误差容忍度：如果差距小于 3px，认为没有实质变化，不触发属性更新。
+        // 3px 足以过滤 Weex 在处理 rem 布局时产生的浮点数舍入误差。
+        const currentHeightValue = parseFloat(this.height) || 0;
+        if (Math.abs(currentHeightValue - newHeightValue) < 3 && this.height !== '0px') {
+          this.debugLog(`⚠️ 高度微小抖动(${Math.abs(currentHeightValue - newHeightValue)}px)，忽略微调以稳定布局`);
+          return;
+        }
+
         if (this.height !== newHeight) {
-          this.height = newHeight;
-          this.debugLog(`✅ iframe 高度已更新: ${finalHeight}px -> ${newHeight} (embedId: ${this.embedId})`);
+          this._isInternalUpdating = true; // 加锁
+          
+          // 使用异步应用机制，确保在一轮布局周期内只应用最后一次高度结果
+          if (this._applyTimer) clearTimeout(this._applyTimer);
+          this._applyTimer = setTimeout(() => {
+            this.height = newHeight;
+            this.debugLog(`✅ [FINAL] iframe 高度已应用: ${newHeight} (embedId: ${this.embedId})`);
+            
+            // 给 Weex 引擎留出更充分的布局响应时间，随后解锁并检查是否有遗漏
+            setTimeout(() => {
+              this._isInternalUpdating = false;
+              if (this._pendingUpdate) {
+                this._pendingUpdate = false;
+                this.debugLog(`补测锁期间拦截的变化`);
+                this.updateIframeHeightFromElement(element);
+              }
+            }, 600);
+          }, 50); // 极短的延迟即可实现一轮内的覆盖
         } else {
           this.debugLog(`⚠️ 高度未变化，不更新 (当前=${this.height}, 新值=${newHeight})`);
         }
@@ -505,10 +507,22 @@ export default {
     
     // 清理定时器
     if (this._heightCheckTimer) {
-      this.debugLog(`清理定时器`);
+      this.debugLog(`清理高度检查定时器`);
       clearInterval(this._heightCheckTimer);
       this._heightCheckTimer = null;
     }
+
+    // 清理防抖定时器
+    if (this._debounceTimer) {
+      this.debugLog(`清理防抖定时器`);
+      clearTimeout(this._debounceTimer);
+      this._debounceTimer = null;
+    }
+
+    if (this._applyTimer) {
+      clearTimeout(this._applyTimer);
+      this._applyTimer = null;
+    }
     
     // 清理引用
     this._weexRoot = null;
@@ -559,4 +573,4 @@ export default {
   text-align: center;
   font-weight: 400;
 }
-</style>
+</style>