From b8eab81ad23a22cb718640ecaf3cfebaafa212ab Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Mon, 24 Jul 2023 18:13:31 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E8=81=8A=E5=A4=A9=E6=89=93?=
 =?UTF-8?q?=E5=BC=80okr=20-=20=2010%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/pages/manage/apps.vue        |  5 +++--
 .../js/pages/manage/components/DialogWrapper.vue | 16 +++++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/resources/assets/js/pages/manage/apps.vue b/resources/assets/js/pages/manage/apps.vue
index 8c6fdfebb..7b2783c7c 100644
--- a/resources/assets/js/pages/manage/apps.vue
+++ b/resources/assets/js/pages/manage/apps.vue
@@ -10,6 +10,7 @@
             inline
             destroy
             disableSandbox
+            keep-alive
             :data='appData'
             @created='handleCreate'
             @beforemount='handleBeforeMount'
@@ -71,7 +72,7 @@ export default {
 
     methods: {
         handleCreate(e) {
-            // console.log("子应用创建了",e)
+            console.log("子应用创建了",e)
         },
         handleBeforeMount(e) {
             // console.log("子应用即将被渲染",e)
@@ -96,7 +97,7 @@ export default {
         },
         handleUnmount(e) {
             this.loading = true;
-            // console.log("子应用卸载了",e)
+            console.log("子应用卸载了",e)
         },
         handleError(e) {
             // console.log("子应用加载出错了",e.detail.error)
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 77508ea24..53ec01ae7 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -651,7 +651,6 @@ export default {
     },
 
     beforeDestroy() {
-        console.log(21123123123123123123)
         this.$store.dispatch('forgetInDialog', this._uid)
         this.$store.dispatch('closeDialog', this.dialogId)
     },
@@ -1798,6 +1797,17 @@ export default {
             this.$store.dispatch("openTask", this.dialogData.group_info.id);
         },
 
+        openOkr() {
+            if (!this.dialogData.link_id) {
+                return;
+            }
+            if (this.taskId > 0) {
+                // 如果当前打开着任务窗口则关闭对话窗口
+                this.$store.dispatch("openDialog", 0);
+            }
+            this.$store.dispatch("openTask", this.dialogData.link_id);
+        },
+
         onPrevPage() {
             if (this.prevId === 0) {
                 return
@@ -2150,6 +2160,10 @@ export default {
                     this.openTask()
                     break;
 
+                case 'okr':
+                    this.openOkr()
+                    break;
+
                 default:
                     if (this.loadMsg) {
                         $A.messageWarning("正在加载，请稍后再试...")