移除个别的撤回处理，统一放到全局；新增列表自刷新功能

50e9105f · Sixong.Zhu · d56b1d02 · 50e9105f · 50e9105f · 50e9105f
Commit 50e9105f authored Jan 10, 2022 by Sixong.Zhu
Showing with 52 additions and 43 deletions
components/controller/chat-list.ts
components/message-list.vue
components/message.vue
store/index.ts
--- a/components/controller/chat-list.ts
+++ b/components/controller/chat-list.ts
@@ -7,6 +7,8 @@ import { ChatUserInfoService } from "@/customer-service/utils/user-info";
 @Component({ components: {} })
 export default class ChatList extends Vue {
+    private nextTimer = 0;
    @chatStore.Action(ChatStore.ACTION_GET_MY_CHAT_LIST)
    protected readonly getMyChatList!: ChatStore.ACTION_GET_MY_CHAT_LIST;
@@ -91,4 +93,18 @@ export default class ChatList extends Vue {
        }
        return this.parseMesage(item);
    }
+    /**
+     * 一分钟更新一次会话列表
+     */
+    protected enableAutoRefresh() {
+        this.nextTimer = setTimeout(
+            () => this.getMyChatList().finally(() => this.enableAutoRefresh()),
+            60 * 1000
+        );
+    }
+    beforeDestroy() {
+        clearTimeout(this.nextTimer);
+    }
 }
--- a/components/message-list.vue
+++ b/components/message-list.vue
@@ -190,15 +190,6 @@
        public created() {
            this.handleScrollWrapper();
-            this.onNewMessage((e) => {
-                if (e.type === MessageType.Withdraw) {
-                    const ids = xim.withDrawMsgHandle(e);
-                    this.executeWithDraw(ids);
-                    dbController
-                        .removeMessage(e.chat_id, ids)
-                        .finally(() => this.refresh());
-                }
-            });
        }
        public mounted() {

--- a/components/message.vue
+++ b/components/message.vue
@@ -230,9 +230,6 @@
        @chatStore.State(ChatStore.STATE_CHAT_CURRENT_CHAT_ID)
        private readonly chatId!: ChatStore.STATE_CHAT_CURRENT_CHAT_ID;
-        @chatStore.Mutation(ChatStore.MUTATION_WITHDRAW)
-        private readonly executeWithDraw!: ChatStore.MUTATION_WITHDRAW;
        @chatStore.Action(ChatStore.ACTION_SET_HANDLED)
        private readonly setHandled!: ChatStore.ACTION_SET_HANDLED;
@@ -562,14 +559,7 @@
                    },
                });
            }
-            ximInstance.withdraw(this.chatId, this.data.id).finally(() => {
+            ximInstance.withdraw(this.chatId, this.data.id);
-                dbController
-                    .removeMessage(this.chatId, [this.data.id])
-                    .finally(() => {
-                        this.executeWithDraw([this.data.id]);
-                        this.$emit("withdraw", this.data.id);
-                    });
-            });
        }
        private hoverWithdraw() {

--- a/store/index.ts
+++ b/store/index.ts
@@ -28,22 +28,24 @@ const UniplatChatModelName = "UniplatChat";
 const model = () => Chat.getSdk().model(UniplatChatModelName);
 const orgId = () => Chat.getOrgId() as string;
-function uniqueMessages(
+function combineMessages(
-    messages: NonNullable<ChatStore.STATE_CHAT_MSG_HISTORY>
+    items1: ChatStore.STATE_CHAT_MSG_HISTORY,
+    items2: ChatStore.STATE_CHAT_MSG_HISTORY,
+    chat: number
 ) {
-    const arr = [...messages];
+    const set = new Set<number>();
-    return unique(arr, function(item, all) {
+    const items: Message[] = [];
-        return all.findIndex((k) => k.id === item.id);
+    for (const item of [...items1, ...items2]) {
-    });
+        if (item.chat_id !== chat) {
-}
+            continue;
+        }
-function filterMessages(
+        const id = item.id;
-    messages: NonNullable<ChatStore.STATE_CHAT_MSG_HISTORY>,
+        if (!set.has(id)) {
-    chatid: number
+            set.add(id);
-) {
+            items.push(item);
-    return uniqueMessages(Array.from(messages)).filter(
+        }
-        (k) => k.chat_id === chatid
+    }
-    );
+    return items.sort((x, y) => (x.id - y.id ? 1 : -1));
 }
 let removeRegisterChatEvents: (() => void)[] = [];
@@ -237,7 +239,7 @@ export default {
                    ? newItems.filter((i) => !withdraw.includes(i.id))
                    : newItems;
                state[ChatStore.STATE_CHAT_MSG_HISTORY] = Object.freeze(
-                    filterMessages([...old, ...filterout], chatid)
+                    combineMessages(old, filterout, chatid)
                );
            }
        },
@@ -274,7 +276,7 @@ export default {
            const chatId = state[ChatStore.STATE_CHAT_CURRENT_CHAT_ID];
            if (!chatId) return;
            state[ChatStore.STATE_CHAT_MSG_HISTORY] = Object.freeze(
-                filterMessages([...(data || []), ...old], chatId)
+                combineMessages(data || [], old, chatId)
            );
        },
        [ChatStore.MUTATION_SAVE_CURRENT_CHAT_MEMBERS](
@@ -374,7 +376,7 @@ export default {
                state[ChatStore.STATE_CHAT_SENDING_MESSAGES] = [...current];
            }
        },
-        [ChatStore.MUTATION_SAVE_CURRENT_CHAT_INPUTING]: (function() {
+        [ChatStore.MUTATION_SAVE_CURRENT_CHAT_INPUTING]: (function () {
            const setTimeoutId: { [key: string]: number } = {};
            return (
                state: ChatStoreState,
@@ -588,11 +590,17 @@ export default {
                .updateChat4UnreadCount(p.chat, p.unread)
                .then(() =>
                    dispatch(ChatStore.ACTION_REBUILD_UNREAD_MESSAGE_COUNT)
-                ).finally(() => {
+                )
+                .finally(() => {
                    if (!p.unread) {
-                        const messages = state[ChatStore.STATE_CHAT_MSG_HISTORY];
+                        const messages =
+                            state[ChatStore.STATE_CHAT_MSG_HISTORY];
                        if (messages && messages.length) {
-                            xim.setRead(p.chat, messages[0].id, messages[messages.length - 1].id);
+                            xim.setRead(
+                                p.chat,
+                                messages[0].id,
+                                messages[messages.length - 1].id
+                            );
                        }
                    }
                });
@@ -770,7 +778,11 @@ export default {
            const chatId = state[ChatStore.STATE_CHAT_CURRENT_CHAT_ID];
            const onNewMsg = (e: Message) => {
                const thenAction = () => {
-                    if (e.type === MessageType.Withdraw) {
+                    if (
+                        e.type === MessageType.Withdraw &&
+                        // 这里再取一次当前chatId避免数据和当前不一致
+                        e.chat_id === state[ChatStore.STATE_CHAT_CURRENT_CHAT_ID]
+                    ) {
                        commit(
                            ChatStore.MUTATION_WITHDRAW,
                            xim.withDrawMsgHandle(e)
@@ -981,7 +993,7 @@ export default {
            commit(
                ChatStore.MUTATION_SAVE_CURRENT_CHAT_MEMBERS,
-                unique(newChatMembers, function(item, all) {
+                unique(newChatMembers, function (item, all) {
                    return all.findIndex((k) => k.eid === item.eid);
                })
            );