Merge branch 'dev' of https://github.com/hicccc77/WeFlow into dev

.gitignore

@@ -13,6 +13,7 @@ dist
 dist-electron
 dist-ssr
 *.local
+test/
 
 # Editor directories and files
 .vscode/*
@@ -42,6 +43,10 @@ release
 # OS
 Thumbs.db
 
+# Electron dev cache
+.electron/
+.cache/
+
 
 
 # 忽略 Visual Studio 临时文件夹

electron/services/exportService.ts

@@ -19,6 +19,7 @@ interface ChatLabMeta {
   platform: string
   type: 'group' | 'private'
   groupId?: string
+  groupAvatar?: string
 }
 
 interface ChatLabMember {
@@ -425,6 +426,81 @@ class ExportService {
     return { rows, memberSet, firstTime, lastTime }
   }
 
+  // 补齐群成员，避免只导出发言者导致头像缺失
+  private async mergeGroupMembers(
+    chatroomId: string,
+    memberSet: Map<string, { member: ChatLabMember; avatarUrl?: string }>,
+    includeAvatars: boolean
+  ): Promise<void> {
+    const result = await wcdbService.getGroupMembers(chatroomId)
+    if (!result.success || !result.members || result.members.length === 0) return
+
+    const rawMembers = result.members as Array<{
+      username?: string
+      avatarUrl?: string
+      nickname?: string
+      displayName?: string
+      remark?: string
+      originalName?: string
+    }>
+    const usernames = rawMembers
+      .map((member) => member.username)
+      .filter((username): username is string => Boolean(username))
+    if (usernames.length === 0) return
+
+    const lookupUsernames = new Set<string>()
+    for (const username of usernames) {
+      lookupUsernames.add(username)
+      const cleaned = this.cleanAccountDirName(username)
+      if (cleaned && cleaned !== username) {
+        lookupUsernames.add(cleaned)
+      }
+    }
+
+    const [displayNames, avatarUrls] = await Promise.all([
+      wcdbService.getDisplayNames(Array.from(lookupUsernames)),
+      includeAvatars ? wcdbService.getAvatarUrls(Array.from(lookupUsernames)) : Promise.resolve({ success: true, map: {} })
+    ])
+
+    for (const member of rawMembers) {
+      const username = member.username
+      if (!username) continue
+
+      const cleaned = this.cleanAccountDirName(username)
+      const displayName = displayNames.success && displayNames.map
+        ? (displayNames.map[username] || (cleaned ? displayNames.map[cleaned] : undefined) || username)
+        : username
+      const groupNickname = member.nickname || member.displayName || member.remark || member.originalName
+      const avatarUrl = includeAvatars && avatarUrls.success && avatarUrls.map
+        ? (avatarUrls.map[username] || (cleaned ? avatarUrls.map[cleaned] : undefined) || member.avatarUrl)
+        : member.avatarUrl
+
+      const existing = memberSet.get(username)
+      if (existing) {
+        if (displayName && existing.member.accountName === existing.member.platformId && displayName !== existing.member.platformId) {
+          existing.member.accountName = displayName
+        }
+        if (groupNickname && !existing.member.groupNickname) {
+          existing.member.groupNickname = groupNickname
+        }
+        if (!existing.avatarUrl && avatarUrl) {
+          existing.avatarUrl = avatarUrl
+        }
+        memberSet.set(username, existing)
+        continue
+      }
+
+      const chatlabMember: ChatLabMember = {
+        platformId: username,
+        accountName: displayName
+      }
+      if (groupNickname) {
+        chatlabMember.groupNickname = groupNickname
+      }
+      memberSet.set(username, { member: chatlabMember, avatarUrl })
+    }
+  }
+
   private resolveAvatarFile(avatarUrl?: string): { data?: Buffer; sourcePath?: string; sourceUrl?: string; ext: string; mime?: string } | null {
     if (!avatarUrl) return null
     if (avatarUrl.startsWith('data:')) {
@@ -567,6 +643,9 @@ class ExportService {
 
       const collected = await this.collectMessages(sessionId, cleanedMyWxid, options.dateRange)
       const allMessages = collected.rows
+      if (isGroup) {
+        await this.mergeGroupMembers(sessionId, collected.memberSet, options.exportAvatars === true)
+      }
 
       allMessages.sort((a, b) => a.createTime - b.createTime)
 
@@ -585,6 +664,7 @@ class ExportService {
         return {
           sender: msg.senderUsername,
           accountName: memberInfo.accountName,
+          groupNickname: memberInfo.groupNickname,
           timestamp: msg.createTime,
           type: this.convertMessageType(msg.localType, msg.content),
           content: this.parseMessageContent(msg.content, msg.localType)
@@ -603,6 +683,7 @@ class ExportService {
         )
         : new Map<string, string>()
 
+      const sessionAvatar = avatarMap.get(sessionId)
       const members = Array.from(collected.memberSet.values()).map((info) => {
         const avatar = avatarMap.get(info.member.platformId)
         return avatar ? { ...info.member, avatar } : info.member
@@ -618,7 +699,8 @@ class ExportService {
           name: sessionInfo.displayName,
           platform: 'wechat',
           type: isGroup ? 'group' : 'private',
-          ...(isGroup && { groupId: sessionId })
+          ...(isGroup && { groupId: sessionId }),
+          ...(sessionAvatar && { groupAvatar: sessionAvatar })
         },
         members,
         messages: chatLabMessages

src/pages/ChatPage.tsx

@@ -5,25 +5,6 @@ import type { ChatSession, Message } from '../types/models'
 import { getEmojiPath } from 'wechat-emojis'
 import './ChatPage.scss'
 
-const SESSION_MESSAGE_CACHE_LIMIT = 150
-const SESSION_MESSAGE_CACHE_MAX_ENTRIES = 200
-const sessionMessageCache = new Map<string, Message[]>()
-
-const cacheSessionMessages = (sessionId: string, messages: Message[]) => {
-  if (!sessionId) return
-  const trimmed = messages.length > SESSION_MESSAGE_CACHE_LIMIT
-    ? messages.slice(-SESSION_MESSAGE_CACHE_LIMIT)
-    : messages.slice()
-  sessionMessageCache.set(sessionId, trimmed)
-  if (sessionMessageCache.size > SESSION_MESSAGE_CACHE_MAX_ENTRIES) {
-    const oldestKey = sessionMessageCache.keys().next().value
-    if (oldestKey) {
-      sessionMessageCache.delete(oldestKey)
-    }
-  }
-}
-
-
 interface ChatPageProps {
   // 保留接口以备将来扩展
 }
@@ -42,6 +23,66 @@ interface SessionDetail {
   messageTables: { dbName: string; tableName: string; count: number }[]
 }
 
+// 全局头像加载队列管理器（限制并发，避免卡顿）
+class AvatarLoadQueue {
+  private queue: Array<{ url: string; resolve: () => void; reject: () => void }> = []
+  private loading = new Set<string>()
+  private readonly maxConcurrent = 1 // 一次只加载1个头像，避免卡顿
+  private readonly delayBetweenBatches = 100 // 批次间延迟100ms，给UI喘息时间
+
+  async enqueue(url: string): Promise<void> {
+    // 如果已经在加载中，直接返回
+    if (this.loading.has(url)) {
+      return Promise.resolve()
+    }
+
+    return new Promise((resolve, reject) => {
+      this.queue.push({ url, resolve, reject })
+      this.processQueue()
+    })
+  }
+
+  private async processQueue() {
+    // 如果已达到最大并发数，等待
+    if (this.loading.size >= this.maxConcurrent) {
+      return
+    }
+
+    // 如果队列为空，返回
+    if (this.queue.length === 0) {
+      return
+    }
+
+    // 取出一个任务
+    const task = this.queue.shift()
+    if (!task) return
+
+    this.loading.add(task.url)
+
+    // 加载图片
+    const img = new Image()
+    img.onload = () => {
+      this.loading.delete(task.url)
+      task.resolve()
+      // 延迟一下再处理下一个，避免一次性加载太多
+      setTimeout(() => this.processQueue(), this.delayBetweenBatches)
+    }
+    img.onerror = () => {
+      this.loading.delete(task.url)
+      task.reject()
+      setTimeout(() => this.processQueue(), this.delayBetweenBatches)
+    }
+    img.src = task.url
+  }
+
+  clear() {
+    this.queue = []
+    this.loading.clear()
+  }
+}
+
+const avatarLoadQueue = new AvatarLoadQueue()
+
 // 头像组件 - 支持骨架屏加载和懒加载（优化：限制并发，使用 memo 避免不必要的重渲染）
 // 会话项组件（使用 memo 优化，避免不必要的重渲染）
 const SessionItem = React.memo(function SessionItem({
@@ -101,6 +142,7 @@ const SessionAvatar = React.memo(function SessionAvatar({ session, size = 48 }:
   const [imageLoaded, setImageLoaded] = useState(false)
   const [imageError, setImageError] = useState(false)
   const [shouldLoad, setShouldLoad] = useState(false)
+  const [isInQueue, setIsInQueue] = useState(false)
   const imgRef = useRef<HTMLImageElement>(null)
   const containerRef = useRef<HTMLDivElement>(null)
   const isGroup = session.username.includes('@chatroom')
@@ -112,13 +154,59 @@ const SessionAvatar = React.memo(function SessionAvatar({ session, size = 48 }:
     return chars[0] || '?'
   }
 
+  // 使用 Intersection Observer 实现懒加载（优化性能）
+  useEffect(() => {
+    if (!containerRef.current || shouldLoad || isInQueue) return
+    if (!session.avatarUrl) {
+      // 没有头像URL，不需要加载
+      return
+    }
+
+    const observer = new IntersectionObserver(
+      (entries) => {
+        entries.forEach((entry) => {
+          if (entry.isIntersecting && !isInQueue) {
+            // 加入加载队列，而不是立即加载
+            setIsInQueue(true)
+            avatarLoadQueue.enqueue(session.avatarUrl!).then(() => {
+              setShouldLoad(true)
+            }).catch(() => {
+              setImageError(true)
+            }).finally(() => {
+              setIsInQueue(false)
+            })
+            observer.disconnect()
+          }
+        })
+      },
+      {
+        rootMargin: '50px' // 减少预加载距离，只提前50px
+      }
+    )
+
+    observer.observe(containerRef.current)
+
+    return () => {
+      observer.disconnect()
+    }
+  }, [session.avatarUrl, shouldLoad, isInQueue])
+
+  // 当 avatarUrl 变化时重置状态
   useEffect(() => {
     setImageLoaded(false)
     setImageError(false)
-    setShouldLoad(Boolean(session.avatarUrl))
+    setShouldLoad(false)
+    setIsInQueue(false)
   }, [session.avatarUrl])
 
-  const hasValidUrl = Boolean(session.avatarUrl && !imageError && shouldLoad)
+  // 检查图片是否已经从缓存加载完成
+  useEffect(() => {
+    if (shouldLoad && imgRef.current?.complete && imgRef.current?.naturalWidth > 0) {
+      setImageLoaded(true)
+    }
+  }, [session.avatarUrl, shouldLoad])
+
+  const hasValidUrl = session.avatarUrl && !imageError && shouldLoad
 
   return (
     <div
@@ -292,10 +380,10 @@ function ChatPage(_props: ChatPageProps) {
         // 确保 nextSessions 也是数组
         if (Array.isArray(nextSessions)) {
           setSessions(nextSessions)
-          // 启动联系人信息加载，UI 已经渲染完成
+          // 延迟启动联系人信息加载，确保UI先渲染完成
           setTimeout(() => {
             void enrichSessionsContactInfo(nextSessions)
-          }, 0)
+          }, 500)
         } else {
           console.error('mergeSessions returned non-array:', nextSessions)
           setSessions(sessionsArray)
@@ -332,6 +420,9 @@ function ChatPage(_props: ChatPageProps) {
     console.log(`[性能监控] 开始加载联系人信息，会话数: ${sessions.length}`)
     const totalStart = performance.now()
 
+    // 延迟启动，等待UI渲染完成
+    await new Promise(resolve => setTimeout(resolve, 500))
+
     // 检查是否被取消
     if (enrichCancelledRef.current) {
       isEnrichingRef.current = false
@@ -349,8 +440,8 @@ function ChatPage(_props: ChatPageProps) {
 
       console.log(`[性能监控] 需要加载的联系人信息: ${needEnrich.length} 个`)
 
-      // 每次最多查询更多联系人，减少批次数
+      // 进一步减少批次大小，每批3个，避免DLL调用阻塞
-      const batchSize = 20
+      const batchSize = 3
       let loadedCount = 0
 
       for (let i = 0; i < needEnrich.length; i += batchSize) {
@@ -371,15 +462,31 @@ function ChatPage(_props: ChatPageProps) {
         const batch = needEnrich.slice(i, i + batchSize)
         const usernames = batch.map(s => s.username)
 
-        // 在执行 DLL 请求前让出控制权以保持响应
+        // 使用 requestIdleCallback 延迟执行，避免阻塞UI
-        await new Promise(resolve => setTimeout(resolve, 0))
+        await new Promise<void>((resolve) => {
-        await loadContactInfoBatch(usernames)
+          if ('requestIdleCallback' in window) {
+            window.requestIdleCallback(() => {
+              void loadContactInfoBatch(usernames).then(() => resolve())
+            }, { timeout: 2000 })
+          } else {
+            setTimeout(() => {
+              void loadContactInfoBatch(usernames).then(() => resolve())
+            }, 300)
+          }
+        })
 
         loadedCount += batch.length
         const batchTime = performance.now() - batchStart
         if (batchTime > 200) {
           console.warn(`[性能监控] 批次 ${Math.floor(i / batchSize) + 1}/${Math.ceil(needEnrich.length / batchSize)} 耗时: ${batchTime.toFixed(2)}ms (已加载: ${loadedCount}/${needEnrich.length})`)
         }
+
+        // 批次间延迟，给UI更多时间（DLL调用可能阻塞，需要更长的延迟）
+        if (i + batchSize < needEnrich.length && !enrichCancelledRef.current) {
+          // 如果不在滚动，可以延迟短一点
+          const delay = isScrollingRef.current ? 1000 : 800
+          await new Promise(resolve => setTimeout(resolve, delay))
+        }
       }
 
       const totalTime = performance.now() - totalStart
@@ -531,32 +638,6 @@ function ChatPage(_props: ChatPageProps) {
     }
   }
 
-  const loadCachedMessagesForSession = async (sessionId: string) => {
-    if (!sessionId) return
-    const cached = sessionMessageCache.get(sessionId)
-    if (cached && cached.length > 0) {
-      setMessages(cached)
-      setHasInitialMessages(true)
-      return
-    }
-    try {
-      const result = await window.electronAPI.chat.getCachedMessages(sessionId)
-      if (result.success && Array.isArray(result.messages) && result.messages.length > 0) {
-        const trimmed = result.messages.length > SESSION_MESSAGE_CACHE_LIMIT
-          ? result.messages.slice(-SESSION_MESSAGE_CACHE_LIMIT)
-          : result.messages
-        sessionMessageCache.set(sessionId, trimmed)
-        setMessages(trimmed)
-        setHasInitialMessages(true)
-        return
-      }
-    } catch (error) {
-      console.error('加载缓存消息失败:', error)
-    }
-    setMessages([])
-    setHasInitialMessages(false)
-  }
-
   // 加载消息
   const loadMessages = async (sessionId: string, offset = 0) => {
     const listEl = messageListRef.current
@@ -566,6 +647,7 @@ function ChatPage(_props: ChatPageProps) {
 
     if (offset === 0) {
       setLoadingMessages(true)
+      setMessages([])
     } else {
       setLoadingMore(true)
     }
@@ -578,7 +660,6 @@ function ChatPage(_props: ChatPageProps) {
       if (result.success && result.messages) {
         if (offset === 0) {
           setMessages(result.messages)
-          cacheSessionMessages(sessionId, result.messages)
           // 首次加载滚动到底部
           requestAnimationFrame(() => {
             if (messageListRef.current) {
@@ -613,18 +694,14 @@ function ChatPage(_props: ChatPageProps) {
   // 选择会话
   const handleSelectSession = (session: ChatSession) => {
     if (session.username === currentSessionId) return
-    const sessionId = session.username
+    setCurrentSession(session.username)
-    setCurrentSession(sessionId)
     setCurrentOffset(0)
+    loadMessages(session.username, 0)
     // 重置详情面板
     setSessionDetail(null)
     if (showDetailPanel) {
-      loadSessionDetail(sessionId)
+      loadSessionDetail(session.username)
     }
-    void (async () => {
-      await loadCachedMessagesForSession(sessionId)
-      loadMessages(sessionId, 0)
-    })()
   }
 
   // 搜索过滤
@@ -768,6 +845,7 @@ function ChatPage(_props: ChatPageProps) {
 
     // 组件卸载时清理
     return () => {
+      avatarLoadQueue.clear()
       if (contactUpdateTimerRef.current) {
         clearTimeout(contactUpdateTimerRef.current)
       }
@@ -1607,6 +1685,12 @@ function MessageBubble({ message, session, showTime, myAvatarUrl, isGroupChat }:
   // 是否有引用消息
   const hasQuote = message.quotedContent && message.quotedContent.length > 0
 
+  // 去除企业微信 ID 前缀
+  const cleanMessageContent = (content: string) => {
+    if (!content) return ''
+    return content.replace(/^[a-zA-Z0-9]+@openim:\n?/, '')
+  }
+
   // 解析混合文本和表情
   const renderTextWithEmoji = (text: string) => {
     if (!text) return text
@@ -1817,14 +1901,14 @@ function MessageBubble({ message, session, showTime, myAvatarUrl, isGroupChat }:
         <div className="bubble-content">
           <div className="quoted-message">
             {message.quotedSender && <span className="quoted-sender">{message.quotedSender}</span>}
-            <span className="quoted-text">{renderTextWithEmoji(message.quotedContent || '')}</span>
+            <span className="quoted-text">{renderTextWithEmoji(cleanMessageContent(message.quotedContent || ''))}</span>
           </div>
-          <div className="message-text">{renderTextWithEmoji(message.parsedContent)}</div>
+          <div className="message-text">{renderTextWithEmoji(cleanMessageContent(message.parsedContent))}</div>
         </div>
       )
     }
     // 普通消息
-    return <div className="bubble-content">{renderTextWithEmoji(message.parsedContent)}</div>
+    return <div className="bubble-content">{renderTextWithEmoji(cleanMessageContent(message.parsedContent))}</div>
   }
 
   return (

src/pages/WelcomePage.tsx

@@ -506,6 +506,7 @@ function WelcomePage({ standalone = false }: WelcomePageProps) {
 
               {dbKeyStatus && <div className="field-hint status-text">{dbKeyStatus}</div>}
               <div className="field-hint">获取密钥会自动识别最近登录的账号</div>
+              <div className="field-hint">如果获取秘钥失败 请在微信打开后等待10秒后再登录</div>
             </div>
           )}