From 66b9e7e9b3755c8912f25f0b44565300fc5f8a81 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Mon, 11 Dec 2023 15:17:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=20okr1.1=20=E5=85=BC=E5=AE=B9=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/components/MicroApps.vue | 25 ++++++------
 resources/assets/js/pages/manage/apps.vue    |  2 +-
 resources/assets/js/pages/single/apps.vue    | 42 ++++++++++++++++++++
 resources/assets/js/routes.js                |  5 +++
 4 files changed, 61 insertions(+), 13 deletions(-)
 create mode 100644 resources/assets/js/pages/single/apps.vue

diff --git a/resources/assets/js/components/MicroApps.vue b/resources/assets/js/components/MicroApps.vue
index 77eabf74c..f58dfd748 100644
--- a/resources/assets/js/components/MicroApps.vue
+++ b/resources/assets/js/components/MicroApps.vue
@@ -5,18 +5,18 @@
                 <Loading/>
             </div>
         </transition>
-        <micro-app v-if="url && !loading" 
-            :name='name' 
-            :url='url' 
-            inline 
+        <micro-app v-if="url && !loading"
+            :name='name'
+            :url='url'
+            inline
             keep-alive
-            disableSandbox 
+            disableSandbox
             :data='appData'
-            @created='handleCreate' 
-            @beforemount='handleBeforeMount' 
-            @mounted='handleMount' 
+            @created='handleCreate'
+            @beforemount='handleBeforeMount'
+            @mounted='handleMount'
             @unmount='handleUnmount'
-            @error='handleError' 
+            @error='handleError'
             @datachange='handleDataChange'
         ></micro-app>
     </div>
@@ -94,7 +94,7 @@ export default {
         },
         '$route': {
             handler(to) {
-                if(to.name == 'manage-apps'){
+                if(to.name == 'manage-apps' || to.name == 'single-apps'){
                     this.appData = {
                         path: to.hash || to.fullPath
                     }
@@ -136,7 +136,8 @@ export default {
                     languageType,
                 },
                 userInfo: this.userInfo,
-                path: this.path
+                path: this.path,
+                electron: this.$Electron
             }
         }
     },
@@ -172,4 +173,4 @@ export default {
         }
     }
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/assets/js/pages/manage/apps.vue b/resources/assets/js/pages/manage/apps.vue
index 7ac47c203..9452cbe3c 100644
--- a/resources/assets/js/pages/manage/apps.vue
+++ b/resources/assets/js/pages/manage/apps.vue
@@ -37,4 +37,4 @@ export default {
         }
     }
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/assets/js/pages/single/apps.vue b/resources/assets/js/pages/single/apps.vue
new file mode 100644
index 000000000..564402c4b
--- /dev/null
+++ b/resources/assets/js/pages/single/apps.vue
@@ -0,0 +1,42 @@
+<template>
+    <div class="electron-single-micro-apps">
+        <MicroApps :url="appUrl" :path="path" v-if="!loading && $route.name == 'single-apps'" />
+    </div>
+</template>
+
+<script>
+import MicroApps from "../../components/MicroApps.vue";
+
+export default {
+    components: { MicroApps },
+    data() {
+        return {
+            loading: false,
+            appUrl: '',
+            path: '',
+        }
+    },
+
+    deactivated() {
+        this.loading = true;
+    },
+
+    watch: {
+        '$route': {
+            handler(to) {
+                this.loading = true;
+                if (to.name == 'single-apps') {
+                    this.$nextTick(() => {
+                        this.loading = false;
+                        this.appUrl = import.meta.env.VITE_OKR_WEB_URL || $A.apiUrl("../apps/okr")
+                        this.path = this.$route.query.path || '';
+                    })
+                }else{
+                    this.appUrl = '';
+                }
+            },
+            immediate: true
+        }
+    }
+}
+</script>
diff --git a/resources/assets/js/routes.js b/resources/assets/js/routes.js
index 4f402a2ab..532c8bb31 100755
--- a/resources/assets/js/routes.js
+++ b/resources/assets/js/routes.js
@@ -148,6 +148,11 @@ export default [
         path: '/single/task/:taskId',
         component: () => import('./pages/single/task.vue'),
     },
+    {
+        name: 'single-apps',
+        path: '/single/apps/*',
+        component: () => import('./pages/single/apps.vue')
+    },
     {
         name: 'valid-email',
         path: '/single/valid/email',