@blueking/bk-weweb 0.0.13 → 0.0.14

package/dist/collect-source.js

@@ -48,14 +48,26 @@ function rewriteDocumentPrototypeMethods() {
     };
     function querySelectorNew(selectors) {
         const app = getCurrentRunningApp();
-        if (!app || !selectors || SPECIAL_ELEMENT_TAG.includes(selectors) || document$1 !== this) {
+        if (SPECIAL_ELEMENT_TAG.includes(selectors)) {
+            if (app?.container instanceof ShadowRoot) {
+                return app?.container;
+            }
+            querySelector.call(this, selectors);
+        }
+        if (!app || !selectors || document$1 !== this) {
             return querySelector.call(this, selectors);
         }
         return app?.container?.querySelector(selectors) ?? null;
     }
     function querySelectorAllNew(selectors) {
         const app = getCurrentRunningApp();
-        if (!app || !selectors || SPECIAL_ELEMENT_TAG.includes(selectors) || document$1 !== this) {
+        if (SPECIAL_ELEMENT_TAG.includes(selectors)) {
+            if (app?.container instanceof ShadowRoot) {
+                return app?.container;
+            }
+            querySelector.call(this, selectors);
+        }
+        if (!app || !selectors || document$1 !== this) {
             return querySelectorAll.call(this, selectors);
         }
         return app?.container?.querySelectorAll(selectors) ?? [];
@@ -94,7 +106,11 @@ function resetDocumentPrototypeMethods() {
 
 const nextTask = cb => Promise.resolve().then(cb);
 function addUrlProtocol(url) {
-    return url.startsWith('//') ? `${location.protocol}${url}` : url;
+    if (url.startsWith('//'))
+        return `${location.protocol}${url}`;
+    if (!url.startsWith('http'))
+        return `${location.protocol}//${url}`;
+    return url;
 }
 // 补齐url地址
 function fillUpPath(path, baseURI) {
@@ -117,7 +133,9 @@ const random = (n, str = 'abcdefghijklmnopqrstuvwxyz0123456789') => {
     return result;
 };
 const isJsonpUrl = (url) => {
-    if (!url || url.match(/\.js$/))
+    if (!url)
+        return false;
+    if (url.match(/\.js$/))
         return false;
     const { pathname } = new URL(addUrlProtocol(url));
     return !pathname.match(/\.js$/);
@@ -1751,7 +1769,7 @@ class MicroAppModel {
     createIframe() {
         return new Promise((resolve) => {
             const iframe = document.createElement('iframe');
-            const url = new URL(this.url);
+            const url = new URL(addUrlProtocol(this.url));
             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;';
@@ -1809,7 +1827,7 @@ class EntrySource {
     async importHtmlEntry(app) {
         let htmlStr = appCache.getCacheHtml(this.url);
         if (!htmlStr) {
-            htmlStr = await fetchSource(this.url, { cache: 'no-cache' });
+            htmlStr = await fetchSource(addUrlProtocol(this.url), { cache: 'no-cache' });
             if (!htmlStr) {
                 console.error('load app entry error, pleace check');
                 return Promise.reject();