@blueking/bk-weweb 0.0.3 → 0.0.6

package/dist/collect-source.js

@@ -203,7 +203,7 @@ const commonEScapeKeyList = ['System', '__cjsWrapper', '__REACT_ERROR_OVERLAY_GL
 // 共享主应用上下文属性名
 const escapeSetterKeyList = ['location'];
 // 一定需要在子应用自身上下文获取的属性名
-const scopeWindowKeyList = ['webpackJsonp', '__POWERED_BY_BK_WEWEB__', '__BK_WEWEB_APP_KEY__', '__BK_WEWEB_DATA__'];
+const scopeWindowKeyList = ['__POWERED_BY_BK_WEWEB__', '__BK_WEWEB_APP_KEY__', '__BK_WEWEB_DATA__'];
 // 设置了scopedLocation 后需要监听属性名
 const scopedLocationKeyList = ['location', 'history'];
 var DescriptorMapValue;
@@ -244,46 +244,6 @@ const commonRawWindowKeyMap = {
     WeakMap: true,
     WeakSet: true,
     Uint8Array: true,
-    // btoa: true,
-    // unescape: true,
-    // WebSocket: true,
-    // encodeURIComponent: true,
-    // decodeURIComponent: true,
-    // ArrayBuffer: true,
-    // XMLHttpRequest: true,
-    // SVGElement: true,
-    // URLSearchParams: true,
-    // URL: true,
-    // RangeError: true,
-    // TypeError: true,
-    // Uint16Array: true,
-    // Uint32Array: true,
-    // Float64Array: true,
-    // Int32Array: true,
-    // requestAnimationFrame: true,
-    // SVGRect: true,
-    // Error: true,
-    // Buffer: true,
-    // SyntaxError: true,
-    // DataView: true,
-    // Worker: true,
-    // localStorage: true,
-    // Text: true,
-    // FormData: true,
-    // ShadowRoot: true,
-    // encodeURI: true,
-    // crypto: true,
-    // HTMLAnchorElement: true,
-    // Int8Array: true,
-    // FinalizationRegistry: true,
-    // BigInt: true,
-    // Atomics: true,
-    // Uint8ClampedArray: true,
-    // WeakRef: true,
-    // getComputedStyle,
-    // innerHeight: true,
-    // innerWidth: true,
-    // getComputedStyle: true,
 };
 const commonFakeWindowKeyMap = {
     __VUE_OPTIONS_API__: true,
@@ -296,8 +256,11 @@ const commonFakeWindowKeyMap = {
     webpackChunktrace: true,
     webpackChunkpc: true,
     webpackChunkapm: true,
+    webpackJsonp: true,
     i18n: true,
     '__core-js_shared__': true,
+    __bk_pop_manager: true,
+    __bk_zIndex_manager: true,
 };
 
 function eventHandler(event, element) {
@@ -663,9 +626,7 @@ function elementInsertHandler(parent, newChild, passiveChild, rawMethod) {
             const container = needKeepAlive ? document.head : app?.container;
             const targetChild = resetNewElement(parent, newChild, app);
             if (needKeepAlive) {
-                targetChild.__KEEP_ALIVE__ = app.appCacheKey;
-                targetChild.setAttribute('data-from', app.name);
-                targetChild.setAttribute('data-keep-alive', 'true');
+                setMarkElement(targetChild, app, needKeepAlive);
             }
             if (passiveChild && !container.contains(passiveChild)) {
                 return bodyAppendChild$1.call(container, targetChild);
@@ -966,7 +927,6 @@ class SandBox {
                     && this.app.scopeLocation) {
                     return this.app.iframe.contentWindow?.[key];
                 }
-                // if (key === Symbol.unscopables) return com;
                 if (key === 'hasOwnProperty')
                     return (key) => this.fakeWindow.hasOwnProperty(key) || rawWindow.hasOwnProperty(key);
                 if (key === 'top' || key === 'parent') {
@@ -1246,7 +1206,7 @@ function unmount(appKey) {
 function activated(appKey, container, callback) {
     const app = appCache.getApp(appKey);
     if (app?.status === AppState.DEACTIVATED && app.keepAlive) {
-        nextTask(() => app?.activated(container, callback));
+        nextTask(() => app.activated(container, callback));
     }
     else {
         nextTask(() => app?.mount(container, callback));
@@ -1327,7 +1287,7 @@ class BkIframeElement extends HTMLElement {
     async connectedCallback() {
         beforeLoad();
         if (this.getBooleanAttr(ObserveAttrs.setShodowDom) && !this.shadowRoot) {
-            this.attachShadow({ mode: 'open', delegatesFocus: true });
+            this.attachShadow({ mode: 'open', delegatesFocus: false });
         }
         await load(this.appProps);
         activated(this.appKey, this.shadowRoot ?? this);
@@ -1647,6 +1607,7 @@ async function execAppScripts(app) {
     });
 }
 
+const BLANK_ORIGN = 'about:blank';
 class MicroAppModel {
     state = AppState.UNSET;
     isPreLoad = false;
@@ -1718,7 +1679,6 @@ class MicroAppModel {
         this.container = container ?? this.container;
         this.state = AppState.MOUNTING;
         if (this.container) {
-            debugger;
             if (this.container instanceof Element)
                 this.container.setAttribute(CSS_ATTRIBUTE_KEY, this.name);
             const clonedNode = this.source.html.cloneNode(true);
@@ -1767,10 +1727,24 @@ class MicroAppModel {
         return new Promise((resolve) => {
             const iframe = document.createElement('iframe');
             const url = new URL(this.url);
-            iframe.setAttribute('src', `about:blank${url.pathname || '/'}${url.search}${url.hash}`);
-            iframe.style.cssText = 'position: fixed; top: -9999px; width: 100%; height: 1px;';
+            const isChrome = navigator.userAgent.indexOf('Chrome') > -1;
+            iframe.setAttribute('src', `${isChrome ? BLANK_ORIGN : location.origin}${url.pathname || '/'}${url.search}${url.hash}`);
+            iframe.style.cssText = 'display: none;';
             document.body.appendChild(iframe);
-            setTimeout(() => resolve(iframe), 100);
+            if (isChrome) {
+                setTimeout(() => resolve(iframe), 0);
+            }
+            else {
+                // 其他浏览器在about:blank下会出现同源检测安全错误 换另一种方式来做location保持
+                const interval = setInterval(() => {
+                    if (iframe.contentWindow && iframe.contentWindow.location.href !== BLANK_ORIGN) {
+                        iframe.contentWindow.stop();
+                        iframe.contentDocument.body.parentElement.innerHTML = '<head></head><body></body>';
+                        clearInterval(interval);
+                        resolve(iframe);
+                    }
+                }, 0);
+            }
         });
     }
     registerRunningApp() {