Merge branch 'master' into feat_enhui_fix

Author: raoenhui

Contact.md

@@ -1,10 +1,23 @@
 
 欢迎小伙伴们加入micro-app微信群交流^ ^
-![IMG_3890](https://github.com/user-attachments/assets/7c4dc938-c69e-40ce-8fb8-9fb23c0f7013)
+![f08d41cdea5a364a9277d443e90f2f25](https://github.com/user-attachments/assets/47bf5fcb-60a6-48b5-81e1-31302e10b1e9)
+
+
+
 
 
 欢迎小伙伴们加入micro-app-DevTools开发交流群^ ^
-![image](https://github.com/user-attachments/assets/a73aa2d6-945c-40fb-89a2-225ad4430c52)
+![5795b83d20722041992bc38f6917f25d](https://github.com/user-attachments/assets/bdfc12e8-982a-4772-8d80-82dc23ec1647)
+
+
+
+
+
+
+
+
+
+
 
 
 

docs/zh-cn/advanced.md

@@ -72,23 +72,34 @@ microApp.start({
 })
 ```
 
-// 配置所有子应用 a 标签的 href 自动补齐方式
-  aHrefResolver: (hrefValue: string, appName: string, appUrl: string) => {
-    return 'https://www.abc.com/'+ hrefValue
-  }
-
-
-
 ## 4、aHrefResolver: 自定义处理所有子应用 a 标签的 href 拼接方式
-
 ```js
 import microApp from '@micro-zoe/micro-app'
 
 microApp.start({
+  // 配置所有子应用 a 标签的 href 自动补齐方式
   aHrefResolver: (hrefValue: string, appName: string, appUrl: string) => {
     return 'https://www.abc.com/'+ hrefValue
   }
 })
 ```
 
+## 5、escapeIframeWindowEvents : iframe 模式 逃逸沙盒的window事件
+```js
+import microApp from '@micro-zoe/micro-app'
+
+microApp.start({
+  // 配置所有iframe子应用 逃逸沙盒的window事件
+  escapeIframeWindowEvents: ['message']
+})
+```
+## 6、disableIframeRootDocument : iframe模式禁用沙箱Document 默认为false
+```js
+import microApp from '@micro-zoe/micro-app'
+
+microApp.start({
+  // iframe模式禁用沙箱Document，避免一些ui组件库Modal 或tooltip 偏移
+  disableIframeRootDocument: true
+})
+```
 

docs/zh-cn/changelog.md

@@ -7,8 +7,19 @@
 - 修订版本号：每周末会进行日常 bugfix 更新。（如果有紧急的 bugfix，则任何时候都可发布）
 
 ---
+### 1.0.0-rc.26
 
+`2025-05-25`
+- **Feature**
+  - 支持 disableIframeRootDocument : iframe模式禁用沙箱Document，默认为false。
+### 1.0.0-rc.25
 
+`2025-05-23`
+- **Feature**
+  - 支持escapeIframeWindowEvents : iframe 模式 逃逸沙盒的window事件， Array<string>。
+- **Bug Fix**
+  - 🐞 修复 子应用样式加载异常，[issue 1553](https://github.com/jd-opensource/micro-app/issues/1553)。
+  - 🐞 修复 当开启样式隔离时子应用属性选择器样式错误，[issue 1573](https://github.com/jd-opensource/micro-app/issues/1573)。
 ### 1.0.0-rc.24
 
 `2025-03-19`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@micro-zoe/micro-app",
-  "version": "1.0.0-rc.24",
+  "version": "1.0.0-rc.26",
   "description": "A lightweight, efficient and powerful micro front-end framework",
   "private": false,
   "main": "lib/index.min.js",

src/sandbox/adapter.ts

@@ -250,7 +250,14 @@ export function getIframeParentNodeDesc (
        *  e.g. target.parentNode.remove(target)
        */
       if (isMicroAppBody(result) && appInstanceMap.get(appName)?.container) {
-        return microApp.options.getRootElementParentNode?.(this, appName) || globalEnv.rawDocument.body
+        const customParent = microApp.options.getRootElementParentNode?.(this, appName)
+        if (customParent) {
+          return customParent
+        }
+        if (microApp?.options?.inheritBaseBody !== true) {
+          return appInstanceMap.get(appName)?.container?.querySelector('micro-app-body') || globalEnv.rawDocument.body
+        }
+        return globalEnv.rawDocument.body
       }
       return result
     }

src/sandbox/iframe/document.ts

@@ -54,6 +54,12 @@ export function patchDocument (
 
   return patchDocumentEffect(appName, microAppWindow)
 }
+function getElementDocument(microDocument: Document, rawDocument: Document): Document {
+  if (microApp?.options?.disableIframeRootDocument) {
+    return rawDocument
+  }
+  return microDocument
+}
 
 function patchDocumentPrototype (appName: string, microAppWindow: microAppWindowType): void {
   const rawDocument = globalEnv.rawDocument
@@ -88,7 +94,7 @@ function patchDocumentPrototype (appName: string, microAppWindow: microAppWindow
     tagName: string,
     options?: ElementCreationOptions,
   ): HTMLElement {
-    let element = rawMicroCreateElement.call(this, tagName, options)
+    let element = rawMicroCreateElement.call(getElementDocument(this, rawDocument), tagName, options)
     if (isWebComponentElement(element)) {
       element = rawMicroCreateElement.call(rawDocument, tagName, options)
     }
@@ -100,22 +106,22 @@ function patchDocumentPrototype (appName: string, microAppWindow: microAppWindow
     name: string,
     options?: string | ElementCreationOptions,
   ): HTMLElement {
-    const element = rawMicroCreateElementNS.call(this, namespaceURI, name, options)
+    const element = rawMicroCreateElementNS.call(getElementDocument(this, rawDocument), namespaceURI, name, options)
     return updateElementInfo(element, appName)
   }
 
   microRootDocument.prototype.createTextNode = function createTextNode (data: string): Text {
-    const element = rawMicroCreateTextNode.call(this, data)
+    const element = rawMicroCreateTextNode.call(getElementDocument(this, rawDocument), data)
     return updateElementInfo<Text>(element, appName)
   }
 
   microRootDocument.prototype.createDocumentFragment = function createDocumentFragment (): DocumentFragment {
-    const element = rawMicroCreateDocumentFragment.call(this)
+    const element = rawMicroCreateDocumentFragment.call(getElementDocument(this, rawDocument))
     return updateElementInfo(element, appName)
   }
 
   microRootDocument.prototype.createComment = function createComment (data: string): Comment {
-    const element = rawMicroCreateComment.call(this, data)
+    const element = rawMicroCreateComment.call(getElementDocument(this, rawDocument), data)
     return updateElementInfo<Comment>(element, appName)
   }
 
@@ -184,7 +190,7 @@ function patchDocumentPrototype (appName: string, microAppWindow: microAppWindow
     }
 
     try {
-      return querySelector.call(this, `#${key}`)
+      return querySelector.call(getElementDocument(this, rawDocument), `#${key}`)
     } catch {
       return rawMicroGetElementById.call(_this, key)
     }
@@ -197,14 +203,14 @@ function patchDocumentPrototype (appName: string, microAppWindow: microAppWindow
     }
 
     try {
-      return querySelectorAll.call(this, `.${key}`)
+      return querySelectorAll.call(getElementDocument(this, rawDocument), `.${key}`)
     } catch {
       return rawMicroGetElementsByClassName.call(_this, key)
     }
   }
 
   microRootDocument.prototype.getElementsByTagName = function getElementsByTagName (key: string): HTMLCollectionOf<Element> {
-    const _this = getBindTarget(this)
+    const _this = getBindTarget(getElementDocument(this, rawDocument))
     if (
       isUniqueElement(key) ||
       isInvalidQuerySelectorKey(key)
@@ -216,20 +222,20 @@ function patchDocumentPrototype (appName: string, microAppWindow: microAppWindow
     }
 
     try {
-      return querySelectorAll.call(this, key)
+      return querySelectorAll.call(getElementDocument(this, rawDocument), key)
     } catch {
       return rawMicroGetElementsByTagName.call(_this, key)
     }
   }
 
   microRootDocument.prototype.getElementsByName = function getElementsByName (key: string): NodeListOf<HTMLElement> {
-    const _this = getBindTarget(this)
+    const _this = getBindTarget(getElementDocument(this, rawDocument))
     if (isInvalidQuerySelectorKey(key)) {
       return rawMicroGetElementsByName.call(_this, key)
     }
 
     try {
-      return querySelectorAll.call(this, `[name=${key}]`)
+      return querySelectorAll.call(getElementDocument(this, rawDocument), `[name=${key}]`)
     } catch {
       return rawMicroGetElementsByName.call(_this, key)
     }

src/sandbox/iframe/window.ts

@@ -25,6 +25,7 @@ import {
   escape2RawWindowRegExpKeys,
 } from './special_key'
 import WorkerProxy from '../../proxies/worker'
+import microApp from '../../micro_app'
 
 /**
  * patch window of child app
@@ -234,7 +235,12 @@ function patchWindowEffect (microAppWindow: microAppWindowType): CommonEffectHoo
      * TODO: SCOPE_WINDOW_EVENT_OF_IFRAME的事件非常少，有可能导致问题
      *  1、一些未知的需要绑定到iframe的事件被错误的绑定到原生window上
      */
-    return SCOPE_WINDOW_EVENT_OF_IFRAME.includes(type) ? microAppWindow : rawWindow
+    let escapeSandboxEvent: Array<string> = []
+    if (Array.isArray(microApp?.options?.escapeIframeWindowEvents)) {
+      escapeSandboxEvent = microApp.options.escapeIframeWindowEvents
+    }
+    const scopeWindowEvent = SCOPE_WINDOW_EVENT_OF_IFRAME.filter(item => !escapeSandboxEvent.includes(item))
+    return scopeWindowEvent.includes(type) ? microAppWindow : rawWindow
   }
 
   // TODO: listener 是否需要绑定microAppWindow，否则函数中的this指向原生window

src/sandbox/scoped_css.ts

@@ -108,8 +108,8 @@ class CSSParser {
      *    should be ==> micro-app[name=xxx] :where(.a, .b, .c) a {}
      */
     const attributeValues: {[key: string]: any} = {}
-    const matchRes = m[0].replace(/\[([^\]=]+)(?:=([^\]]+))?\]/g, (match, p1, p2) => {
-      const mock = `__mock_${p1}Value__`
+    const matchRes = m[0].replace(/\[([^\]=]+)(?:=([^\]]+))?\]/g, (match, p1, p2, offset) => {
+      const mock = `__mock_${p1}_${offset}Value__`
       attributeValues[mock] = p2
       return match.replace(p2, mock)
     })

typings/global.d.ts

@@ -369,7 +369,9 @@ declare module '@micro-app/types' {
     getRootElementParentNode?: (node: Node, appName: AppName) => void
     customProxyDocumentProps?: Map<string | number | symbol, (value: unknown) => void>
     aHrefResolver?: (hrefValue: string, appName: string, appUrl: string) => string
-    inheritBaseBody?:boolean
+    inheritBaseBody?:boolean,
+    escapeIframeWindowEvents? : Array<string>,
+    disableIframeRootDocument?: boolean,
   }
 
   // MicroApp config