From 767b835118d3b86d49ce34a87d59aa449226f2ce Mon Sep 17 00:00:00 2001
From: digua <i@digua.me>
Date: Mon, 12 Jan 2026 23:05:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=98=BE=E7=A4=BA=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/main/worker/query/basic.ts | 47 +++++++++++++++++++++++++++++
 src/components/common/Sidebar.vue   | 36 +++++++++++++++++-----
 src/types/base.ts                   |  1 +
 3 files changed, 77 insertions(+), 7 deletions(-)

diff --git a/electron/main/worker/query/basic.ts b/electron/main/worker/query/basic.ts
index 8d87a2b..ad07aae 100644
--- a/electron/main/worker/query/basic.ts
+++ b/electron/main/worker/query/basic.ts
@@ -323,6 +323,46 @@ interface DbMeta {
   group_avatar: string | null
 }
 
+/**
+ * 获取私聊对方成员的头像
+ * 逻辑参考 private-chat/index.vue 的 otherMemberAvatar
+ */
+function getPrivateChatMemberAvatar(
+  db: Database.Database,
+  sessionName: string,
+  ownerId: string | null
+): string | null {
+  // 获取所有非系统消息成员（按消息数排序）
+  const members = db
+    .prepare(
+      `SELECT
+        m.platform_id as platformId,
+        COALESCE(m.group_nickname, m.account_name, m.platform_id) as name,
+        m.avatar
+      FROM member m
+      WHERE COALESCE(m.account_name, '') != '系统消息'
+      ORDER BY (SELECT COUNT(*) FROM message WHERE sender_id = m.id) DESC`
+    )
+    .all() as Array<{ platformId: string; name: string; avatar: string | null }>
+
+  if (members.length === 0) return null
+
+  // 1. 优先排除 ownerId，找到另一成员的头像
+  if (ownerId) {
+    const other = members.find((m) => m.platformId !== ownerId)
+    if (other?.avatar) return other.avatar
+  }
+
+  // 2. 尝试匹配会话名称（私聊名称通常是对方昵称）
+  const sameName = members.find((m) => m.name === sessionName)
+  if (sameName?.avatar) return sameName.avatar
+
+  // 3. 如果只有两个成员且有 ownerId，取另一个（即使没有头像也返回 null）
+  // 如果没有 ownerId，返回第一个有头像的成员
+  const firstWithAvatar = members.find((m) => m.avatar)
+  return firstWithAvatar?.avatar || null
+}
+
 /**
  * 获取所有会话列表
  */
@@ -366,6 +406,12 @@ export function getAllSessions(): any[] {
             .get() as { count: number }
         ).count
 
+        // 私聊：获取对方成员头像
+        let memberAvatar: string | null = null
+        if (meta.type === 'private') {
+          memberAvatar = getPrivateChatMemberAvatar(db, meta.name, meta.owner_id)
+        }
+
         sessions.push({
           id: sessionId,
           name: meta.name,
@@ -378,6 +424,7 @@ export function getAllSessions(): any[] {
           groupId: meta.group_id || null,
           groupAvatar: meta.group_avatar || null,
           ownerId: meta.owner_id || null,
+          memberAvatar, // 私聊对方头像
         })
       }
 
diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue
index 2c681c2..2b8b3a0 100644
--- a/src/components/common/Sidebar.vue
+++ b/src/components/common/Sidebar.vue
@@ -158,6 +158,14 @@ function getSessionAvatarText(session: AnalysisSession): string {
     return name.length <= 2 ? name : name.slice(0, 2)
   }
 }
+
+// 获取会话头像 URL（群聊用 groupAvatar，私聊用 memberAvatar）
+function getSessionAvatar(session: AnalysisSession): string | null {
+  if (isPrivateChat(session)) {
+    return session.memberAvatar || null
+  }
+  return session.groupAvatar || null
+}
 </script>
 
 <template>
@@ -207,26 +215,26 @@ function getSessionAvatarText(session: AnalysisSession): string {
     </div>
 
     <!-- Session List -->
-    <div class="flex-1 relative min-h-0 px-4 flex flex-col">
+    <div class="flex-1 relative min-h-0 flex flex-col">
       <!-- 聊天记录标题 - 固定在顶部，不随列表滚动 -->
       <UTooltip
         v-if="!isCollapsed && sessions.length > 0"
         :text="t('sidebar.tooltip.hint')"
         :popper="{ placement: 'right' }"
       >
-        <div class="px-3 mb-2 flex items-center gap-1">
+        <div class="px-7 mb-2 flex items-center gap-1">
           <div class="text-sm font-medium text-gray-500">{{ t('sidebar.chatHistory') }}</div>
           <UIcon name="i-heroicons-question-mark-circle" class="size-3.5 text-gray-400" />
         </div>
       </UTooltip>
 
-      <!-- 聊天记录列表 - 可滚动区域 -->
+      <!-- 聊天记录列表 - 可滚动区域，滚动条贴边 -->
       <div class="flex-1 overflow-y-auto">
         <div v-if="sessions.length === 0 && !isCollapsed" class="py-8 text-center text-sm text-gray-500">
           {{ t('sidebar.noRecords') }}
         </div>
 
-        <div class="space-y-1 pb-8">
+        <div class="space-y-1 pb-8" :class="[isCollapsed ? '' : 'px-4']">
           <UTooltip
             v-for="session in sortedSessions"
             :key="session.id"
@@ -235,17 +243,27 @@ function getSessionAvatarText(session: AnalysisSession): string {
           >
             <UContextMenu :items="getContextMenuItems(session)">
               <div
-                class="group relative flex w-full items-center rounded-full p-2 text-left transition-colors"
+                class="group relative flex items-center p-2 text-left transition-colors"
                 :class="[
                   route.params.id === session.id && !isCollapsed
                     ? 'bg-primary-100 text-gray-900 dark:bg-primary-900/30 dark:text-primary-100'
                     : 'text-gray-700 dark:text-gray-200 hover:bg-gray-200/60 dark:hover:bg-gray-800',
-                  isCollapsed ? 'justify-center cursor-pointer' : 'cursor-pointer',
+                  isCollapsed ? 'justify-center cursor-pointer h-13 w-13 rounded-full ml-3.5' : 'cursor-pointer w-full rounded-full',
                 ]"
                 @click="router.push({ name: getSessionRouteName(session), params: { id: session.id } })"
               >
-                <!-- Platform Icon / Text Avatar - 私聊和群聊使用不同样式 -->
+                <!-- 会话头像 -->
+                <!-- 有头像图片时显示图片 -->
+                <img
+                  v-if="getSessionAvatar(session)"
+                  :src="getSessionAvatar(session)!"
+                  :alt="session.name"
+                  class="h-9 w-9 min-w-9 shrink-0 rounded-full object-cover"
+                  :class="[isCollapsed ? '' : 'mr-3']"
+                />
+                <!-- 无头像时显示图标/文字 -->
                 <div
+                  v-else
                   class="flex h-9 w-9 shrink-0 items-center justify-center rounded-full text-[10px] font-bold"
                   :class="[
                     route.params.id === session.id
@@ -291,6 +309,10 @@ function getSessionAvatarText(session: AnalysisSession): string {
           </UTooltip>
         </div>
       </div>
+      <!-- 底部渐变蒙层 - 让列表消失更自然（固定在外层容器底部） -->
+      <div
+        class="pointer-events-none absolute bottom-0 left-0 right-0 h-12 bg-gradient-to-t from-gray-50 to-transparent dark:from-gray-900"
+      />
     </div>
 
     <!-- Rename Modal -->
diff --git a/src/types/base.ts b/src/types/base.ts
index d4b177f..ab5ebbd 100644
--- a/src/types/base.ts
+++ b/src/types/base.ts
@@ -232,6 +232,7 @@ export interface AnalysisSession {
   groupId: string | null // 群ID（群聊类型有值，私聊为空）
   groupAvatar: string | null // 群头像（base64 Data URL）
   ownerId: string | null // 所有者/导出者的 platformId
+  memberAvatar: string | null // 私聊对方头像（base64 Data URL）
 }
 
 /**