From dd7e24850d8ff818b512146ff3451e499a8a07c6 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Mon, 24 Jul 2023 13:58:06 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=9B=B4=E6=94=B9=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/nginx/default.conf                     |  8 +++---
 resources/assets/js/pages/manage.vue          |  6 ++---
 .../pages/manage/{microapp.vue => apps.vue}   | 27 ++++++++++---------
 resources/assets/js/routes.js                 |  6 ++---
 4 files changed, 23 insertions(+), 24 deletions(-)
 rename resources/assets/js/pages/manage/{microapp.vue => apps.vue} (79%)

diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf
index 7f734abc2..e83c36182 100644
--- a/docker/nginx/default.conf
+++ b/docker/nginx/default.conf
@@ -185,12 +185,10 @@ server {
     }
 
     # OKR
-    location /manage/microapp/okr/ {
-        proxy_pass http://192.168.100.90:5566/;
-    } 
-    location /microapp/okr/api/ {
-        proxy_pass http://192.168.100.90:5566/microapp/okr/api/;
+    location /apps/okr/ {
+        proxy_pass http://192.168.100.88:5566/apps/okr/;
     } 
+   
 }
 
 include /etc/nginx/conf.d/conf.d/*.conf;
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 31d8f3e9b..17bda6689 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -781,11 +781,11 @@ export default {
                     return;
                 case 'okrManage':
                 case 'okrAnalyze':
-                    let query = { url: import.meta.env.VITE_OKR_WEB_URL || "/manage/microapp/okr/" } 
+                    let query = { url: import.meta.env.VITE_OKR_WEB_URL || "/apps/okr/" } 
                     if(path=='okrManage'){
-                        this.goForward({  path: '/manage/microapp/', query });
+                        this.goForward({  path: '/manage/apps/', query });
                     }else{
-                        this.goForward({ path: '/manage/microapp/#/analysis', query });
+                        this.goForward({ path: '/manage/apps/#/analysis', query });
                     }
                     return;
                 case 'logout':
diff --git a/resources/assets/js/pages/manage/microapp.vue b/resources/assets/js/pages/manage/apps.vue
similarity index 79%
rename from resources/assets/js/pages/manage/microapp.vue
rename to resources/assets/js/pages/manage/apps.vue
index 57e2bec01..8c6fdfebb 100644
--- a/resources/assets/js/pages/manage/microapp.vue
+++ b/resources/assets/js/pages/manage/apps.vue
@@ -5,11 +5,12 @@
                 <Loading/>
             </div>
         </transition>
-        <micro-app name='micro-app' v-if="microAppUrl && !loading"
-            :url='microAppUrl' 
+        <micro-app name='micro-app' v-if="appUrl && !loading"
+            :url='appUrl' 
             inline
             destroy
-            :data='microAppData'
+            disableSandbox
+            :data='appData'
             @created='handleCreate'
             @beforemount='handleBeforeMount'
             @mounted='handleMount'
@@ -32,8 +33,8 @@ export default {
     data() {
         return {
             loading: false,
-            microAppUrl: '',
-            microAppData: {}
+            appUrl: '',
+            appData: {}
         }
     },
 
@@ -44,7 +45,7 @@ export default {
     watch: {
         '$route': {
             handler(to) {
-                if( to.name == 'manage-microapp' ){
+                if( to.name == 'manage-apps' ){
                     this.loading = true;
                     this.$nextTick(()=>{
                         this.loading = false;
@@ -52,7 +53,7 @@ export default {
                         if( url.indexOf('http') == -1 ){
                             url = window.location.origin + url
                         }
-                        this.microAppUrl =url
+                        this.appUrl = url
                         window.eventCenterForAppNameVite = new EventCenterForMicroApp("micro-app")
                     })
                 }
@@ -70,13 +71,13 @@ export default {
 
     methods: {
         handleCreate(e) {
-            console.log("子应用创建了",e)
+            // console.log("子应用创建了",e)
         },
         handleBeforeMount(e) {
-            console.log("子应用即将被渲染",e)
+            // console.log("子应用即将被渲染",e)
         },
         handleMount(e) {
-            this.microAppData = { 
+            this.appData = { 
                 type: 'init',
                 vues:{
                     Vue,
@@ -95,13 +96,13 @@ export default {
         },
         handleUnmount(e) {
             this.loading = true;
-            console.log("子应用卸载了",e)
+            // console.log("子应用卸载了",e)
         },
         handleError(e) {
-            console.log("子应用加载出错了",e.detail.error)
+            // console.log("子应用加载出错了",e.detail.error)
         },
         handleDataChange(e) {
-            console.log('来自子应用 child-vite 的数据:', e.detail.data)
+            // console.log('来自子应用 child-vite 的数据:', e.detail.data)
         }
     }
 }
diff --git a/resources/assets/js/routes.js b/resources/assets/js/routes.js
index 36a273a95..76a6cdd58 100755
--- a/resources/assets/js/routes.js
+++ b/resources/assets/js/routes.js
@@ -40,9 +40,9 @@ export default [
                 component: () => import('./pages/manage/approve/details.vue'),
             },
             {
-                name: 'manage-microapp',
-                path: 'microapp/*',
-                component: () => import('./pages/manage/microapp.vue')
+                name: 'manage-apps',
+                path: 'apps/*',
+                component: () => import('./pages/manage/apps.vue')
             },
             {
                 name: 'manage-setting',