fix: fix bug of element-plus dom escape from micro-app element

McGorger · Jan 9, 2022 · c6120e8 · c6120e8
1 parent 5050cfd
commit c6120e8
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 4 deletions.
diff --git a/dev/children/react16/config/webpackDevServer.config.js b/dev/children/react16/config/webpackDevServer.config.js
@@ -102,7 +102,13 @@ module.exports = function (proxy, allowedHost) {
     },
     public: allowedHost,
     // `proxy` is run between `before` and `after` `webpack-dev-server` hooks
-    proxy,
+    proxy: {
+      '/sugrec': {
+        target: 'https://www.baidu.com',
+        secure: false,
+        changeOrigin: true,
+      }
+    },
     before(app, server) {
       // Keep `evalSourceMapMiddleware` and `errorOverlayMiddleware`
       // middlewares before `redirectServedPath` otherwise will not have any effect

diff --git a/dev/children/react16/src/index.js b/dev/children/react16/src/index.js
@@ -217,3 +217,11 @@ if (window.__MICRO_APP_ENVIRONMENT__) {
 // requestAnimationFrame(() => {
 //   console.log(444444)
 // })
+
+// ----------------------分割线--接口相关--------------------- //
+// 测试proxy代理
+fetch('http://localhost:3001/sugrec').then((res) => {
+  return res.json()
+}).then((data) => {
+  console.log('proxy代理 https://www.baidu.com/sugrec 返回数据', data)
+})
diff --git a/dev/main-react16/src/pages/vue3/vue3.js b/dev/main-react16/src/pages/vue3/vue3.js
@@ -24,7 +24,7 @@ function Vue3 () {
         onMounted={() => hideLoading(false)}
         onBeforeshow={() => hideLoading(false)}
         baseRoute='/micro-app/demo/vue3'
-        disableScopecss
+        // disableScopecss
         // keep-alive
         // inline
         // destroy

diff --git a/src/sandbox/index.ts b/src/sandbox/index.ts
@@ -76,7 +76,7 @@ export default class SandBox implements SandBoxInterface {
     // get scopeProperties and escapeProperties from plugins
     this.getScopeProperties(appName)
     // create proxyWindow with Proxy(microAppWindow)
-    this.proxyWindow = this.createProxyWindow()
+    this.proxyWindow = this.createProxyWindow(appName)
     // inject global properties
     this.initMicroAppWindow(this.microAppWindow, appName, url)
     // Rewrite global event listener & timeout
@@ -174,12 +174,13 @@ export default class SandBox implements SandBoxInterface {
   }
 
   // create proxyWindow with Proxy(microAppWindow)
-  private createProxyWindow () {
+  private createProxyWindow (appName: string) {
     const rawWindow = globalEnv.rawWindow
     const descriptorTargetMap = new Map<PropertyKey, 'target' | 'rawWindow'>()
     // window.xxx will trigger proxy
     return new Proxy(this.microAppWindow, {
       get: (target: microAppWindowType, key: PropertyKey): unknown => {
+        throttleDeferForSetAppName(appName)
         if (
           Reflect.has(target, key) ||
           (isString(key) && /^__MICRO_APP_/.test(key)) ||
@@ -291,6 +292,26 @@ export default class SandBox implements SandBoxInterface {
     microAppWindow.rawDocument = globalEnv.rawDocument
     microAppWindow.removeDomScope = removeDomScope
     microAppWindow.hasOwnProperty = (key: PropertyKey) => rawHasOwnProperty.call(microAppWindow, key) || rawHasOwnProperty.call(globalEnv.rawWindow, key)
+    // rawDefineProperty(microAppWindow, Symbol.unscopables, {
+    //   get () {
+    //     throttleDeferForSetAppName(appName)
+    //     return {}
+    //   },
+    //   configurable: true,
+    //   enumerable: false,
+    // })
+
+    // let ngDevMode: any = null
+    // rawDefineProperty(microAppWindow, 'ngDevMode', {
+    //   get () {
+    //     return ngDevMode || globalEnv.rawWindow.ngDevMode
+    //   },
+    //   set (value) {
+    //     ngDevMode = value
+    //   },
+    //   configurable: true,
+    //   enumerable: true,
+    // })
     this.setMappingPropertiesWithRawDescriptor(microAppWindow)
     this.setHijackProperties(microAppWindow, appName)
   }