From ddc7aecd53d7b71618e557488dd3d55e6d1f62ae Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Wed, 12 Jul 2023 18:44:28 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=BE=AE=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/nginx/default.conf                     | 5 +++++
 resources/assets/js/pages/manage/microapp.vue | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf
index 906db1e6f..94e0ecd17 100644
--- a/docker/nginx/default.conf
+++ b/docker/nginx/default.conf
@@ -183,6 +183,11 @@ server {
         proxy_set_header Content-Length $request_length;
         proxy_pass http://service/api/approve/verifyToken;
     }
+
+    # OKR
+    location /manage/microapp/okr/ {
+        proxy_pass http://192.168.100.83:5566/;
+    } 
 }
 
 include /etc/nginx/conf.d/conf.d/*.conf;
diff --git a/resources/assets/js/pages/manage/microapp.vue b/resources/assets/js/pages/manage/microapp.vue
index 2f126f5dd..57e2bec01 100644
--- a/resources/assets/js/pages/manage/microapp.vue
+++ b/resources/assets/js/pages/manage/microapp.vue
@@ -7,9 +7,8 @@
         </transition>
         <micro-app name='micro-app' v-if="microAppUrl && !loading"
             :url='microAppUrl' 
-            inline 
+            inline
             destroy
-            disableSandbox 
             :data='microAppData'
             @created='handleCreate'
             @beforemount='handleBeforeMount'
@@ -49,7 +48,11 @@ export default {
                     this.loading = true;
                     this.$nextTick(()=>{
                         this.loading = false;
-                        this.microAppUrl = this.$route.query.url
+                        let url = $A.apiUrl(this.$route.query.url)
+                        if( url.indexOf('http') == -1 ){
+                            url = window.location.origin + url
+                        }
+                        this.microAppUrl =url
                         window.eventCenterForAppNameVite = new EventCenterForMicroApp("micro-app")
                     })
                 }