vue-chat-kit 0.3.10 → 0.3.11

package/src/components/ui/icons/ArrowDown.vue

@@ -0,0 +1,5 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M6 9L12 15L18 9" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/ArrowRight.vue

@@ -0,0 +1,5 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M9 18L15 12L9 6" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/Bell.vue

@@ -0,0 +1,6 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M18 8A6 6 0 0 0 6 8c0 7-3 9-3 9h18s-3-2-3-9" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M13.73 21a2 2 0 0 1-3.46 0" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/Camera.vue

@@ -0,0 +1,6 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M23 19V5C23 3.89543 22.1046 3 21 3H17L15 1H9L7 3H3C1.89543 3 1 3.89543 1 5V19C1 20.1046 1.89543 21 3 21H21C22.1046 21 23 20.1046 23 19Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M12 17C14.7614 17 17 14.7614 17 12C17 9.23858 14.7614 7 12 7C9.23858 7 7 9.23858 7 12C7 14.7614 9.23858 17 12 17Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/ChatDotRound.vue

@@ -0,0 +1,5 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M21 15C21 18.866 16.9706 22 12 22C8.141 22 4.8475 19.826 3.5 16.5M21 15C21 6 12 2 12 2C12 2 3 6 3 15C3 16.3958 3.38031 17.6959 4.06703 18.8409M21 15C21 16.3958 20.6197 17.6959 19.933 18.8409M3.5 16.5C3.30485 16.7949 3.15853 17.1078 3.06817 17.4314M4.06703 18.8409L3 22L7 20" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/Check.vue

@@ -0,0 +1,5 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M5 13L9 17L19 7" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/CircleCheck.vue

@@ -0,0 +1,6 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="12" cy="12" r="10" stroke="currentColor" stroke-width="2"/>
+    <path d="M8 12L11 15L16 9" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/Clock.vue

@@ -0,0 +1,6 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="12" cy="12" r="10" stroke="currentColor" stroke-width="2"/>
+    <path d="M12 6V12L16 14" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/Close.vue

@@ -0,0 +1,5 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M6 6L18 18M18 6L6 18" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/Delete.vue

@@ -0,0 +1,8 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M3 6H21" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
+    <path d="M19 6V20C19 21.1046 18.1046 22 17 22H7C5.89543 22 5 21.1046 5 20V6M8 6V4C8 2.89543 8.89543 2 10 2H14C15.1046 2 16 2.89543 16 4V6" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M10 11V17" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
+    <path d="M14 11V17" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/Edit.vue

@@ -0,0 +1,6 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M11 4H4C2.89543 4 2 4.89543 2 6V20C2 21.1046 2.89543 22 4 22H18C19.1046 22 20 21.1046 20 20V13" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M18.5 2.5C18.8978 2.10218 19.4374 1.87869 20 1.87869C20.5626 1.87869 21.1022 2.10218 21.5 2.5C21.8978 2.89782 22.1213 3.43744 22.1213 4C22.1213 4.56256 21.8978 5.10218 21.5 5.5L12 15L8 16L9 12L18.5 2.5Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/Folder.vue

@@ -0,0 +1,5 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M3 7V5C3 3.89543 3.89543 3 5 3H8L10 6H19C20.1046 6 21 6.89543 21 8V19C21 20.1046 20.1046 21 19 21H5C3.89543 21 3 20.1046 3 19V7Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/Minus.vue

@@ -0,0 +1,5 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M5 12H19" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/Monitor.vue

@@ -0,0 +1,7 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <rect x="2" y="3" width="20" height="14" rx="2" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M8 21H16" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M12 17V21" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/Moon.vue

@@ -0,0 +1,5 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M21 12.79A9 9 0 1111.21 3 7 7 0 0021 12.79Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/Picture.vue

@@ -0,0 +1,7 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M21 19V5C21 3.89543 20.1046 3 19 3H5C3.89543 3 3 3.89543 3 5V19C3 20.1046 3.89543 21 5 21H19C20.1046 21 21 20.1046 21 19Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M8.5 10C9.88071 10 11 8.88071 11 7.5C11 6.11929 9.88071 5 8.5 5C7.11929 5 6 6.11929 6 7.5C6 8.88071 7.11929 10 8.5 10Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M21 15L16 10L5 21" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/Plus.vue

@@ -0,0 +1,5 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M12 5V19M5 12H19" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/Search.vue

@@ -0,0 +1,6 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M11 19C15.4183 19 19 15.4183 19 11C19 6.58172 15.4183 3 11 3C6.58172 3 3 6.58172 3 11C3 15.4183 6.58172 19 11 19Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M21 21L16.65 16.65" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/Setting.vue

@@ -0,0 +1,6 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M19.4 15C19.1 15.6 18.6 16.1 18 16.4L16.5 13.9C16.2 13.8 15.8 13.8 15.5 13.9L14.5 16.4C13.9 16.8 13 16.9 12.4 16.6L12 14.4C12 14.1 11.8 13.9 11.6 13.9H9.6C9.4 13.9 9.1 14.1 9 14.4L8.6 16.6C8 16.9 7.1 16.8 6.5 16.4L5.5 13.9C5.2 13.8 4.8 13.8 4.5 13.9L3 16.4C2.4 16.1 1.9 15.6 1.6 15L1 13C0.7 12.3 0.9 11.5 1.6 11L4.5 8.5C4.8 8.2 4.8 7.8 4.5 7.5L3 5C3.3 4.4 3.8 3.9 4.4 3.6L7.5 2.5C8.1 2.3 8.8 2.5 9.2 2.9L10.2 5.4C10.5 5.7 10.8 5.8 11.2 5.8H13.2C13.5 5.8 13.8 5.7 14.1 5.4L15.1 2.9C15.5 2.5 16.2 2.3 16.8 2.5L19.9 3.6C20.5 3.9 21 4.4 21.3 5L22.8 7.5C23.1 7.8 23.1 8.2 22.8 8.5L20 11C20.3 11.5 20.4 12.2 20.1 12.8L19.4 15Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/Sunny.vue

@@ -0,0 +1,6 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M12 17C14.7614 17 17 14.7614 17 12C17 9.23858 14.7614 7 12 7C9.23858 7 7 9.23858 7 12C7 14.7614 9.23858 17 12 17Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M12 1V3M12 21V23M4.22 4.22L5.64 5.64M18.36 18.36L19.78 19.78M1 12H3M21 12H23M4.22 19.78L5.64 18.36M18.36 5.64L19.78 4.22" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/User.vue

@@ -0,0 +1,6 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M20 21V19C20 17.9391 19.5786 16.9217 18.8284 16.1716C18.0783 15.4214 17.0609 15 16 15H8C6.93913 15 5.92172 15.4214 5.17157 16.1716C4.42143 16.9217 4 17.9391 4 19V21" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M12 11C14.2091 11 16 9.20914 16 7C16 4.79086 14.2091 3 12 3C9.79086 3 8 4.79086 8 7C8 9.20914 9.79086 11 12 11Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/UserFilled.vue

@@ -0,0 +1,6 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M12 13C14.7614 13 17 10.7614 17 8C17 5.23858 14.7614 3 12 3C9.23858 3 7 5.23858 7 8C7 10.7614 9.23858 13 12 13Z" fill="currentColor"/>
+    <path d="M20 21V19C20 17.9391 19.5786 16.9217 18.8284 16.1716C18.0783 15.4214 17.0609 15 16 15H8C6.93913 15 5.92172 15.4214 5.17157 16.1716C4.42143 16.9217 4 17.9391 4 19V21" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/Warning.vue

@@ -0,0 +1,5 @@
+<template>
+  <svg width="1em" height="1em" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M12 9V13M12 17H12.01M21 12C21 16.9706 16.9706 21 12 21 7.02944 21 3 16.9706 3 12 3 7.02944 7.02944 3 12 3 16.9706 3 21 7.02944 21 12 21Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>

package/src/components/ui/icons/index.js

@@ -0,0 +1,24 @@
+// 图标组件导出
+export { default as Search } from './Search.vue'
+export { default as User } from './User.vue'
+export { default as UserFilled } from './UserFilled.vue'
+export { default as ArrowDown } from './ArrowDown.vue'
+export { default as ArrowRight } from './ArrowRight.vue'
+export { default as Folder } from './Folder.vue'
+export { default as ChatDotRound } from './ChatDotRound.vue'
+export { default as Check } from './Check.vue'
+export { default as CircleCheck } from './CircleCheck.vue'
+export { default as Close } from './Close.vue'
+export { default as Delete } from './Delete.vue'
+export { default as Setting } from './Setting.vue'
+export { default as Camera } from './Camera.vue'
+export { default as Edit } from './Edit.vue'
+export { default as Plus } from './Plus.vue'
+export { default as Minus } from './Minus.vue'
+export { default as Sunny } from './Sunny.vue'
+export { default as Moon } from './Moon.vue'
+export { default as Monitor } from './Monitor.vue'
+export { default as Warning } from './Warning.vue'
+export { default as Picture } from './Picture.vue'
+export { default as Bell } from './Bell.vue'
+export { default as Clock } from './Clock.vue'

package/src/components/ui/index.js

@@ -0,0 +1,10 @@
+// UI 组件导出
+export { default as Button } from './Button.vue'
+export { default as Dialog } from './Dialog.vue'
+export { default as Input } from './Input.vue'
+export { default as Empty } from './Empty.vue'
+export { default as Message } from './Message.vue'
+export { default as MessageManager } from './MessageManager.vue'
+export { default as MessageBox } from './MessageBox.vue'
+export { default as Switch } from './Switch.vue'
+export { default as Tag } from './Tag.vue'

package/src/composables/useFriendChat.js

@@ -36,7 +36,7 @@ export function useFriendChat(core) {
     return list.map(item => ({
       id: item.username,
       name: item.username,
-      avatar: item.avatar ? `${config.api.baseUrl}${item.avatar}` : myAvatar.value,
+      avatar: item.avatar ? `${config.api.baseUrl}${item.avatar}` : `https://api.dicebear.com/7.x/avataaars/svg?seed=${item.username}`,
       online: item.online,
       lastMsg: item.lastMsg || '暂无消息',
       lastTime: item.lastTime,
@@ -56,7 +56,7 @@ export function useFriendChat(core) {
     return list.map(item => ({
       id: item.username,
       name: item.username,
-      avatar: item.avatar ? `${config.api.baseUrl}${item.avatar}` : myAvatar.value,
+      avatar: item.avatar ? `${config.api.baseUrl}${item.avatar}` : `https://api.dicebear.com/7.x/avataaars/svg?seed=${item.username}`,
       online: item.online,
       isChatting: item.isChatting
     }))
@@ -111,20 +111,16 @@ export function useFriendChat(core) {
       const res = await api.getFriends(myUsername)
       const allFriends = res.data || []
       friendList.value = allFriends
+      
+      console.log('[VueChatKit] 获取到的好友列表:', friendList.value)
+      console.log('[VueChatKit] 所有好友的 isChatting:', friendList.value.map(f => ({ username: f.username, isChatting: f.isChatting })))
+      
       chatList.value = allFriends.filter(item => item.isChatting === 1)
       
-      // 获取未读数
-      for (const friend of chatList.value) {
-        try {
-          const historyRes = await api.getHistory(myUsername, friend.username)
-          const messages = historyRes.data || []
-          friend.unReadNum = messages.filter(msg => 
-            msg.isRead === 0 && msg.sendUsername === friend.username
-          ).length
-        } catch {
-          friend.unReadNum = 0
-        }
-      }
+      console.log('[VueChatKit] 正在聊天的好友列表:', chatList.value)
+      
+      // 未读数直接从接口返回的数据中获取，不再单独请求历史记录
+      // 假设接口返回的 friend 对象中已经包含 unReadNum 字段
     } catch (error) {
       console.error('[VueChatKit] 获取好友列表失败', error)
     }

package/src/composables/useGroupChat.js

@@ -9,6 +9,7 @@ export function useGroupChat(core) {
   // ========== 状态 ==========
   const activeTab = ref('friends')
   const groupList = ref([])
+  const chatList = ref([]) // 正在聊天的群聊列表
   const currentSelectGroup = ref(null)
   const groupMsgList = ref([])
   const groupMemberList = ref([])
@@ -22,6 +23,7 @@ export function useGroupChat(core) {
   const selectedMembersForInvite = ref([])
   // 新增状态
   const groupInfoVisible = ref(false)
+  const isRemoveMemberMode = ref(false) // 是否处于移除成员模式
   const editingGroupInfo = ref({
     groupNickname: '',
     remark: '',
@@ -53,6 +55,69 @@ export function useGroupChat(core) {
   })
 
   // ========== 计算属性 ==========
+  
+  // 判断当前用户是否是群主：优先检查群成员列表中当前用户的 memberType === 0
+  const isGroupOwner = computed(() => {
+    console.log('[VueChatKit] 检查是否群主:', { 
+      myUsername, 
+      groupMemberCount: groupMemberList.value?.length 
+    })
+    
+    if (!currentSelectGroup.value) {
+      console.log('[VueChatKit] 没有选择群')
+      return false
+    }
+    
+    // 优先检查群成员列表中当前用户的 memberType === 0
+    if (groupMemberList.value && groupMemberList.value.length > 0) {
+      const currentUserInGroup = groupMemberList.value.find(
+        m => m.username === myUsername
+      )
+      
+      console.log('[VueChatKit] 当前用户在群成员:', currentUserInGroup)
+      
+      if (currentUserInGroup) {
+        if (currentUserInGroup.memberType === 0) {
+          console.log('[VueChatKit] ✅ 当前用户是群主 (memberType=0)')
+          return true
+        }
+        console.log('[VueChatKit] 当前用户 memberType:', currentUserInGroup.memberType)
+      }
+    }
+    
+    // 兜底逻辑：检查群的 ownerUsername/owner 字段
+    if (currentSelectGroup.value.ownerUsername === myUsername || 
+        currentSelectGroup.value.owner === myUsername) {
+      console.log('[VueChatKit] ✅ 通过群 owner 字段判断是群主')
+      return true
+    }
+    
+    console.log('[VueChatKit] ❌ 当前用户不是群主')
+    return false
+  })
+
+  // 从群成员列表中获取群主用户名
+  const groupOwnerUsername = computed(() => {
+    if (!currentSelectGroup.value) return ''
+    
+    // 优先从群信息中获取
+    if (currentSelectGroup.value.ownerUsername) {
+      return currentSelectGroup.value.ownerUsername
+    }
+    if (currentSelectGroup.value.owner) {
+      return currentSelectGroup.value.owner
+    }
+    
+    // 从成员列表中查找 memberType === 0 的用户
+    if (groupMemberList.value.length > 0) {
+      const ownerMember = groupMemberList.value.find(m => m.memberType === 0)
+      if (ownerMember) {
+        return ownerMember.username
+      }
+    }
+    
+    return ''
+  })
 
   // 过滤后的群聊列表
   const filteredGroupList = computed(() => {
@@ -65,41 +130,23 @@ export function useGroupChat(core) {
       )
     }
     return list.map(item => {
-      const members = groupMembersMap.value[item.groupId] || []
-      const memberAvatars = members.slice(0, 4).map(member => ({
-        username: member.username,
-        avatar: member.avatar 
-          ? `${config.api.baseUrl}${member.avatar}`
-          : `https://api.dicebear.com/7.x/avataaars/svg?seed=${member.username}`
-      }))
+      // 使用接口返回的 groupAvatarList 来生成 memberAvatars
+      const memberAvatars = (item.groupAvatarList || []).map((avatarPath, index) => ({
+        username: `member-${index}`,
+        avatar: `${config.api.baseUrl}${avatarPath}`
+      })).slice(0, 4)
       
-      // 获取最后一条消息，处理不同的字段名
-      let lastMsg = '暂无消息'
-      if (item.lastMsg) {
-        lastMsg = item.lastMsg
-      } else if (item.lastMessage) {
-        lastMsg = item.lastMessage
-      } else if (item.latestMessage) {
-        lastMsg = item.latestMessage
-      }
+      // 获取最后一条消息
+      const lastMsg = item.lastMsgContent || '暂无消息'
       
-      // 获取未读数，处理不同的字段名
-      let unread = 0
-      if (item.unReadNum !== undefined && item.unReadNum !== null) {
-        unread = item.unReadNum
-      } else if (item.unreadCount !== undefined && item.unreadCount !== null) {
-        unread = item.unreadCount
-      } else if (item.unread !== undefined && item.unread !== null) {
-        unread = item.unread
-      }
+      // 获取最后消息发送者
+      const lastMsgSender = item.lastMsgSender || ''
       
-      // 获取最后时间，处理不同的字段名
-      let lastTime = item.lastTime
-      if (!lastTime && item.latestTime) {
-        lastTime = item.latestTime
-      } else if (!lastTime && item.lastMsgTime) {
-        lastTime = item.lastMsgTime
-      }
+      // 获取未读数
+      const unread = item.unreadCount || 0
+      
+      // 获取最后时间
+      const lastTime = item.lastMsgTime
       
       return {
         id: item.groupId,
@@ -110,9 +157,10 @@ export function useGroupChat(core) {
         avatar: `https://api.dicebear.com/7.x/avataaars/svg?seed=${item.groupId}`,
         memberAvatars: memberAvatars,
         lastMsg: lastMsg,
+        lastMsgSender: lastMsgSender,
         lastTime: lastTime,
         unread: unread,
-        memberCount: item.memberCount || 0,
+        memberCount: item.memberTotal || 0,
         // 保留原始字段用于编辑功能
         notice: item.notice,
         groupNickname: item.groupNickname
@@ -160,19 +208,43 @@ export function useGroupChat(core) {
       const res = await api.getMyGroups(myUsername)
       groupList.value = res.data || []
       
-      for (const group of groupList.value) {
-        try {
-          const membersRes = await api.getGroupMembers(group.groupId, myUsername)
-          groupMembersMap.value[group.groupId] = membersRes.data || []
-        } catch (err) {
-          console.error(`[VueChatKit] 获取群 ${group.groupId} 成员失败`, err)
-          groupMembersMap.value[group.groupId] = []
-        }
-      }
+      console.log('[VueChatKit] 获取到的群聊列表:', groupList.value)
+      console.log('[VueChatKit] 所有群聊的 groupChatStatus:', groupList.value.map(g => ({ groupId: g.groupId, groupName: g.groupName, groupChatStatus: g.groupChatStatus })))
+      
+      chatList.value = groupList.value.filter(item => item.groupChatStatus === 1)
+      
+      console.log('[VueChatKit] 正在聊天的群聊列表:', chatList.value)
+      
+      // 不在这里获取所有群成员，改为按需获取
     } catch (error) {
       console.error('[VueChatKit] 获取群聊列表失败', error)
     }
   }
+  
+  // 按需获取单个群的成员
+  const ensureGroupMembers = async (groupId) => {
+    if (!groupMembersMap.value[groupId]) {
+      try {
+        const membersRes = await api.getGroupMembers(groupId, myUsername)
+        groupMembersMap.value[groupId] = membersRes.data || []
+      } catch (err) {
+        console.error(`[VueChatKit] 获取群 ${groupId} 成员失败`, err)
+        groupMembersMap.value[groupId] = []
+      }
+    }
+  }
+
+  // 设置群聊聊天状态
+  const setGroupToChatStatus = async (groupId, status = 1) => {
+    try {
+      await api.setGroupChatStatus(groupId, myUsername, status)
+      await getGroupList()
+      return true
+    } catch (error) {
+      console.error('[VueChatKit] 设置群聊状态失败', error)
+      return false
+    }
+  }
 
   // 获取群聊历史消息
   const getGroupHistory = async (groupId) => {
@@ -206,9 +278,11 @@ export function useGroupChat(core) {
     // 3. 设置当前选中的群
     currentSelectGroup.value = group
     
-    // 4. 加载该群历史聊天消息
+    // 4. 按需加载群成员和历史聊天消息
+    await ensureGroupMembers(group.groupId)
     await getGroupHistory(group.groupId)
-    await getGroupMembers(group.groupId)
+    // 同时也更新 groupMemberList 供当前选中的群使用
+    groupMemberList.value = groupMembersMap.value[group.groupId] || []
     
     scrollToBottom()
   }
@@ -288,10 +362,14 @@ export function useGroupChat(core) {
   }
 
   // 开始编辑字段
-  const startEditField = (field) => {
+  const startEditField = async (field) => {
     // 先确保有最新数据
     if (!currentGroupInfo.value && currentSelectGroup.value) {
-      fetchGroupDetail(currentSelectGroup.value.groupId)
+      await fetchGroupDetail(currentSelectGroup.value.groupId)
+    }
+    // 初始化临时编辑值
+    if (currentGroupInfo.value) {
+      tempEditValues.value[field] = currentGroupInfo.value[field] || ''
     }
     editingFields.value[field] = true
   }
@@ -386,22 +464,30 @@ export function useGroupChat(core) {
   const removeGroupMember = async (targetUsername) => {
     if (!currentSelectGroup.value) return false
     try {
+      console.log('[VueChatKit] 开始移除成员:', targetUsername)
       const res = await api.removeGroupMember(
         currentSelectGroup.value.groupId,
         myUsername,
         targetUsername
       )
       if (res.code === 200) {
+        console.log('[VueChatKit] 移除成员成功，刷新成员列表')
         await getGroupMembers(currentSelectGroup.value.groupId)
+        // 如果移除的成员在当前显示列表中，刷新成员列表
+        if (isRemoveMemberMode.value) {
+          isRemoveMemberMode.value = false
+        }
         return true
       }
+      console.warn('[VueChatKit] 移除成员失败，返回结果:', res)
       return false
     } catch (error) {
-      console.error('[VueChatKit] 移除成员失败', error)
+      console.error('[VueChatKit] 移除成员异常', error)
       return false
     }
   }
 
+
   // 转让群主
   const transferGroupOwner = async (newOwnerUsername) => {
     if (!currentSelectGroup.value) return false
@@ -687,6 +773,7 @@ export function useGroupChat(core) {
     // 状态
     activeTab,
     groupList,
+    chatList,
     currentSelectGroup,
     groupMsgList,
     groupMemberList,
@@ -699,6 +786,7 @@ export function useGroupChat(core) {
     inviteMemberDialogVisible,
     selectedMembersForInvite,
     groupInfoVisible,
+    isRemoveMemberMode,
     editingGroupInfo,
     editingMemberNick,
     memberNickDialogVisible,
@@ -711,6 +799,8 @@ export function useGroupChat(core) {
     // 计算属性
     filteredGroupList,
     currentGroupMessages,
+    isGroupOwner,
+    groupOwnerUsername,
     
     // 方法
     getGroupList,
@@ -741,7 +831,9 @@ export function useGroupChat(core) {
     updateSingleGroupField,
     startEditField,
     cancelEditField,
-    saveEditField
+    saveEditField,
+    setGroupToChatStatus,
+    ensureGroupMembers
   }
 }
 

package/src/composables/useMessage.js

@@ -0,0 +1,21 @@
+import { inject } from 'vue'
+
+const MESSAGE_MANAGER_KEY = Symbol('messageManager')
+
+export const useMessage = () => {
+  const manager = inject(MESSAGE_MANAGER_KEY)
+  
+  if (!manager) {
+    console.warn('MessageManager not found. Please wrap your app with MessageManager component.')
+    // 提供一个后备实现
+    return {
+      show: (msg) => console.log('[Message]', msg),
+      success: (msg) => console.log('[Success]', msg),
+      warning: (msg) => console.warn('[Warning]', msg),
+      error: (msg) => console.error('[Error]', msg),
+      info: (msg) => console.info('[Info]', msg)
+    }
+  }
+  
+  return manager
+}