diff --git a/electron/main.ts b/electron/main.ts index 1e0de48..de1d3a6 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -903,6 +903,9 @@ function registerIpcHandlers() { ipcMain.handle('chat:getAllVoiceMessages', async (_, sessionId: string) => { return chatService.getAllVoiceMessages(sessionId) }) + ipcMain.handle('chat:getMessageDates', async (_, sessionId: string) => { + return chatService.getMessageDates(sessionId) + }) ipcMain.handle('chat:resolveVoiceCache', async (_, sessionId: string, msgId: string) => { return chatService.resolveVoiceCache(sessionId, msgId) }) diff --git a/electron/preload.ts b/electron/preload.ts index 29d3829..fc60323 100644 --- a/electron/preload.ts +++ b/electron/preload.ts @@ -142,6 +142,7 @@ contextBridge.exposeInMainWorld('electronAPI', { getVoiceData: (sessionId: string, msgId: string, createTime?: number, serverId?: string | number) => ipcRenderer.invoke('chat:getVoiceData', sessionId, msgId, createTime, serverId), getAllVoiceMessages: (sessionId: string) => ipcRenderer.invoke('chat:getAllVoiceMessages', sessionId), + getMessageDates: (sessionId: string) => ipcRenderer.invoke('chat:getMessageDates', sessionId), resolveVoiceCache: (sessionId: string, msgId: string) => ipcRenderer.invoke('chat:resolveVoiceCache', sessionId, msgId), getVoiceTranscript: (sessionId: string, msgId: string, createTime?: number) => ipcRenderer.invoke('chat:getVoiceTranscript', sessionId, msgId, createTime), onVoiceTranscriptPartial: (callback: (payload: { msgId: string; text: string }) => void) => { diff --git a/electron/services/chatService.ts b/electron/services/chatService.ts index 0d88680..d27e6c5 100644 --- a/electron/services/chatService.ts +++ b/electron/services/chatService.ts @@ -72,6 +72,9 @@ export interface Message { // 名片消息 cardUsername?: string // 名片的微信ID cardNickname?: string // 名片的昵称 + // 转账消息 + transferPayerUsername?: string // 转账付款人 + transferReceiverUsername?: string // 转账收款人 // 聊天记录 chatRecordTitle?: string // 聊天记录标题 chatRecordList?: Array<{ @@ -723,7 +726,7 @@ class ChatService { // 1. 没有游标状态 // 2. offset 为 0 (重新加载会话) // 3. batchSize 改变 - // 4. startTime 改变 + // 4. startTime/endTime 改变（视为全新查询） // 5. ascending 改变 const needNewCursor = !state || offset === 0 || @@ -756,27 +759,35 @@ class ChatService { this.messageCursors.set(sessionId, state) // 如果需要跳过消息(offset > 0),逐批获取但不返回 + // 注意：仅在 offset === 0 时重建游标最安全； + // 当 startTime/endTime 变化导致重建时，offset 应由前端重置为 0 if (offset > 0) { - + console.warn(`[ChatService] 新游标需跳过 ${offset} 条消息（startTime=${startTime}, endTime=${endTime}）`) let skipped = 0 - while (skipped < offset) { + const maxSkipAttempts = Math.ceil(offset / batchSize) + 5 // 防止无限循环 + let attempts = 0 + while (skipped < offset && attempts < maxSkipAttempts) { + attempts++ const skipBatch = await wcdbService.fetchMessageBatch(state.cursor) if (!skipBatch.success) { console.error('[ChatService] 跳过消息批次失败:', skipBatch.error) return { success: false, error: skipBatch.error || '跳过消息失败' } } if (!skipBatch.rows || skipBatch.rows.length === 0) { - + console.warn(`[ChatService] 跳过时数据耗尽: skipped=${skipped}/${offset}`) return { success: true, messages: [], hasMore: false } } skipped += skipBatch.rows.length state.fetched += skipBatch.rows.length if (!skipBatch.hasMore) { - + console.warn(`[ChatService] 跳过后无更多数据: skipped=${skipped}/${offset}`) return { success: true, messages: [], hasMore: false } } } - + if (attempts >= maxSkipAttempts) { + console.error(`[ChatService] 跳过消息超过最大尝试次数: attempts=${attempts}`) + } + console.log(`[ChatService] 跳过完成: skipped=${skipped}, fetched=${state.fetched}`) } } else if (state && offset !== state.fetched) { // offset 与 fetched 不匹配,说明状态不一致 @@ -3776,6 +3787,32 @@ class ChatService { } } + /** + * 获取某会话中有消息的日期列表 + * 返回 YYYY-MM-DD 格式的日期字符串数组 + */ + async getMessageDates(sessionId: string): Promise<{ success: boolean; dates?: string[]; error?: string }> { + try { + const connectResult = await this.ensureConnected() + if (!connectResult.success) { + return { success: false, error: connectResult.error || '数据库未连接' } + } + + const result = await wcdbService.getMessageDates(sessionId) + if (!result.success) { + throw new Error(result.error || '查询失败') + } + + const dates = result.dates || [] + + console.log(`[ChatService] 会话 ${sessionId} 共有 ${dates.length} 个有消息的日期`) + return { success: true, dates } + } catch (e) { + console.error('[ChatService] 获取消息日期失败:', e) + return { success: false, error: String(e) } + } + } + async getMessageById(sessionId: string, localId: number): Promise<{ success: boolean; message?: Message; error?: string }> { try { // 1. 尝试从缓存获取会话表信息 diff --git a/electron/services/wcdbCore.ts b/electron/services/wcdbCore.ts index 1e3c79a..9bc6b39 100644 --- a/electron/services/wcdbCore.ts +++ b/electron/services/wcdbCore.ts @@ -46,6 +46,7 @@ export class WcdbCore { private wcdbGetAnnualReportExtras: any = null private wcdbGetDualReportStats: any = null private wcdbGetGroupStats: any = null + private wcdbGetMessageDates: any = null private wcdbOpenMessageCursor: any = null private wcdbOpenMessageCursorLite: any = null private wcdbFetchMessageBatch: any = null @@ -299,9 +300,6 @@ export class WcdbCore { return false } - // 关键修复：显式预加载依赖库 WCDB.dll 和 SDL2.dll - // Windows 加载器默认不会查找子目录中的依赖，必须先将其加载到内存 - // 这可以解决部分用户因为 VC++ 运行时或 DLL 依赖问题导致的闪退 const dllDir = dirname(dllPath) const wcdbCorePath = join(dllDir, 'WCDB.dll') if (existsSync(wcdbCorePath)) { @@ -478,6 +476,13 @@ export class WcdbCore { this.wcdbGetGroupStats = null } + // wcdb_status wcdb_get_message_dates(wcdb_handle handle, const char* session_id, char** out_json) + try { + this.wcdbGetMessageDates = this.lib.func('int32 wcdb_get_message_dates(int64 handle, const char* sessionId, _Out_ void** outJson)') + } catch { + this.wcdbGetMessageDates = null + } + // wcdb_status wcdb_open_message_cursor(wcdb_handle handle, const char* session_id, int32_t batch_size, int32_t ascending, int32_t begin_timestamp, int32_t end_timestamp, wcdb_cursor* out_cursor) this.wcdbOpenMessageCursor = this.lib.func('int32 wcdb_open_message_cursor(int64 handle, const char* sessionId, int32 batchSize, int32 ascending, int32 beginTimestamp, int32 endTimestamp, _Out_ int64* outCursor)') @@ -1194,6 +1199,29 @@ export class WcdbCore { } } + async getMessageDates(sessionId: string): Promise<{ success: boolean; dates?: string[]; error?: string }> { + if (!this.ensureReady()) { + return { success: false, error: 'WCDB 未连接' } + } + try { + if (!this.wcdbGetMessageDates) { + return { success: false, error: 'DLL 不支持 getMessageDates' } + } + const outPtr = [null as any] + const result = this.wcdbGetMessageDates(this.handle, sessionId, outPtr) + if (result !== 0 || !outPtr[0]) { + // 空结果也可能是正常的（无消息） + return { success: true, dates: [] } + } + const jsonStr = this.decodeJsonPtr(outPtr[0]) + if (!jsonStr) return { success: false, error: '解析日期列表失败' } + const dates = JSON.parse(jsonStr) + return { success: true, dates } + } catch (e) { + return { success: false, error: String(e) } + } + } + async getMessageTableStats(sessionId: string): Promise<{ success: boolean; tables?: any[]; error?: string }> { if (!this.ensureReady()) { return { success: false, error: 'WCDB 未连接' } diff --git a/electron/services/wcdbService.ts b/electron/services/wcdbService.ts index 092db01..aef9bda 100644 --- a/electron/services/wcdbService.ts +++ b/electron/services/wcdbService.ts @@ -273,6 +273,10 @@ export class WcdbService { return this.callWorker('getMessageTableStats', { sessionId }) } + async getMessageDates(sessionId: string): Promise<{ success: boolean; dates?: string[]; error?: string }> { + return this.callWorker('getMessageDates', { sessionId }) + } + /** * 获取消息元数据 */ diff --git a/electron/wcdbWorker.ts b/electron/wcdbWorker.ts index 6d01ef4..4361f8b 100644 --- a/electron/wcdbWorker.ts +++ b/electron/wcdbWorker.ts @@ -78,6 +78,9 @@ if (parentPort) { case 'getMessageTableStats': result = await core.getMessageTableStats(payload.sessionId) break + case 'getMessageDates': + result = await core.getMessageDates(payload.sessionId) + break case 'getMessageMeta': result = await core.getMessageMeta(payload.dbPath, payload.tableName, payload.limit, payload.offset) break diff --git a/resources/wcdb_api.dll b/resources/wcdb_api.dll index f24681d..c689978 100644 Binary files a/resources/wcdb_api.dll and b/resources/wcdb_api.dll differ diff --git a/src/components/DateRangePicker.scss b/src/components/DateRangePicker.scss index e51145b..af9602f 100644 --- a/src/components/DateRangePicker.scss +++ b/src/components/DateRangePicker.scss @@ -70,6 +70,7 @@ opacity: 0; transform: translateY(-8px); } + to { opacity: 1; transform: translateY(0); @@ -144,6 +145,7 @@ .calendar-grid { display: grid; grid-template-columns: repeat(7, 1fr); + grid-template-rows: auto repeat(6, 32px); gap: 2px; } @@ -156,7 +158,6 @@ } .calendar-day { - aspect-ratio: 1; display: flex; align-items: center; justify-content: center; @@ -211,4 +212,4 @@ padding-top: 12px; border-top: 1px solid var(--border-color); } -} +} \ No newline at end of file diff --git a/src/components/DateRangePicker.tsx b/src/components/DateRangePicker.tsx index 78d5b4f..f88cfec 100644 --- a/src/components/DateRangePicker.tsx +++ b/src/components/DateRangePicker.tsx @@ -86,7 +86,7 @@ function DateRangePicker({ startDate, endDate, onStartDateChange, onEndDateChang const handleDateClick = (day: number) => { const dateStr = `${currentMonth.getFullYear()}-${String(currentMonth.getMonth() + 1).padStart(2, '0')}-${String(day).padStart(2, '0')}` - + if (selectingStart) { onStartDateChange(dateStr) if (endDate && dateStr > endDate) { @@ -125,8 +125,8 @@ function DateRangePicker({ startDate, endDate, onStartDateChange, onEndDateChang const isToday = (day: number) => { const today = new Date() return currentMonth.getFullYear() === today.getFullYear() && - currentMonth.getMonth() === today.getMonth() && - day === today.getDate() + currentMonth.getMonth() === today.getMonth() && + day === today.getDate() } const renderCalendar = () => { diff --git a/src/components/JumpToDateDialog.scss b/src/components/JumpToDateDialog.scss index cd20c37..a4f0c51 100644 --- a/src/components/JumpToDateDialog.scss +++ b/src/components/JumpToDateDialog.scss @@ -100,6 +100,33 @@ } .calendar-grid { + position: relative; + + &.loading { + + .weekdays, + .days { + pointer-events: none; + } + } + + .calendar-loading { + position: absolute; + inset: 0; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + gap: 8px; + color: var(--text-secondary); + font-size: 13px; + + .spin { + color: var(--primary); + animation: spin 1s linear infinite; + } + } + .weekdays { display: grid; grid-template-columns: repeat(7, 1fr); @@ -117,10 +144,10 @@ .days { display: grid; grid-template-columns: repeat(7, 1fr); + grid-template-rows: repeat(6, 36px); gap: 4px; .day-cell { - aspect-ratio: 1; display: flex; align-items: center; justify-content: center; @@ -129,12 +156,13 @@ border-radius: 8px; cursor: pointer; transition: all 0.2s; + position: relative; &.empty { cursor: default; } - &:not(.empty):hover { + &:not(.empty):not(.no-message):hover { background: var(--bg-hover); } @@ -149,10 +177,43 @@ font-weight: 600; background: var(--primary-light); } + + // 无消息的日期 - 灰显且不可点击 + &.no-message { + opacity: 0.3; + cursor: default; + pointer-events: none; + } + + // 有消息的日期指示器小圆点 + .message-dot { + position: absolute; + bottom: 3px; + left: 50%; + transform: translateX(-50%); + width: 4px; + height: 4px; + border-radius: 50%; + background: var(--primary); + } + + &.selected .message-dot { + background: rgba(255, 255, 255, 0.7); + } } } } +@keyframes spin { + from { + transform: rotate(0deg); + } + + to { + transform: rotate(360deg); + } +} + .quick-options { display: flex; gap: 8px; diff --git a/src/components/JumpToDateDialog.tsx b/src/components/JumpToDateDialog.tsx index 6876069..ea68889 100644 --- a/src/components/JumpToDateDialog.tsx +++ b/src/components/JumpToDateDialog.tsx @@ -1,5 +1,5 @@ -import React, { useState } from 'react' -import { X, ChevronLeft, ChevronRight, Calendar as CalendarIcon } from 'lucide-react' +import React, { useState, useMemo } from 'react' +import { X, ChevronLeft, ChevronRight, Calendar as CalendarIcon, Loader2 } from 'lucide-react' import './JumpToDateDialog.scss' interface JumpToDateDialogProps { @@ -7,15 +7,22 @@ interface JumpToDateDialogProps { onClose: () => void onSelect: (date: Date) => void currentDate?: Date + /** 有消息的日期集合，格式为 YYYY-MM-DD */ + messageDates?: Set + /** 是否正在加载消息日期 */ + loadingDates?: boolean } const JumpToDateDialog: React.FC = ({ isOpen, onClose, onSelect, - currentDate = new Date() + currentDate = new Date(), + messageDates, + loadingDates = false }) => { - const [calendarDate, setCalendarDate] = useState(new Date(currentDate)) + const isValidDate = (d: any) => d instanceof Date && !isNaN(d.getTime()) + const [calendarDate, setCalendarDate] = useState(isValidDate(currentDate) ? new Date(currentDate) : new Date()) const [selectedDate, setSelectedDate] = useState(new Date(currentDate)) if (!isOpen) return null @@ -48,7 +55,20 @@ const JumpToDateDialog: React.FC = ({ return days } + /** + * 判断某天是否有消息 + */ + const hasMessage = (day: number): boolean => { + if (!messageDates || messageDates.size === 0) return true // 未加载时默认全部可点击 + const year = calendarDate.getFullYear() + const month = calendarDate.getMonth() + 1 + const dateStr = `${year}-${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}` + return messageDates.has(dateStr) + } + const handleDateClick = (day: number) => { + // 如果已加载日期数据且该日期无消息，则不可点击 + if (messageDates && messageDates.size > 0 && !hasMessage(day)) return const newDate = new Date(calendarDate.getFullYear(), calendarDate.getMonth(), day) setSelectedDate(newDate) } @@ -71,6 +91,28 @@ const JumpToDateDialog: React.FC = ({ calendarDate.getFullYear() === selectedDate.getFullYear() } + /** + * 获取某天的 CSS 类名 + */ + const getDayClassName = (day: number | null): string => { + if (day === null) return 'day-cell empty' + + const classes = ['day-cell'] + if (isSelected(day)) classes.push('selected') + if (isToday(day)) classes.push('today') + + // 仅在已加载消息日期数据时区分有/无消息 + if (messageDates && messageDates.size > 0) { + if (hasMessage(day)) { + classes.push('has-message') + } else { + classes.push('no-message') + } + } + + return classes.join(' ') + } + const weekdays = ['日', '一', '二', '三', '四', '五', '六'] const days = generateCalendar() @@ -106,18 +148,28 @@ const JumpToDateDialog: React.FC = ({ -
-
+
+ {loadingDates && ( +
+ + 正在加载... +
+ )} +
{weekdays.map(d =>
{d}
)}
-
+
{days.map((day, i) => (
day !== null && handleDateClick(day)} > {day} + {day !== null && messageDates && messageDates.size > 0 && hasMessage(day) && ( + + )}
))}
diff --git a/src/pages/ChatPage.tsx b/src/pages/ChatPage.tsx index 24fe60a..bc0dfa6 100644 --- a/src/pages/ChatPage.tsx +++ b/src/pages/ChatPage.tsx @@ -164,6 +164,9 @@ function ChatPage(_props: ChatPageProps) { const [jumpStartTime, setJumpStartTime] = useState(0) const [jumpEndTime, setJumpEndTime] = useState(0) const [showJumpDialog, setShowJumpDialog] = useState(false) + const [messageDates, setMessageDates] = useState>(new Set()) + const [loadingDates, setLoadingDates] = useState(false) + const messageDatesCache = useRef>>(new Map()) const [myAvatarUrl, setMyAvatarUrl] = useState(undefined) const [myWxid, setMyWxid] = useState(undefined) const [showScrollToBottom, setShowScrollToBottom] = useState(false) @@ -680,12 +683,32 @@ function ChatPage(_props: ChatPageProps) { + // 动态游标批量大小控制 + const currentBatchSizeRef = useRef(50) + // 加载消息 const loadMessages = async (sessionId: string, offset = 0, startTime = 0, endTime = 0) => { const listEl = messageListRef.current const session = sessionMapRef.current.get(sessionId) const unreadCount = session?.unreadCount ?? 0 - const messageLimit = offset === 0 && unreadCount > 99 ? 30 : 50 + + let messageLimit = 50 + + if (offset === 0) { + // 初始加载：重置批量大小 + currentBatchSizeRef.current = 50 + // 首屏优化：消息过多时限制数量 + messageLimit = unreadCount > 99 ? 30 : 50 + } else { + // 滚动加载：动态递增 (50 -> 100 -> 200) + if (currentBatchSizeRef.current < 100) { + currentBatchSizeRef.current = 100 + } else { + currentBatchSizeRef.current = 200 + } + messageLimit = currentBatchSizeRef.current + } + if (offset === 0) { setLoadingMessages(true) @@ -1523,7 +1546,31 @@ function ChatPage(_props: ChatPageProps) {