@blueking/bk-weweb 0.0.35-beta.3 → 0.0.35-beta.4

package/dist/index.esm.js

@@ -1907,16 +1907,21 @@ var MicroAppModel = class {
       this.setupNodeProperties(node);
       fragment.appendChild(node);
     }
+    container.innerHTML = "";
     container.appendChild(fragment);
   }
   /** 设置节点属性 */
   setupNodeProperties(node) {
+    const app = this;
     const nodeWithProps = node;
-    if (this.keepAlive) {
-      nodeWithProps.__KEEP_ALIVE__ = this.name;
-    }
-    nodeWithProps.__BK_WEWEB_APP_KEY__ = this.name;
-    nodeWithProps.data = this.data;
+    nodeWithProps.__BK_WEWEB_APP_KEY__ = this.appCacheKey;
+    Object.defineProperties(node, {
+      ownerDocument: {
+        get() {
+          return app.sandBox?.rawDocument;
+        }
+      }
+    });
   }
   /** 创建iframe元素 */
   createIframeElement() {
@@ -1928,7 +1933,8 @@ var MicroAppModel = class {
   }
   /** 构建iframe源地址 */
   buildIframeSrc(url) {
-    return `${url.protocol}//${url.host}`;
+    const isChrome = this.isChromeUserAgent();
+    return `${isChrome ? IFRAME_CONSTANTS.BLANK_ORIGIN : location.origin}${url.pathname || "/"}${url.search}${url.hash}`;
   }
   /** 检查是否为Chrome浏览器 */
   isChromeUserAgent() {
@@ -1936,24 +1942,30 @@ var MicroAppModel = class {
   }
   /** 处理非Chrome浏览器iframe */
   handleNonChromeIframe(iframe, resolve) {
-    const iframeOnload = () => {
-      resolve(iframe);
-    };
-    if (iframe.contentDocument?.readyState === "complete") {
-      iframeOnload();
-    } else {
-      iframe.addEventListener("load", iframeOnload);
-    }
+    const interval = setInterval(() => {
+      if (iframe.contentWindow && iframe.contentWindow.location.href !== IFRAME_CONSTANTS.BLANK_ORIGIN) {
+        iframe.contentWindow.stop();
+        iframe.contentDocument.body.parentElement.innerHTML = IFRAME_CONSTANTS.DEFAULT_HTML;
+        clearInterval(interval);
+        resolve(iframe);
+      }
+    }, IFRAME_CONSTANTS.POLLING_INTERVAL);
   }
   /** 渲染应用内容 */
   renderAppContent() {
-    if (this.showSourceCode && this.source) {
-      this.container.innerHTML = this.source.rawHtml || IFRAME_CONSTANTS.DEFAULT_HTML;
+    if (!this.source) return;
+    const clonedNode = this.source.html.cloneNode(true);
+    const fragment = document.createDocumentFragment();
+    for (const node of Array.from(clonedNode.childNodes)) {
+      this.setupNodeProperties(node);
+      fragment.appendChild(node);
     }
+    this.container.innerHTML = "";
+    this.container.appendChild(fragment);
   }
   /** 检查是否需要重新加载 */
   needsReload() {
-    return this.status === AppState.ERROR;
+    return this.status === AppState.ERROR || this.status === AppState.UNSET;
   }
 };