From 18f2ebf455f43f2e53ddff8e9e3f4df3116c5d40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Fri, 19 Sep 2025 15:40:47 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=B6=88=E6=81=AF=E8=BD=AC=E5=8F=91):=20?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=BD=AC=E5=8F=91=E9=80=BB=E8=BE=91=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在消息记录和转发模态框中添加了选中聊天记录的更新逻辑，确保转发功能的正确性。同时，简化了转发模态框的参数传递，移除了不必要的回调，提升了用户体验。
---
 .../components/MessageEnter/index.tsx         |  6 ++--
 .../components/TransmitModal/index.tsx        | 35 +++++++++++++------
 .../components/MessageRecord/index.tsx        | 32 ++++-------------
 Touchkebao/src/store/module/weChat/weChat.ts  | 18 +++++++---
 .../src/store/module/websocket/msgManage.ts   |  2 +-
 5 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
index 4b876726..e3073c7e 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
@@ -32,7 +32,9 @@ const MessageEnter: React.FC<MessageEnterProps> = ({ contract }) => {
   const EnterModule = useWeChatStore(state => state.EnterModule);
   const updateShowCheckbox = useWeChatStore(state => state.updateShowCheckbox);
   const updateEnterModule = useWeChatStore(state => state.updateEnterModule);
-
+  const updateTransmitModal = useWeChatStore(
+    state => state.updateTransmitModal,
+  );
   const handleSend = async () => {
     if (!inputValue.trim()) return;
     console.log("发送消息", contract);
@@ -140,7 +142,7 @@ const MessageEnter: React.FC<MessageEnterProps> = ({ contract }) => {
     updateEnterModule("common");
   };
   const handTurnRignt = () => {
-    console.log("转发");
+    updateTransmitModal(true);
   };
 
   return (
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/TransmitModal/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/TransmitModal/index.tsx
index d8aaf440..832ac783 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/TransmitModal/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/components/TransmitModal/index.tsx
@@ -20,12 +20,8 @@ import styles from "./TransmitModal.module.scss";
 import { weChatGroupService, contractService } from "@/utils/db";
 import { useWeChatStore } from "@/store/module/weChat/weChat";
 import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
-
-export interface TransmitModalProps {
-  onConfirm?: (params: (ContractData | weChatGroup)[]) => void; // 可选，因为会自动更新到store
-}
-
-const TransmitModal: React.FC<TransmitModalProps> = ({ onConfirm }) => {
+import { useWebSocketStore } from "@/store/module/websocket/websocket";
+const TransmitModal: React.FC = () => {
   const [searchValue, setSearchValue] = useState("");
   const [allContacts, setAllContacts] = useState<
     (ContractData | weChatGroup)[]
@@ -36,12 +32,19 @@ const TransmitModal: React.FC<TransmitModalProps> = ({ onConfirm }) => {
   const [loading, setLoading] = useState(false);
   const [page, setPage] = useState(1);
   const pageSize = 20;
-
+  const { sendCommand } = useWebSocketStore.getState();
   // 从 Zustand store 获取更新方法
   const openTransmitModal = useWeChatStore(state => state.openTransmitModal);
   const updateTransmitModal = useWeChatStore(
     state => state.updateTransmitModal,
   );
+  const updateSelectedChatRecords = useWeChatStore(
+    state => state.updateSelectedChatRecords,
+  );
+
+  const selectedChatRecords = useWeChatStore(
+    state => state.selectedChatRecords,
+  );
 
   // 加载联系人数据
   const loadContacts = async () => {
@@ -115,8 +118,20 @@ const TransmitModal: React.FC<TransmitModalProps> = ({ onConfirm }) => {
 
   // 确认转发
   const handleConfirm = () => {
-    console.log("handleConfirm", selectedWechatFriend);
-    onConfirm?.(selectedWechatFriend);
+    for (const user of selectedWechatFriend) {
+      for (const record of selectedChatRecords) {
+        const params = {
+          wechatAccountId: user.wechatAccountId,
+          wechatChatroomId: user?.chatroomId ? user.id : 0,
+          wechatFriendId: user?.chatroomId ? 0 : user.id,
+          msgSubType: record.msgSubType,
+          msgType: record.msgType,
+          content: record.content,
+        };
+        sendCommand("CmdSendMessage", params);
+      }
+    }
+    updateSelectedChatRecords([]);
     updateTransmitModal(false);
   };
 
@@ -130,7 +145,7 @@ const TransmitModal: React.FC<TransmitModalProps> = ({ onConfirm }) => {
       title="转发消息"
       open={openTransmitModal}
       onCancel={() => updateTransmitModal(false)}
-      width={800}
+      width={"60%"}
       className={styles.transmitModal}
       footer={[
         <Button key="cancel" onClick={() => updateTransmitModal(false)}>
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
index f68741b6..205d456e 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
@@ -46,7 +46,10 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
     state.kfUserList.find(kf => kf.id === contract.wechatAccountId),
   );
 
-  const openTransmitModal = useWeChatStore(state => state.openTransmitModal);
+  const updateSelectedChatRecords = useWeChatStore(
+    state => state.updateSelectedChatRecords,
+  );
+
   const updateTransmitModal = useWeChatStore(
     state => state.updateTransmitModal,
   );
@@ -514,6 +517,7 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
       // 从选中记录中移除
       setSelectedRecords(prev => prev.filter(record => record.id !== msg.id));
     }
+    updateSelectedChatRecords(selectedRecords);
   };
 
   // 检查消息是否被选中
@@ -663,21 +667,11 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
     loadChatMessages(false, timestamp);
   };
 
-  const handleDeleteMessage = (messageId: string) => {
-    // 删除消息的处理逻辑
-    console.log("删除消息:", messageId);
-  };
-
   const handleForwardMessage = (messageData: ChatRecord) => {
+    updateSelectedChatRecords([messageData]);
     updateTransmitModal(true);
-    // 转发消息的处理逻辑
-    console.log("转发消息:", messageData);
   };
 
-  const handleRetryMessage = (messageData: ChatRecord) => {
-    // 重试发送消息的处理逻辑
-    console.log("重试发送:", messageData);
-  };
   const handRecall = messageData => {
     // 撤回消息的处理逻辑
     fetchReCallApi({
@@ -696,7 +690,6 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
         // 多条转发逻辑
         updateEnterModule(!showCheckbox ? "multipleForwarding" : "common");
         updateShowCheckbox(!showCheckbox);
-
         break;
       case "quote":
         // 引用逻辑
@@ -710,13 +703,6 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
     }
   };
 
-  const handleConfirmTransmit = (
-    selectedContacts: ContractData[] | weChatGroup[],
-  ) => {
-    // 确认转发逻辑
-    console.log("确认转发:", selectedContacts);
-  };
-
   return (
     <div className={styles.messagesContainer}>
       <div className={styles.loadMore} onClick={() => loadMoreMessages()}>
@@ -753,11 +739,7 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
         onCommad={handCommad}
       />
       {/*  转发模态框 */}
-      <TransmitModal
-        onConfirm={(selectedContacts: ContractData[] | weChatGroup[]) =>
-          handleConfirmTransmit(selectedContacts)
-        }
-      />
+      <TransmitModal />
     </div>
   );
 };
diff --git a/Touchkebao/src/store/module/weChat/weChat.ts b/Touchkebao/src/store/module/weChat/weChat.ts
index 6a2d04b4..e9df46b0 100644
--- a/Touchkebao/src/store/module/weChat/weChat.ts
+++ b/Touchkebao/src/store/module/weChat/weChat.ts
@@ -61,9 +61,19 @@ export const useWeChatStore = create<WeChatState>()(
       // ==================== 聊天消息管理方法 ====================
       /** 添加新消息到当前聊天 */
       addMessage: message => {
-        set(state => ({
-          currentMessages: [...state.currentMessages, message],
-        }));
+        const { wechatAccountId, wechatChatroomId, wechatFriendId } = message;
+        const currentContract = get().currentContract;
+        if (currentContract) {
+          if (
+            currentContract.wechatAccountId === wechatAccountId &&
+            (currentContract.id === wechatFriendId ||
+              currentContract.id === wechatChatroomId)
+          ) {
+            set(state => ({
+              currentMessages: [...state.currentMessages, message],
+            }));
+          }
+        }
       },
       /** 更新指定消息内容 */
       updateMessage: (messageId, updates) => {
@@ -126,7 +136,7 @@ export const useWeChatStore = create<WeChatState>()(
       ) => {
         const state = useWeChatStore.getState();
         // 切换联系人时清空当前消息，等待重新加载
-        set({ currentMessages: [] });
+        set({ currentMessages: [], openTransmitModal: false });
         clearUnreadCount([contract.id]).then(() => {
           if (isExist) {
             updateChatSession({ ...contract, unreadCount: 0 });
diff --git a/Touchkebao/src/store/module/websocket/msgManage.ts b/Touchkebao/src/store/module/websocket/msgManage.ts
index beab2fbf..063ee6ce 100644
--- a/Touchkebao/src/store/module/websocket/msgManage.ts
+++ b/Touchkebao/src/store/module/websocket/msgManage.ts
@@ -38,7 +38,7 @@ const messageHandlers: Record<string, MessageHandler> = {
   // 发送消息响应
   CmdSendMessageResp: message => {
     console.log("发送消息响应", message);
-    addMessage(message.friendMessage || message.chatroomMessage);
+    // addMessage(message.friendMessage || message.chatroomMessage);
     // 在这里添加具体的处理逻辑
   },
   CmdSendMessageResult: message => {