From a78437ea72e44d7ab60b782d0941743c88f6a63c Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 14 Jun 2021 12:34:41 +0800
Subject: [PATCH] no message

---
 .../pages/manage/components/DialogWrapper.vue |  2 +-
 .../assets/js/pages/manage/messenger.vue      |  4 +-
 resources/assets/js/store/actions.js          | 46 +++++++++++--------
 resources/assets/js/store/state.js            |  8 ++--
 .../assets/sass/pages/page-messenger.scss     |  1 +
 5 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 60d2c441..519d5be1 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -18,7 +18,7 @@
             static>
             <div ref="manageList" class="dialog-list">
                 <ul>
-                    <li v-if="dialogMsgLoad > 0" class="loading"><Loading/></li>
+                    <li v-if="dialogMsgLoad > 0 && dialogMsgList.length === 0" class="loading"><Loading/></li>
                     <li v-else-if="dialogMsgList.length === 0" class="nothing">{{$L('暂无消息')}}</li>
                     <li v-for="(item, key) in dialogMsgList" :key="key" :class="{self:item.userid == userId}">
                         <div class="dialog-avatar">
diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
index f166d7eb..4c4fd7ab 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -124,12 +124,12 @@ export default {
 
     methods: {
         openDialog(dialog) {
-            this.$store.state.method.setStorage('messengerDialogId', dialog.id)
+            this.$store.state.method.setStorage("messengerDialogId", dialog.id)
             this.$store.dispatch("getDialogMsgList", dialog.id);
         },
 
         openDialogStorage() {
-            let tmpId = this.$store.state.method.getStorageInt('messengerDialogId')
+            let tmpId = this.$store.state.method.getStorageInt("messengerDialogId")
             if (tmpId > 0) {
                 const dialog = this.dialogList.find(({id}) => id === tmpId);
                 dialog && this.openDialog(dialog);
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 8f1725a9..f392861f 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -129,7 +129,7 @@ export default {
      */
     toggleBoolean({state}, key) {
         state[key] = !state[key]
-        state.method.setStorage('boolean:' + key, state[key]);
+        state.method.setStorage("boolean:" + key, state[key]);
     },
 
     /**
@@ -167,10 +167,10 @@ export default {
             state.userId = userInfo.userid;
             state.userToken = userInfo.token;
             state.userIsAdmin = state.method.inArray('admin', userInfo.identity);
-            state.method.setStorage('userInfo', state.userInfo);
-            dispatch('getProjectList');
-            dispatch('getDialogMsgUnread');
-            dispatch('websocketConnection');
+            state.method.setStorage("userInfo", state.userInfo);
+            dispatch("getProjectList");
+            dispatch("getDialogMsgUnread");
+            dispatch("websocketConnection");
             resolve()
         });
     },
@@ -285,7 +285,7 @@ export default {
                 state.projectList.unshift(data);
             }
         }
-        state.method.setStorage("cacheProjectList", state.projectList);
+        state.method.setStorage("cacheProjectList", state.cacheProjectList = state.projectList);
     },
 
     /**
@@ -343,8 +343,9 @@ export default {
         const project = state.cacheProjectList.find(({id}) => id == project_id);
         if (project) {
             state.projectDetail = Object.assign({project_column: [], project_user: []}, project);
+        } else {
+            state.projectDetail.id = project_id;
         }
-        state.projectDetail.id = project_id;
         //
         state.projectLoad++;
         dispatch("call", {
@@ -370,7 +371,7 @@ export default {
         let index = state.projectList.findIndex(({id}) => id == project_id);
         if (index > -1) {
             state.projectList.splice(index, 1);
-            state.method.setStorage("cacheProjectList", state.projectList);
+            state.method.setStorage("cacheProjectList", state.cacheProjectList = state.projectList);
         }
     },
 
@@ -506,6 +507,11 @@ export default {
      * @param task_id
      */
     openTask({state, dispatch}, task_id) {
+        if (state.projectChatShow) {
+            dispatch("toggleBoolean", "projectChatShow");
+        }
+        state.dialogId = 0;
+        //
         let data = {id: task_id};
         state.projectDetail.project_column.some(({project_task}) => {
             const task = project_task.find(({id}) => id === task_id);
@@ -754,7 +760,7 @@ export default {
                 userid,
             },
         }).then(result => {
-            state.method.setStorage('messengerDialogId', result.data.id)
+            state.method.setStorage("messengerDialogId", result.data.id)
             dispatch("getDialogMsgList", result.data.id);
             dispatch("saveDialog", result.data);
         }).catch(result => {
@@ -777,20 +783,20 @@ export default {
         }
         //
         state.dialogMsgList = [];
-        if (state.method.isJson(state.cacheDialogList[dialog_id])) {
-            let length = state.cacheDialogList[dialog_id].data.length;
+        if (state.method.isJson(state.cacheDialogMsg[dialog_id])) {
+            let length = state.cacheDialogMsg[dialog_id].data.length;
             if (length > 50) {
-                state.cacheDialogList[dialog_id].data.splice(0, length - 50);
+                state.cacheDialogMsg[dialog_id].data.splice(0, length - 50);
             }
-            state.dialogDetail = state.cacheDialogList[dialog_id].dialog
-            state.dialogMsgList = state.cacheDialogList[dialog_id].data
+            state.dialogDetail = state.cacheDialogMsg[dialog_id].dialog
+            state.dialogMsgList = state.cacheDialogMsg[dialog_id].data
         }
         state.dialogId = dialog_id;
         //
-        if (state.cacheDialogList[dialog_id + "::load"]) {
+        if (state.cacheDialogMsg[dialog_id + "::load"]) {
             return;
         }
-        state.cacheDialogList[dialog_id + "::load"] = true;
+        state.cacheDialogMsg[dialog_id + "::load"] = true;
         //
         state.dialogMsgLoad++;
         dispatch("call", {
@@ -800,15 +806,15 @@ export default {
             },
         }).then(result => {
             state.dialogMsgLoad--;
-            state.cacheDialogList[dialog_id + "::load"] = false;
+            state.cacheDialogMsg[dialog_id + "::load"] = false;
             const dialog = result.data.dialog;
             const reverse = result.data.data.reverse();
             // 更新缓存
-            state.cacheDialogList[dialog_id] = {
+            state.cacheDialogMsg[dialog_id] = {
                 dialog,
                 data: reverse,
             };
-            state.method.setStorage("cacheDialogList", state.cacheDialogList);
+            state.method.setStorage("cacheDialogMsg", state.cacheDialogMsg);
             // 更新当前会话消息
             if (state.dialogId == dialog_id) {
                 state.dialogDetail = dialog;
@@ -825,7 +831,7 @@ export default {
             dispatch("saveDialog", dialog);
         }).catch(() => {
             state.dialogMsgLoad--;
-            state.cacheDialogList[dialog_id + "::load"] = false;
+            state.cacheDialogMsg[dialog_id + "::load"] = false;
         });
     },
 
diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js
index 1165c4c3..29096401 100644
--- a/resources/assets/js/store/state.js
+++ b/resources/assets/js/store/state.js
@@ -215,7 +215,7 @@ const state = { method };
     'taskUndoneShow',       // 项目面板显示未完成任务
     'taskCompletedShow'     // 项目面板显示已完成任务
 ].forEach((key) => {
-    state[key] = state.method.getStorageBoolean('boolean:' + key, true)
+    state[key] = state.method.getStorageBoolean("boolean:" + key, true)
 })
 
 // ajax
@@ -225,14 +225,14 @@ state.ajaxWsListener = [];
 
 // 数据缓存
 state.cacheUserBasic = state.method.getStorageJson("cacheUserBasic");
-state.cacheDialogList = state.method.getStorageJson("cacheDialogList");
+state.cacheDialogMsg = state.method.getStorageJson("cacheDialogMsg");
 state.cacheProjectList = state.method.getStorageArray("cacheProjectList");
 
 // 会员信息
-state.userInfo = state.method.getStorageJson('userInfo');
+state.userInfo = state.method.getStorageJson("userInfo");
 state.userId = state.userInfo.userid = state.method.runNum(state.userInfo.userid);
 state.userToken = state.userInfo.token;
-state.userIsAdmin = state.method.inArray('admin', state.userInfo.identity);
+state.userIsAdmin = state.method.inArray("admin", state.userInfo.identity);
 state.userOnline = {};
 
 // Websocket
diff --git a/resources/assets/sass/pages/page-messenger.scss b/resources/assets/sass/pages/page-messenger.scss
index 5443833d..9edc3dcf 100644
--- a/resources/assets/sass/pages/page-messenger.scss
+++ b/resources/assets/sass/pages/page-messenger.scss
@@ -227,6 +227,7 @@
             display: flex;
             position: relative;
             .dialog-no {
+                flex: 1;
                 display: flex;
                 flex-direction: column;
                 align-items: center;