- {session.displayName || session.username}
+
+ {(() => {
+ const shouldHighlight = (session.matchedField as any) === 'name' && searchKeyword
+ if (shouldHighlight) {
+ console.log('高亮名字:', session.displayName, 'keyword:', searchKeyword)
+ }
+ return shouldHighlight ? (
+
+ ) : (
+ session.displayName || session.username
+ )
+ })()}
+
{timeText}
-
{session.summary || '暂无消息'}
+ {summaryContent}
{session.isMuted &&
}
{session.unreadCount > 0 && (
@@ -411,11 +509,14 @@ const SessionItem = React.memo(function SessionItem({
prevProps.session.displayName === nextProps.session.displayName &&
prevProps.session.avatarUrl === nextProps.session.avatarUrl &&
prevProps.session.summary === nextProps.session.summary &&
+ prevProps.session.matchedField === nextProps.session.matchedField &&
+ prevProps.session.alias === nextProps.session.alias &&
prevProps.session.unreadCount === nextProps.session.unreadCount &&
prevProps.session.lastTimestamp === nextProps.session.lastTimestamp &&
prevProps.session.sortTimestamp === nextProps.session.sortTimestamp &&
prevProps.session.isMuted === nextProps.session.isMuted &&
- prevProps.isActive === nextProps.isActive
+ prevProps.isActive === nextProps.isActive &&
+ prevProps.searchKeyword === nextProps.searchKeyword
)
})
@@ -573,8 +674,9 @@ function ChatPage(props: ChatPageProps) {
// 全局消息搜索
const [showGlobalMsgSearch, setShowGlobalMsgSearch] = useState(false)
const [globalMsgQuery, setGlobalMsgQuery] = useState('')
- const [globalMsgResults, setGlobalMsgResults] = useState
([])
+ const [globalMsgResults, setGlobalMsgResults] = useState([])
const [globalMsgSearching, setGlobalMsgSearching] = useState(false)
+ const pendingInSessionSearchRef = useRef<{ keyword: string; firstMsgTime: number; results: any[] } | null>(null)
// 自定义删除确认对话框
const [deleteConfirm, setDeleteConfirm] = useState<{
@@ -2074,7 +2176,7 @@ function ChatPage(props: ChatPageProps) {
}
// 联系人信息更新队列（防抖批量更新，避免频繁重渲染）
- const contactUpdateQueueRef = useRef>(new Map())
+ const contactUpdateQueueRef = useRef>(new Map())
const contactUpdateTimerRef = useRef(null)
const lastUpdateTimeRef = useRef(0)
@@ -2108,12 +2210,14 @@ function ChatPage(props: ChatPageProps) {
if (update) {
const newDisplayName = update.displayName || session.displayName || session.username
const newAvatarUrl = update.avatarUrl || session.avatarUrl
- if (newDisplayName !== session.displayName || newAvatarUrl !== session.avatarUrl) {
+ const newAlias = update.alias || session.alias
+ if (newDisplayName !== session.displayName || newAvatarUrl !== session.avatarUrl || newAlias !== session.alias) {
hasChanges = true
return {
...session,
displayName: newDisplayName,
- avatarUrl: newAvatarUrl
+ avatarUrl: newAvatarUrl,
+ alias: newAlias
}
}
}
@@ -2145,7 +2249,7 @@ function ChatPage(props: ChatPageProps) {
const dllStart = performance.now()
const result = await window.electronAPI.chat.enrichSessionsContactInfo(usernames) as {
success: boolean
- contacts?: Record
+ contacts?: Record
error?: string
}
const dllTime = performance.now() - dllStart
@@ -2468,6 +2572,46 @@ function ChatPage(props: ChatPageProps) {
pendingSessionLoadRef.current = null
initialLoadRequestedSessionRef.current = null
setIsSessionSwitching(false)
+
+ // 处理从全局搜索跳转过来的情况
+ if (pendingInSessionSearchRef.current) {
+ const { keyword, firstMsgTime, results } = pendingInSessionSearchRef.current
+ pendingInSessionSearchRef.current = null
+
+ setShowInSessionSearch(true)
+ setInSessionQuery(keyword)
+
+ if (firstMsgTime > 0) {
+ handleJumpDateSelect(new Date(firstMsgTime * 1000))
+ }
+
+ // 先获取完整消息，再补充发送者信息
+ const sid = currentSessionId
+ if (sid) {
+ Promise.all(
+ results.map(async (msg: any) => {
+ try {
+ const full = await window.electronAPI.chat.getMessages(sid, 0, 3, msg.createTime, msg.createTime, false)
+ const found = full?.messages?.find((m: any) => m.localId === msg.localId) || msg
+
+ if (found.senderUsername) {
+ const contact = await window.electronAPI.chat.getContact(found.senderUsername)
+ if (contact) {
+ found.senderDisplayName = contact.remark || contact.nickName || found.senderUsername
+ }
+ const avatarData = await window.electronAPI.chat.getContactAvatar(found.senderUsername)
+ if (avatarData?.avatarUrl) {
+ found.senderAvatarUrl = avatarData.avatarUrl
+ }
+ }
+ return found
+ } catch {
+ return msg
+ }
+ })
+ ).then(enriched => setInSessionResults(enriched))
+ }
+ }
}
}
}
@@ -2553,6 +2697,13 @@ function ChatPage(props: ChatPageProps) {
const switchRequestSeq = sessionSwitchRequestSeqRef.current + 1
sessionSwitchRequestSeqRef.current = switchRequestSeq
+ // 清空会话内搜索状态（除非是从全局搜索跳转过来）
+ if (!pendingInSessionSearchRef.current) {
+ setShowInSessionSearch(false)
+ setInSessionQuery('')
+ setInSessionResults([])
+ }
+
setCurrentSession(normalizedSessionId, { preserveMessages: false })
setNoMessageTable(false)
@@ -2561,6 +2712,45 @@ function ChatPage(props: ChatPageProps) {
pendingSessionLoadRef.current = null
initialLoadRequestedSessionRef.current = null
setIsSessionSwitching(false)
+
+ // 处理从全局搜索跳转过来的情况
+ if (pendingInSessionSearchRef.current) {
+ const { keyword, firstMsgTime, results } = pendingInSessionSearchRef.current
+ pendingInSessionSearchRef.current = null
+
+ setShowInSessionSearch(true)
+ setInSessionQuery(keyword)
+
+ if (firstMsgTime > 0) {
+ handleJumpDateSelect(new Date(firstMsgTime * 1000))
+ }
+
+ // 先获取完整消息，再补充发送者信息
+ const sid = normalizedSessionId
+ Promise.all(
+ results.map(async (msg: any) => {
+ try {
+ const full = await window.electronAPI.chat.getMessages(sid, 0, 3, msg.createTime, msg.createTime, false)
+ const found = full?.messages?.find((m: any) => m.localId === msg.localId) || msg
+
+ if (found.senderUsername) {
+ const contact = await window.electronAPI.chat.getContact(found.senderUsername)
+ if (contact) {
+ found.senderDisplayName = contact.remark || contact.nickName || found.senderUsername
+ }
+ const avatarData = await window.electronAPI.chat.getContactAvatar(found.senderUsername)
+ if (avatarData?.avatarUrl) {
+ found.senderAvatarUrl = avatarData.avatarUrl
+ }
+ }
+ return found
+ } catch {
+ return msg
+ }
+ })
+ ).then(enriched => setInSessionResults(enriched))
+ }
+
void refreshSessionIncrementally(normalizedSessionId, switchRequestSeq)
} else {
pendingSessionLoadRef.current = normalizedSessionId
@@ -2639,7 +2829,36 @@ function ChatPage(props: ChatPageProps) {
try {
const res = await window.electronAPI.chat.searchMessages(keyword.trim(), sid, 50, 0)
if (gen !== inSessionSearchGenRef.current) return
- setInSessionResults(res?.messages || [])
+ const messages = res?.messages || []
+
+ // 查询完整消息信息
+ const enriched = await Promise.all(
+ messages.map(async (msg: any) => {
+ try {
+ const full = await window.electronAPI.chat.getMessages(sid, 0, 3, msg.createTime, msg.createTime, false)
+ const found: any = full?.messages?.find((m: any) => m.localId === msg.localId)
+ if (found && found.senderUsername) {
+ try {
+ const contact = await window.electronAPI.chat.getContact(found.senderUsername)
+ if (contact) {
+ found.senderDisplayName = contact.remark || contact.nickName || found.senderUsername
+ }
+ const avatarData = await window.electronAPI.chat.getContactAvatar(found.senderUsername)
+ if (avatarData?.avatarUrl) {
+ found.senderAvatarUrl = avatarData.avatarUrl
+ }
+ } catch {}
+ }
+ return found || msg
+ } catch {
+ return msg
+ }
+ })
+ )
+
+ if (gen !== inSessionSearchGenRef.current) return
+ console.log('补充后:', enriched[0])
+ setInSessionResults(enriched)
} catch {
if (gen !== inSessionSearchGenRef.current) return
setInSessionResults([])
@@ -2683,9 +2902,15 @@ function ChatPage(props: ChatPageProps) {
if (gen !== globalMsgSearchGenRef.current) return
setGlobalMsgSearching(true)
try {
- const res = await window.electronAPI.chat.searchMessages(keyword.trim(), undefined, 50, 0)
+ const results: Array = []
+ for (const session of sessions) {
+ const res = await window.electronAPI.chat.searchMessages(keyword.trim(), session.username, 10, 0)
+ if (res?.messages) {
+ results.push(...res.messages.map(msg => ({ ...msg, sessionId: session.username })))
+ }
+ }
if (gen !== globalMsgSearchGenRef.current) return
- setGlobalMsgResults(res?.messages || [])
+ setGlobalMsgResults(results as any)
} catch {
if (gen !== globalMsgSearchGenRef.current) return
setGlobalMsgResults([])
@@ -3119,11 +3344,24 @@ function ChatPage(props: ChatPageProps) {
return
}
const lower = searchKeyword.toLowerCase()
- setFilteredSessions(visible.filter(s =>
- s.displayName?.toLowerCase().includes(lower) ||
- s.username.toLowerCase().includes(lower) ||
- s.summary.toLowerCase().includes(lower)
- ))
+ setFilteredSessions(visible.filter(s => {
+ const matchedByName = s.displayName?.toLowerCase().includes(lower)
+ const matchedByUsername = s.username.toLowerCase().includes(lower)
+ const matchedByAlias = s.alias?.toLowerCase().includes(lower)
+
+ if (matchedByUsername && !matchedByName && !matchedByAlias) {
+ s.matchedField = 'wxid'
+ } else if (matchedByAlias && !matchedByName && !matchedByUsername) {
+ s.matchedField = 'alias'
+ } else if (matchedByName && !matchedByUsername && !matchedByAlias) {
+ (s as any).matchedField = 'name'
+ console.log('设置 matchedField=name:', s.displayName)
+ } else {
+ s.matchedField = undefined
+ }
+
+ return matchedByName || matchedByUsername || matchedByAlias
+ }))
}, [sessions, searchKeyword, setFilteredSessions])
// 折叠群列表（独立计算，供折叠 panel 使用）
@@ -3132,11 +3370,22 @@ function ChatPage(props: ChatPageProps) {
const folded = sessions.filter(s => s.isFolded)
if (!searchKeyword.trim() || !foldedView) return folded
const lower = searchKeyword.toLowerCase()
- return folded.filter(s =>
- s.displayName?.toLowerCase().includes(lower) ||
- s.username.toLowerCase().includes(lower) ||
- s.summary.toLowerCase().includes(lower)
- )
+ return folded.filter(s => {
+ const matchedByName = s.displayName?.toLowerCase().includes(lower)
+ const matchedByUsername = s.username.toLowerCase().includes(lower)
+ const matchedByAlias = s.alias?.toLowerCase().includes(lower)
+ const matchedBySummary = s.summary.toLowerCase().includes(lower)
+
+ if (matchedByUsername && !matchedByName && !matchedBySummary && !matchedByAlias) {
+ s.matchedField = 'wxid'
+ } else if (matchedByAlias && !matchedByName && !matchedBySummary && !matchedByUsername) {
+ s.matchedField = 'alias'
+ } else {
+ s.matchedField = undefined
+ }
+
+ return matchedByName || matchedByUsername || matchedByAlias || matchedBySummary
+ })
}, [sessions, searchKeyword, foldedView])
const hasSessionRecords = Array.isArray(sessions) && sessions.length > 0
@@ -4033,6 +4282,74 @@ function ChatPage(props: ChatPageProps) {
)}
+ {/* 全局消息搜索结果 */}
+ {globalMsgQuery && (
+
+ {globalMsgSearching ? (
+
+
+ 搜索中...
+
+ ) : globalMsgResults.length > 0 ? (
+ <>
+
聊天记录：
+
+ {Object.entries(
+ globalMsgResults.reduce((acc, msg) => {
+ const sessionId = (msg as any).sessionId || '未知';
+ if (!acc[sessionId]) acc[sessionId] = [];
+ acc[sessionId].push(msg);
+ return acc;
+ }, {} as Record
)
+ ).map(([sessionId, messages]) => {
+ const session = sessions.find(s => s.username === sessionId);
+ const firstMsg = messages[0];
+ const count = messages.length;
+ return (
+ {
+ if (session) {
+ pendingInSessionSearchRef.current = {
+ keyword: globalMsgQuery,
+ firstMsgTime: firstMsg.createTime || 0,
+ results: messages
+ };
+ handleSelectSession(session);
+ }
+ }}
+ >
+
+
+
+ {session?.displayName || sessionId}
+
+
+
+
+ {count > 1 && (
+
共 {count} 条相关聊天记录
+ )}
+
+
+
+ ) : (
+
+ )}
+
+ )}
+
{/* ... (previous content) ... */}
{shouldShowSessionsSkeleton ? (
@@ -4048,66 +4365,39 @@ function ChatPage(props: ChatPageProps) {
) : (
- {/* 全局消息搜索结果 */}
- {showGlobalMsgSearch ? (
-
- {globalMsgSearching && (
-
搜索中...
- )}
- {!globalMsgSearching && globalMsgQuery && globalMsgResults.length === 0 && (
-
没有找到相关消息
- )}
- {!globalMsgSearching && globalMsgResults.map((msg, i) => {
- const sid = msg._session_id || msg.username || ''
- const sessionObj = sessions.find(s => s.username === sid)
- const sessionName = sessionObj?.displayName || sid || '未知会话'
- const content = (msg.content || msg.strContent || msg.message_content || '').slice(0, 60)
- const ts = msg.createTime || msg.create_time
- const timeStr = ts ? new Date(ts * 1000).toLocaleString('zh-CN', { month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' }) : ''
- return (
-
{
- if (sessionObj) {
- handleSelectSession(sessionObj)
- handleCloseGlobalMsgSearch()
- setSearchKeyword('')
- }
- }}>
-
{sessionName}
-
{content}
-
{timeStr}
-
- )
- })}
-
- ) : (
- <>
{/* 普通会话列表 */}
{Array.isArray(filteredSessions) && filteredSessions.length > 0 ? (
-
{
- isScrollingRef.current = true
- if (sessionScrollTimeoutRef.current) {
- clearTimeout(sessionScrollTimeoutRef.current)
- }
- sessionScrollTimeoutRef.current = window.setTimeout(() => {
- isScrollingRef.current = false
- sessionScrollTimeoutRef.current = null
- }, 200)
- }}
- >
- {filteredSessions.map(session => (
+ <>
+ {searchKeyword && (
+
联系人：
+ )}
+
{
+ isScrollingRef.current = true
+ if (sessionScrollTimeoutRef.current) {
+ clearTimeout(sessionScrollTimeoutRef.current)
+ }
+ sessionScrollTimeoutRef.current = window.setTimeout(() => {
+ isScrollingRef.current = false
+ sessionScrollTimeoutRef.current = null
+ }, 200)
+ }}
+ >
+ {filteredSessions.map(session => (
))}
+
) : (
@@ -4128,6 +4418,7 @@ function ChatPage(props: ChatPageProps) {
isActive={currentSessionId === session.username}
onSelect={handleSelectSession}
formatTime={formatSessionTime}
+ searchKeyword={searchKeyword}
/>
))}
@@ -4138,16 +4429,11 @@ function ChatPage(props: ChatPageProps) {
)}
-
- )}
)}
-
-
)}
- {/* 拖动调节条 */}
{!standaloneSessionWindow &&
}
{/* 右侧消息区域 */}
@@ -4326,40 +4612,68 @@ function ChatPage(props: ChatPageProps) {
onClose={() => setChatSnsTimelineTarget(null)}
/>
- {/* 会话内搜索栏 */}
+ {/* 会话内搜索浮窗 */}
{showInSessionSearch && (
-
-
- handleInSessionSearch(e.target.value)}
- className="in-session-search-input"
- />
- {inSessionSearching && }
- {inSessionQuery && !inSessionSearching && (
- {inSessionResults.length} 条结果
- )}
-
-
- )}
- {showInSessionSearch && inSessionResults.length > 0 && (
-
- {inSessionResults.map((msg, i) => (
-
{
- // 跳转到消息时间
- const ts = msg.createTime || msg.create_time
- if (ts) handleJumpDateSelect(new Date(ts * 1000))
- }}>
-
{msg.displayName || msg.talker || msg.username || ''}
-
{(msg.content || msg.strContent || msg.message_content || '').slice(0, 80)}
-
{msg.createTime || msg.create_time ? new Date((msg.createTime || msg.create_time) * 1000).toLocaleString('zh-CN', { month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' }) : ''}
+
+
+
+ handleInSessionSearch(e.target.value)}
+ className="search-input"
+ />
+ {inSessionSearching && }
+
+
+ {inSessionQuery && (
+
+ {inSessionSearching ? '搜索中...' : `找到 ${inSessionResults.length} 条结果`}
- ))}
+ )}
+ {inSessionResults.length > 0 && (
+
+ {inSessionResults.map((msg, i) => {
+ const msgData = msg as any;
+ const senderName = msgData.senderDisplayName || msgData.senderUsername || '未知';
+ const senderAvatar = msgData.senderAvatarUrl;
+
+ return (
+
{
+ const ts = msg.createTime || msgData.create_time;
+ if (ts && currentSessionId) {
+ setCurrentOffset(0);
+ setJumpStartTime(0);
+ setJumpEndTime(0);
+ void loadMessages(currentSessionId, 0, ts - 1, ts + 1, false);
+ }
+ }}>
+
+
+ {senderName}
+ {(msg.content || msgData.strContent || msgData.message_content || msgData.parsedContent || '').slice(0, 80)}
+
+
{msg.createTime || msgData.create_time ? new Date((msg.createTime || msgData.create_time) * 1000).toLocaleString('zh-CN', { month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' }) : ''}
+
+ );
+ })}
+
+ )}
+ {inSessionQuery && !inSessionSearching && inSessionResults.length === 0 && (
+
+ )}
)}
+
{standaloneSessionWindow && standaloneLoadStage !== 'ready' && (
diff --git a/src/types/models.ts b/src/types/models.ts
index 0af87b1..92d6506 100644
--- a/src/types/models.ts
+++ b/src/types/models.ts
@@ -15,6 +15,8 @@ export interface ChatSession {
selfWxid?: string // Helper field to avoid extra API calls
isFolded?: boolean // 是否已折叠进"折叠的群聊"
isMuted?: boolean // 是否开启免打扰
+ alias?: string // 微信号
+ matchedField?: 'wxid' | 'alias' | 'name' // 搜索匹配的字段
}
// 联系人
@@ -107,6 +109,9 @@ export interface Message {
chatRecordTitle?: string // 聊天记录标题
chatRecordList?: ChatRecordItem[] // 聊天记录列表
_db_path?: string
+ // 运行时补充的发送者信息
+ senderDisplayName?: string
+ senderAvatarUrl?: string
}
// 聊天记录项