From db67d662d1770560dc916e1a9fcfdc9c6011c57a Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Fri, 15 Sep 2023 16:43:24 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A1.okr=E5=85=A8=E5=B1=80=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=AE=A1=E7=90=86=E7=AA=97=E5=8F=A3=E7=9A=84=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E6=98=BE=E7=A4=BA=202.=E8=81=8A=E5=A4=A9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=8F=AA=E7=BC=93=E5=AD=9825=E6=9D=A1=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=203.=E5=AE=A1=E6=89=B9=E4=B8=AD=E5=BF=83-=E4=BB=8E?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=BF=94=E5=9B=9E=E5=8F=96=E6=B6=88=E5=8A=A8?=
 =?UTF-8?q?=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/DialogController.php |  2 +-
 resources/assets/js/app.js                    |  2 --
 .../assets/js/components/Mobile/Back.vue      | 28 +++++++++++++++++++
 .../assets/js/pages/manage/approve/index.vue  |  4 +--
 resources/assets/js/pages/manage/apps.vue     |  4 ++-
 .../pages/manage/components/DialogWrapper.vue |  2 +-
 resources/assets/js/store/actions.js          |  7 +++--
 resources/assets/js/store/state.js            |  3 +-
 8 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php
index 4fec1b3fd..3b6d5c9a6 100755
--- a/app/Http/Controllers/Api/DialogController.php
+++ b/app/Http/Controllers/Api/DialogController.php
@@ -386,7 +386,7 @@ class DialogController extends AbstractController
         $prev_id = intval(Request::input('prev_id'));
         $next_id = intval(Request::input('next_id'));
         $msg_type = trim(Request::input('msg_type'));
-        $take = Base::getPaginate(100, 50, 'take');
+        $take = Base::getPaginate(100, 50);
         $data = [];
         //
         $dialog = WebSocketDialog::checkDialog($dialog_id);
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index 55a7f458e..958a25038 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -143,8 +143,6 @@ Vue.prototype.goBack = function () {
         app.$store.state.routeHistorys.pop();
         const length = app.$store.state.routeHistorys.length;
         app.$store.state.routeHistoryLast = length >= 2 ? app.$store.state.routeHistorys[length - 2] : {};
-    } else if (app.$route.name == 'manage-apps') {
-        app.$router.back();
     } else {
         app.$router.replace({path: '/'}).catch(_ => {});
         app.$store.state.routeHistorys = [];
diff --git a/resources/assets/js/components/Mobile/Back.vue b/resources/assets/js/components/Mobile/Back.vue
index ab00d90c6..57affea68 100644
--- a/resources/assets/js/components/Mobile/Back.vue
+++ b/resources/assets/js/components/Mobile/Back.vue
@@ -7,6 +7,7 @@
 
 <script>
 import {mapState} from "vuex";
+import microApp from '@micro-zoe/micro-app'
 
 export default {
     name: "MobileBack",
@@ -130,10 +131,37 @@ export default {
                     }
                 }
             }
+            // 微应用
+            let microAppIsVisible = false;
+            microApp.setGlobalData({ type:'modalVisible', callback: (appName, isVisible) => {
+                if(isVisible){
+                    microAppIsVisible = true;
+                }
+            }})
+            if(microAppIsVisible){
+                return true;
+            }
+            // 
             return false;
         },
 
         onBack() {
+            // 微应用通知
+            let microAppIsAccept = false;
+            microApp.setGlobalData({
+                type:'route', 
+                action: 'back',
+                route: this.$route,
+                callback: (appName, isAccept) => {
+                    if(isAccept){
+                        microAppIsAccept = true;
+                    }
+                }
+            })
+            if(microAppIsAccept){
+                return;
+            }
+            // 
             if (this.$Modal.removeLast()) {
                 return;
             }
diff --git a/resources/assets/js/pages/manage/approve/index.vue b/resources/assets/js/pages/manage/approve/index.vue
index 9d67cff37..32822c9c8 100644
--- a/resources/assets/js/pages/manage/approve/index.vue
+++ b/resources/assets/js/pages/manage/approve/index.vue
@@ -29,7 +29,7 @@
                 </Button>
             </div>
             
-            <Tabs class="page-approve-tabs" v-if="showType==1" :value="tabsValue" @on-click="tabsClick" size="small">
+            <Tabs class="page-approve-tabs" v-show="showType==1" :value="tabsValue" @on-click="tabsClick" size="small">
                 <TabPane :label="$L('待办') + (unreadTotal > 0 ? ('('+unreadTotal+')') : '')" name="unread" style="height: 100%;">
                     <div class="approve-main-search">
                         <div>
@@ -161,7 +161,7 @@
                 </TabPane>
             </Tabs>
 
-            <ApproveSetting v-else/>
+            <ApproveSetting v-show="showType!=1"/>
 
         </div>
 
diff --git a/resources/assets/js/pages/manage/apps.vue b/resources/assets/js/pages/manage/apps.vue
index 850f975fe..7ac47c203 100644
--- a/resources/assets/js/pages/manage/apps.vue
+++ b/resources/assets/js/pages/manage/apps.vue
@@ -1,5 +1,5 @@
 <template>
-    <MicroApps :url="appUrl" :path="path" v-if="!loading" />
+    <MicroApps :url="appUrl" :path="path" v-if="!loading && $route.name == 'manage-apps'" />
 </template>
 
 <script>
@@ -29,6 +29,8 @@ export default {
                         this.appUrl = import.meta.env.VITE_OKR_WEB_URL || $A.apiUrl("../apps/okr")
                         this.path = this.$route.query.path || '';
                     })
+                }else{
+                    this.appUrl = '';
                 }
             },
             immediate: true
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 568c67573..707ae9cd7 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -157,7 +157,7 @@
             :item-class-add="itemClassAdd"
             :extra-props="{dialogData, operateVisible, operateItem, isMyDialog, msgId}"
             :estimate-size="dialogData.type=='group' ? 105 : 77"
-            :keeps="50"
+            :keeps="25"
             :disabled="scrollDisabled"
             @scroll="onScroll"
             @range="onRange"
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 1442dc685..ae07afdc5 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -2614,7 +2614,7 @@ export default {
             dialog.extra_draft_has = dialog.extra_draft_content ? 1 : 0
         }
         // 关闭会话后只保留会话最后50条数据
-        const retain = 50
+        const retain = 25
         const msgs = state.dialogMsgs.filter(item => item.dialog_id == dialog_id)
         if (msgs.length > retain) {
             const delIds = msgs.sort((a, b) => {
@@ -2781,6 +2781,8 @@ export default {
                 state.dialogMsgs = state.dialogMsgs.filter(({dialog_id}) => dialog_id !== data.dialog_id)
                 $A.IDBSave("dialogMsgs", state.dialogMsgs, 600)
             }
+            // 
+            data.pagesize = 25;
             //
             dispatch("call", {
                 url: 'dialog/msg/list',
@@ -3646,7 +3648,8 @@ export default {
                 });
             }else{
                 state.okrWindow = {
-                    type: 'okrDetails',
+                    type: 'open',
+                    model: 'details',
                     show: true,
                     id: link_id
                 };
diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js
index 6eda1a782..a6a979ecb 100644
--- a/resources/assets/js/store/state.js
+++ b/resources/assets/js/store/state.js
@@ -208,7 +208,8 @@ export default {
 
     // okr窗口
     okrWindow: {
-        type: 'okrDetails',
+        type: 'open',
+        model: 'details',
         id: 0,
         show: false
     }