From 64c75772bb9080d9336fd45eab3d9833e308795d 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?= Date: Mon, 1 Sep 2025 10:24:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E5=BA=93):=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=92=8C=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit refactor(聊天会话): 根据选中客服过滤会话列表 fix(聊天窗口): 移除重复的未读消息清除逻辑 refactor(侧边栏): 统一联系人点击处理逻辑 chore: 删除无用的数据库测试文件 --- .../pc/ckbox/components/ChatWindow/index.tsx | 45 +++--- .../SidebarMenu/MessageList/index.tsx | 6 +- .../pc/ckbox/components/SidebarMenu/index.tsx | 8 +- .../components/VerticalUserList/index.tsx | 16 -- Cunkebao/src/pages/pc/ckbox/index.tsx | 10 +- Cunkebao/src/store/module/ckchat/ckchat.ts | 10 +- Cunkebao/src/utils/db-test.ts | 146 ------------------ Cunkebao/src/utils/db.ts | 12 ++ 8 files changed, 54 insertions(+), 199 deletions(-) delete mode 100644 Cunkebao/src/utils/db-test.ts diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx index cdb1ca41..063d4545 100644 --- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx +++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx @@ -36,7 +36,7 @@ import { StarOutlined, } from "@ant-design/icons"; import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data"; -import { clearUnreadCount, getMessages } from "@/pages/pc/ckbox/api"; +import { getMessages } from "@/pages/pc/ckbox/api"; import styles from "./ChatWindow.module.scss"; import { useWebSocketStore, WebSocketMessage } from "@/store/module/websocket"; import { formatWechatTime } from "@/utils/common"; @@ -68,30 +68,27 @@ const ChatWindow: React.FC = ({ >({}); const messagesEndRef = useRef(null); - const getKfSelectedUser = useCkChatStore(state => state.getKfSelectedUser()); useEffect(() => { - clearUnreadCount([contract.id]).then(() => { - setLoading(true); - const params: any = { - wechatAccountId: contract.wechatAccountId, - From: 1, - To: +new Date() + 1000, - Count: 100, - olderData: true, - }; - if (contract.groupId == 1) { - params.wechatFriendId = contract.id; - } else { - params.wechatChatroomId = contract.id; - } - getMessages(params) - .then(msg => { - setMessages(msg); - }) - .finally(() => { - setLoading(false); - }); - }); + setLoading(true); + const params: any = { + wechatAccountId: contract.wechatAccountId, + From: 1, + To: +new Date() + 1000, + Count: 100, + olderData: true, + }; + if (contract.groupId == 1) { + params.wechatFriendId = contract.id; + } else { + params.wechatChatroomId = contract.id; + } + getMessages(params) + .then(msg => { + setMessages(msg); + }) + .finally(() => { + setLoading(false); + }); }, [contract.id]); useEffect(() => { diff --git a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx index 7b11aa93..877b9c9e 100644 --- a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx +++ b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx @@ -7,13 +7,13 @@ import { formatWechatTime } from "@/utils/common"; interface MessageListProps { chatSessions: ContractData[] | weChatGroup[]; currentChat: ContractData | weChatGroup; - onChatSelect: (chat: ContractData | weChatGroup) => void; + onContactClick: (chat: ContractData | weChatGroup) => void; } const MessageList: React.FC = ({ chatSessions, currentChat, - onChatSelect, + onContactClick, }) => { return (
@@ -25,7 +25,7 @@ const MessageList: React.FC = ({ className={`${styles.messageItem} ${ currentChat?.id === session.id ? styles.active : "" }`} - onClick={() => onChatSelect(session)} + onClick={() => onContactClick(session)} >
diff --git a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/index.tsx index d948ff83..31f23035 100644 --- a/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/index.tsx +++ b/Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/index.tsx @@ -10,13 +10,12 @@ import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data"; import WechatFriends from "./WechatFriends"; import MessageList from "./MessageList/index"; import styles from "./SidebarMenu.module.scss"; -import { getChatSessions } from "@/store/module/ckchat/ckchat"; +import { useCkChatStore } from "@/store/module/ckchat/ckchat"; interface SidebarMenuProps { contracts: ContractData[] | weChatGroup[]; currentChat: ContractData | weChatGroup; onContactClick: (contract: ContractData | weChatGroup) => void; - onChatSelect: (chat: ContractData | weChatGroup) => void; loading?: boolean; } @@ -24,10 +23,9 @@ const SidebarMenu: React.FC = ({ contracts, currentChat, onContactClick, - onChatSelect, loading = false, }) => { - const chatSessions = getChatSessions(); + const chatSessions = useCkChatStore(state => state.getChatSessions()); const [searchText, setSearchText] = useState(""); const [activeTab, setActiveTab] = useState("chats"); @@ -145,7 +143,7 @@ const SidebarMenu: React.FC = ({ return ( ); diff --git a/Cunkebao/src/pages/pc/ckbox/components/VerticalUserList/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/VerticalUserList/index.tsx index b0c28db0..478313ac 100644 --- a/Cunkebao/src/pages/pc/ckbox/components/VerticalUserList/index.tsx +++ b/Cunkebao/src/pages/pc/ckbox/components/VerticalUserList/index.tsx @@ -16,22 +16,6 @@ const VerticalUserList: React.FC = () => { }; const kfUserList = useCkChatStore(state => state.kfUserList); const kfSelected = useCkChatStore(state => state.kfSelected); - const [kefuList, setKefuList] = useState([]); - - // // 获取客服列表数据 - // useEffect(() => { - // const fetchKfUserList = async () => { - // try { - // const data = await getkfUserList(); - // setKefuList(data || []); - // } catch (error) { - // console.error("获取客服列表失败:", error); - // setKefuList([]); - // } - // }; - - // fetchKfUserList(); - // }, [getkfUserList]); return (
{ }); }, []); + //开始开启聊天 const handleContactClick = (contract: ContractData | weChatGroup) => { - addChatSession(contract); - setCurrentChat(contract); + clearUnreadCount([contract.id]).then(() => { + contract.unreadCount = 0; + addChatSession(contract); + setCurrentChat(contract); + }); }; const handleSendMessage = async (message: string) => { @@ -107,7 +112,6 @@ const CkboxPage: React.FC = () => { contracts={contracts} currentChat={currentChat} onContactClick={handleContactClick} - onChatSelect={setCurrentChat} loading={loading} /> diff --git a/Cunkebao/src/store/module/ckchat/ckchat.ts b/Cunkebao/src/store/module/ckchat/ckchat.ts index a827d933..a4810c99 100644 --- a/Cunkebao/src/store/module/ckchat/ckchat.ts +++ b/Cunkebao/src/store/module/ckchat/ckchat.ts @@ -16,7 +16,7 @@ export const useCkChatStore = createPersistStore( chatSessions: [], //聊天会话 kfUserList: [], //客服列表 newContractList: [], //联系人分组 - kfSelected: 0, + kfSelected: 0, //选中的客服 //客服列表 asyncKfUserList: async data => { set({ kfUserList: data }); @@ -80,7 +80,13 @@ export const useCkChatStore = createPersistStore( // 获取聊天会话 getChatSessions: () => { const state = useCkChatStore.getState(); - return state.chatSessions; + if (state.kfSelected != 0) { + return state.chatSessions.filter( + item => item.wechatAccountId === state.kfSelected, + ); + } else { + return state.chatSessions; + } }, // 添加聊天会话 addChatSession: (session: ContractData | weChatGroup) => { diff --git a/Cunkebao/src/utils/db-test.ts b/Cunkebao/src/utils/db-test.ts deleted file mode 100644 index 3a84f3b9..00000000 --- a/Cunkebao/src/utils/db-test.ts +++ /dev/null @@ -1,146 +0,0 @@ -/** - * 数据库版本升级测试脚本 - * 用于验证数据库版本升级逻辑是否正常工作 - */ - -import { db } from "./db"; - -// 重置数据库（完全删除并重新创建） -export async function resetDatabase() { - try { - console.log("开始重置数据库..."); - - // 关闭数据库连接 - if (db.isOpen()) { - db.close(); - } - - // 删除数据库 - await db.delete(); - console.log("旧数据库已删除"); - - // 重新打开数据库（这会创建新的数据库） - await db.open(); - - console.log("数据库重置成功！"); - console.log("当前数据库版本:", db.verno); - console.log("数据库名称:", db.name); - - return { - success: true, - version: db.verno, - tables: db.tables.map(table => table.name), - message: "数据库重置成功", - }; - } catch (error) { - console.error("数据库重置失败:", error); - return { - success: false, - error: error instanceof Error ? error.message : String(error), - message: "数据库重置失败", - }; - } -} - -// 测试数据库初始化和版本升级 -export async function testDatabaseUpgrade() { - try { - console.log("开始测试数据库初始化..."); - - // 首先尝试正常打开数据库 - try { - await db.open(); - } catch (upgradeError) { - // 如果遇到升级错误，尝试重置数据库 - if ( - upgradeError.message && - upgradeError.message.includes("primary key") - ) { - console.log("检测到主键冲突，尝试重置数据库..."); - const resetResult = await resetDatabase(); - if (!resetResult.success) { - throw new Error(`数据库重置失败: ${resetResult.error}`); - } - } else { - throw upgradeError; - } - } - - console.log("数据库初始化成功！"); - console.log("当前数据库版本:", db.verno); - console.log("数据库名称:", db.name); - - // 检查表是否存在 - const tables = db.tables.map(table => table.name); - console.log("数据库表:", tables); - - // 测试基本操作 - const testData = { - tenantId: 1, // 修正为number类型 - wechatId: "test-wechat-id", - nickname: "测试用户", - alias: "测试别名", - }; - - // 测试创建数据 - const userId = await db.kfUsers.add({ - ...testData, - id: 0, // 添加必需的id字段 - currentDeviceId: 0, - isDeleted: false, - deleteTime: "", - groupId: 0, - memo: "", // 备注信息 - wechatVersion: "", - labels: [], - lastUpdateTime: new Date().toISOString(), // 修复语法错误，使用字符串类型 - serverId: "test-server-id-001", // 提供有意义的测试值 - // 移除不属于KfUserListData接口的字段 - signature: "", - bindQQ: "", - bindEmail: "", - bindMobile: "", - bindWeixin: "", - bindAlipay: "", - bindTaobao: "", - bindJd: "", - bindDouyin: "", - bindKuaishou: "", - bindBilibili: "", - avatar: "", - gender: 0, - region: "", - createTime: new Date().toISOString(), // 使用字符串类型 - }); - console.log("创建测试用户成功，ID:", userId); - - // 测试查询数据 - const user = await db.kfUsers.get(userId); - console.log("查询测试用户:", user); - - // 清理测试数据 - await db.kfUsers.delete(userId); - console.log("清理测试数据完成"); - - return { - success: true, - version: db.verno, - tables: tables, - message: "数据库版本升级测试通过", - }; - } catch (error) { - console.error("数据库测试失败:", error); - return { - success: false, - error: error instanceof Error ? error.message : String(error), - message: "数据库版本升级测试失败", - }; - } -} - -// 如果直接运行此文件，执行测试 -if (typeof window === "undefined") { - testDatabaseUpgrade().then(result => { - console.log("测试结果:", result); - }); -} diff --git a/Cunkebao/src/utils/db.ts b/Cunkebao/src/utils/db.ts index 3257fae1..7e10afa8 100644 --- a/Cunkebao/src/utils/db.ts +++ b/Cunkebao/src/utils/db.ts @@ -57,12 +57,24 @@ export interface NewContactListData { weChatGroup: weChatGroup[]; } +// 消息列表数据接口 +export interface MessageListData extends Omit { + serverId: number | string; // 服务器ID作为主键 + id?: number; // 接口数据的原始ID字段 + wechatAccountId: number; // 微信账号ID + chatroomAvatar?: string; // 群头像 + chatroomName?: string; // 群名称 + chatroomId?: number; // 群ID + [key: string]: any; +} + // 数据库类 class CunkebaoDatabase extends Dexie { kfUsers!: Table; weChatGroup!: Table; contracts!: Table; newContractList!: Table; + messageList!: Table; constructor() { super("CunkebaoDatabase");