From bbb73544ea96376d120a38f38101bb8fd494517c Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 23 Jun 2021 00:06:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BC=98=E5=8C=96=E8=81=8A?=
 =?UTF-8?q?=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/DialogController.php | 13 +++++----
 .../js/pages/manage/components/DialogView.vue | 26 +++++++++++++----
 .../pages/manage/components/DialogWrapper.vue |  2 +-
 .../pages/manage/components/ProjectDialog.vue |  5 ++--
 .../js/pages/manage/components/TaskDetail.vue | 14 +++++++--
 .../assets/js/pages/manage/messenger.vue      |  3 +-
 resources/assets/js/store/actions.js          | 29 ++++++++++---------
 resources/assets/js/store/getters.js          |  3 +-
 resources/assets/js/store/state.js            |  7 ++---
 9 files changed, 65 insertions(+), 37 deletions(-)

diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php
index 0ca910b0..4c1f2fe5 100755
--- a/app/Http/Controllers/Api/DialogController.php
+++ b/app/Http/Controllers/Api/DialogController.php
@@ -107,16 +107,17 @@ class DialogController extends AbstractController
         //
         $list = WebSocketDialogMsg::whereDialogId($dialog_id)->orderByDesc('id')->paginate(Base::getPaginate(100, 50));
         $list->transform(function (WebSocketDialogMsg $item) use ($user) {
-            $item->r = $item->userid === $user->userid ? null : WebSocketDialogMsgRead::whereMsgId($item->id)->whereUserid($user->userid)->first();
+            $item->is_read = $item->userid === $user->userid || WebSocketDialogMsgRead::whereMsgId($item->id)->whereUserid($user->userid)->value('read_at');
             return $item;
         });
         //
         $data = $list->toArray();
-        $data['dialog'] = WebSocketDialog::formatData($dialog, $user->userid);
-        //
-        $user->dialog_id = $dialog->id;
-        $user->save();
-        //
+        if ($list->currentPage() === 1) {
+            $data['dialog'] = WebSocketDialog::formatData($dialog, $user->userid);
+            //
+            $user->dialog_id = $dialog->id;
+            $user->save();
+        }
         return Base::retSuccess('success', $data);
     }
 
diff --git a/resources/assets/js/pages/manage/components/DialogView.vue b/resources/assets/js/pages/manage/components/DialogView.vue
index f530495a..eebc529e 100644
--- a/resources/assets/js/pages/manage/components/DialogView.vue
+++ b/resources/assets/js/pages/manage/components/DialogView.vue
@@ -53,7 +53,6 @@
 </template>
 
 <script>
-import {mapState} from "vuex";
 import WCircle from "../../../components/WCircle";
 
 export default {
@@ -78,9 +77,11 @@ export default {
         }
     },
 
-    computed: {
-        ...mapState(['userId']),
+    activated() {
+        this.msgRead()
+    },
 
+    computed: {
         readList() {
             return this.read_list.filter(({read_at}) => read_at)
         },
@@ -92,14 +93,29 @@ export default {
 
     watch: {
         msgData: {
-            handler(data) {
-                this.$store.dispatch("dialogMsgRead", data);
+            handler() {
+                this.msgRead();
             },
             immediate: true,
         }
     },
 
     methods: {
+        msgRead() {
+            if (this.msgData._r === true) {
+                return;
+            }
+            this.msgData._r = true;
+            //
+            this.$nextTick(() => {
+                if (!this.$el.offsetParent) {
+                    this.msgData._r = false;
+                    return
+                }
+                this.$store.dispatch("dialogMsgRead", this.msgData);
+            })
+        },
+
         popperShow() {
             this.$store.dispatch("call", {
                 url: 'dialog/msg/readlist',
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 678216b7..da33881c 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -356,7 +356,7 @@ export default {
 
         loadNextPage() {
             let topId = this.dialogMsgList[0].id;
-            this.$store.dispatch('getDialogMsgNextPage').then(() => {
+            this.$store.dispatch('getDialogMsgNextPage', this.dialogId).then(() => {
                 this.$nextTick(() => {
                     this.topId = topId;
                     let dom = document.getElementById("view_" + topId);
diff --git a/resources/assets/js/pages/manage/components/ProjectDialog.vue b/resources/assets/js/pages/manage/components/ProjectDialog.vue
index c8215ba8..3ec87339 100644
--- a/resources/assets/js/pages/manage/components/ProjectDialog.vue
+++ b/resources/assets/js/pages/manage/components/ProjectDialog.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="project-dialog">
-        <DialogWrapper :dialog-id="projectData.dialog_id" class="project-dialog-wrapper">
+        <DialogWrapper v-if="dialogs.length > 0" :dialog-id="projectData.dialog_id" class="project-dialog-wrapper">
             <div slot="head">
                 <div class="dialog-user">
                     <div class="member-head">
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import {mapGetters} from "vuex";
+import {mapGetters, mapState} from "vuex";
 import DialogWrapper from "./DialogWrapper";
 
 export default {
@@ -35,6 +35,7 @@ export default {
     },
 
     computed: {
+        ...mapState(['dialogs']),
         ...mapGetters(['projectData'])
     },
 }
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 5c3af86c..8853bb9a 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -332,7 +332,7 @@
         </div>
         <div class="task-dialog" :style="dialogStyle">
             <template v-if="taskDetail.dialog_id > 0">
-                <DialogWrapper ref="dialog" :dialog-id="taskDetail.dialog_id">
+                <DialogWrapper ref="dialog" v-if="dialogs.length" :dialog-id="taskDetail.dialog_id">
                     <div slot="head" class="head">
                         <Icon class="icon" type="ios-chatbubbles-outline" />
                         <div class="nav">
@@ -466,7 +466,17 @@ export default {
     },
 
     computed: {
-        ...mapState(['userId', 'projects', 'columns', 'taskId', 'taskSubs', 'taskContents', 'taskFiles', 'taskPriority']),
+        ...mapState([
+            'userId',
+            'projects',
+            'columns',
+            'taskId',
+            'taskSubs',
+            'taskContents',
+            'taskFiles',
+            'taskPriority',
+            'dialogs'
+        ]),
 
         projectName() {
             if (!this.taskDetail.project_id) {
diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
index f13b9311..44cece08 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -60,7 +60,7 @@
             </div>
 
             <div class="messenger-msg">
-                <DialogWrapper v-if="dialogId > 0" :dialogId="dialogId" @on-active="scrollIntoActive"/>
+                <DialogWrapper v-if="dialogs.length > 0 && dialogId > 0" :dialogId="dialogId" @on-active="scrollIntoActive"/>
                 <div v-else class="dialog-no">
                     <div class="dialog-no-icon"><Icon type="ios-chatbubbles" /></div>
                     <div class="dialog-no-text">{{$L('选择一个会话开始聊天')}}</div>
@@ -96,7 +96,6 @@ export default {
     },
 
     activated() {
-        this.$store.dispatch("getDialogs");
         this.openDialogStorage();
     },
 
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index b5b583d6..c0b7168f 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -1080,7 +1080,7 @@ export default {
      * @param dialog_id
      */
     getDialogMsgs({state, dispatch}, dialog_id) {
-        const dialog = state.dialogs.filter(({id}) => id == dialog_id);
+        const dialog = state.dialogs.find(({id}) => id == dialog_id);
         if (!dialog) {
             return;
         }
@@ -1099,11 +1099,14 @@ export default {
             },
         }).then(result => {
             dialog.loading = false;
+            dialog.currentPage = result.data.current_page;
+            dialog.hasMorePages = !!result.data.next_page_url;
             const ids = result.data.data.map(({id}) => id)
             if (ids.length == 0) {
                 return;
             }
             state.dialogMsgs = state.dialogMsgs.filter((item) => item.dialog_id != dialog_id || ids.includes(item.id));
+            dispatch("saveDialog", result.data.dialog);
             dispatch("saveDialogMsg", result.data.data);
         }).catch(e => {
             console.error(e);
@@ -1119,7 +1122,7 @@ export default {
      */
     getDialogMsgNextPage({state, dispatch}, dialog_id) {
         return new Promise(function (resolve, reject) {
-            const dialog = state.dialogs.filter(({id}) => id == dialog_id);
+            const dialog = state.dialogs.find(({id}) => id == dialog_id);
             if (!dialog) {
                 return;
             }
@@ -1140,7 +1143,9 @@ export default {
                 },
             }).then(result => {
                 dialog.loading = false;
-                dispatch("saveDialogMsg", result.data);
+                dialog.currentPage = result.data.current_page;
+                dialog.hasMorePages = !!result.data.next_page_url;
+                dispatch("saveDialogMsg", result.data.data);
                 resolve(result)
             }).catch(e => {
                 console.error(e);
@@ -1154,23 +1159,19 @@ export default {
      * 发送已阅消息
      * @param state
      * @param dispatch
-     * @param msgData
+     * @param data
      */
-    dialogMsgRead({state, dispatch}, msgData) {
-        if (msgData.userid == state.userId) return;
-        if (!state.method.isJson(msgData.r)) msgData.r = {};
+    dialogMsgRead({state, dispatch}, data) {
+        if (data.userid == state.userId) return;
+        if (data.is_read === true) return;
+        data.is_read = true;
         //
-        const {id, dialog_id, r} = msgData;
-        if (r.read_at) {
-            return;
-        }
-        r.read_at = state.method.formatDate('Y-m-d H:i:s');
-        let dialog = state.dialogs.find(({id}) => id == dialog_id);
+        let dialog = state.dialogs.find(({id}) => id == data.dialog_id);
         if (dialog && dialog.unread > 0) {
             dialog.unread--
         }
         //
-        state.wsReadWaitList.push(id);
+        state.wsReadWaitList.push(data.id);
         clearTimeout(state.wsReadTimeout);
         state.wsReadTimeout = setTimeout(() => {
             dispatch("websocketSend", {
diff --git a/resources/assets/js/store/getters.js b/resources/assets/js/store/getters.js
index a965c55e..fb83b439 100644
--- a/resources/assets/js/store/getters.js
+++ b/resources/assets/js/store/getters.js
@@ -30,7 +30,8 @@ export default {
             }
         }
         return {
-            columns: []
+            columns: [],
+            project_user: []
         };
     },
 
diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js
index e8b20e92..4c88f5d6 100644
--- a/resources/assets/js/store/state.js
+++ b/resources/assets/js/store/state.js
@@ -131,8 +131,6 @@ const method = {
         let keyName = '__state__';
         if (key.substring(0, 5) === 'cache') {
             keyName = '__state:' + key + '__';
-        } else if (key.substring(0, 7) === 'boolean') {
-            keyName = '__state:Boolean__';
         }
         if (typeof value === 'undefined') {
             return this.loadFromlLocal(key, '', keyName);
@@ -228,13 +226,14 @@ const state = { method };
 
 // 数据缓存
 state.cacheUserBasic = state.method.getStorageJson("cacheUserBasic");
-state.cacheDialogMsg = state.method.getStorageJson("cacheDialogMsg");
+state.cacheDialogs = state.method.getStorageArray("cacheDialogs");
+state.cacheDialogMsgs = state.method.getStorageArray("cacheDialogMsgs");
 state.cacheProjects = state.method.getStorageArray("cacheProjects");
 state.cacheColumns = state.method.getStorageArray("cacheColumns");
 state.cacheTasks = state.method.getStorageArray("cacheTasks");
 state.cacheTaskSubs = state.method.getStorageArray("cacheTaskSubs");
 state.cacheTablePanel = state.method.getStorageArray("cacheTablePanel");
-state.showCompletedTask = state.method.getStorageBoolean("boolean:showCompletedTask")
+state.showCompletedTask = state.method.getStorageBoolean("showCompletedTask")
 
 // Ajax
 state.ajaxLoadNum = 0;