-
+
-
+
-
+
@@ -68,35 +63,44 @@
import { useContextMenu } from '@/hooks/useContextMenu.ts'
import { useViewport } from '@/hooks/useViewport.ts'
-const { content, menu, emoji, specialMenu } = defineProps({
- content: {
- type: Object,
- required: false
- },
- menu: {
- type: Array
- },
- emoji: {
- type: Array
- },
- specialMenu: {
- type: Array,
- default: () => []
- }
+type Props = {
+ content?: Record
+ menu?: any[]
+ emoji?: any[]
+ specialMenu?: any[]
+}
+
+const props = withDefaults(defineProps(), {
+ content: () => ({}),
+ menu: () => [],
+ emoji: () => [],
+ specialMenu: () => []
})
+
// 使用计算属性过滤显示的菜单项
const visibleMenu = computed(() => {
- return menu?.filter((item: any) => {
- // 检查是否有 visible 属性并作为函数调用
+ // 检查是否有 visible 属性并作为函数调用
+ return props.menu?.filter((item: any) => {
if (typeof item.visible === 'function') {
- return item.visible(content) // 如果 visible 是函数，则调用它
+ return item.visible(props.content) // 如果 visible 是函数，则调用它
}
// 如果没有 visible 属性，则默认显示
return true
})
})
+
+// 添加 specialMenu 的过滤功能
+const visibleSpecialMenu = computed(() => {
+ return props.specialMenu?.filter((item: any) => {
+ if (typeof item.visible === 'function') {
+ return item.visible(props.content)
+ }
+ return true
+ })
+})
+
/** 判断是否传入了menu */
-const isNull = computed(() => menu === void 0)
+const isNull = computed(() => props.menu === void 0)
const ContextMenuRef = useTemplateRef('ContextMenuRef')
const emit = defineEmits(['select', 'reply-emoji'])
/** 获取鼠标位置和是否显示右键菜单 */
@@ -138,10 +142,10 @@ const handleClick = (item: string) => {
}
/** 处理回复表情事件 */
-const handleReplyEmoji = (item: string) => {
+const handleReplyEmoji = (item: { label: string }) => {
nextTick(() => {
showMenu.value = false
- emit('reply-emoji', item)
+ emit('reply-emoji', item.label)
})
}
diff --git a/src/components/rightBox/chatBox/ChatHeader.vue b/src/components/rightBox/chatBox/ChatHeader.vue
index 580a907..b7d3918 100644
--- a/src/components/rightBox/chatBox/ChatHeader.vue
+++ b/src/components/rightBox/chatBox/ChatHeader.vue
@@ -376,6 +376,12 @@ const handleConfirm = () => {
// TODO: 删除后当前删除的人提示不准确，无论是删除方还是被删除方都提示“您已被对方拉黑”
})
} else if (optionsType.value === RoomActEnum.EXIT_GROUP) {
+ if (activeItem.roomId === 1) {
+ window.$message.warning('无法退出频道')
+ modalShow.value = false
+ return
+ }
+
groupStore.exitGroup(activeItem.roomId).then(() => {
modalShow.value = false
sidebarShow.value = false
diff --git a/src/components/rightBox/chatBox/ChatMain.vue b/src/components/rightBox/chatBox/ChatMain.vue
index fa93246..d7b27a5 100644
--- a/src/components/rightBox/chatBox/ChatMain.vue
+++ b/src/components/rightBox/chatBox/ChatMain.vue
@@ -175,7 +175,10 @@
:style="item.fromUser.uid === userUid ? 'flex-direction: row-reverse' : ''">
![]()
@@ -414,6 +417,8 @@ import { AvatarUtils } from '@/utils/AvatarUtils'
import VirtualList, { type VirtualListExpose } from '@/components/common/VirtualList.vue'
import { WebviewWindow } from '@tauri-apps/api/webviewWindow'
import { useTauriListener } from '@/hooks/useTauriListener'
+import { useGroupStore } from '@/stores/group.ts'
+import { useGlobalStore } from '@/stores/global'
const appWindow = WebviewWindow.getCurrent()
const { addListener } = useTauriListener()
@@ -423,6 +428,8 @@ const props = defineProps<{
const activeItemRef = shallowRef(props.activeItem)
const chatStore = useChatStore()
const userStore = useUserStore()
+const groupStore = useGroupStore()
+const globalStore = useGlobalStore()
// 记录当前滚动位置相关信息
const isAutoScrolling = ref(false)
@@ -437,6 +444,7 @@ const chatMessageList = computed(() => chatStore.chatMessageList)
const currentNewMsgCount = computed(() => chatStore.currentNewMsgCount)
const messageOptions = computed(() => chatStore.currentMessageOptions)
const { createWebviewWindow } = useWindow()
+const currentRoomId = computed(() => globalStore.currentSession?.roomId)
/** 是否是超级管理员 */
// const isAdmin = computed(() => userInfo?.power === PowerEnum.ADMIN)
/** 跳转回复消息后选中效果 */
diff --git a/src/components/rightBox/chatBox/ChatSidebar.vue b/src/components/rightBox/chatBox/ChatSidebar.vue
index 5c05f21..60531f5 100644
--- a/src/components/rightBox/chatBox/ChatSidebar.vue
+++ b/src/components/rightBox/chatBox/ChatSidebar.vue
@@ -61,7 +61,7 @@
style="max-height: calc(100vh - 260px)"
item-resizable
@scroll="handleScroll($event)"
- :item-size="42"
+ :item-size="46"
:items="filteredUserList">
-
+
-
+
diff --git a/src/components/rightBox/renderMessage/Image.vue b/src/components/rightBox/renderMessage/Image.vue
index 2df0923..3c3fcad 100644
--- a/src/components/rightBox/renderMessage/Image.vue
+++ b/src/components/rightBox/renderMessage/Image.vue
@@ -99,6 +99,7 @@ const openImageViewer = async () => {
// 如果窗口已存在，更新图片内容并显示窗口
await existingWindow.emit('update-image', { list, index }) // 发送更新事件
await existingWindow.show()
+ await existingWindow.setFocus()
return
}
diff --git a/src/hooks/useChatMain.ts b/src/hooks/useChatMain.ts
index 83e48a7..a677fff 100644
--- a/src/hooks/useChatMain.ts
+++ b/src/hooks/useChatMain.ts
@@ -1,5 +1,5 @@
import { useCommon } from '@/hooks/useCommon.ts'
-import { MittEnum, MsgEnum, PowerEnum } from '@/enums'
+import { MittEnum, MsgEnum, PowerEnum, RoleEnum, RoomTypeEnum } from '@/enums'
import { MessageType } from '@/services/types.ts'
import { useMitt } from '@/hooks/useMitt.ts'
import { useChatStore } from '@/stores/chat.ts'
@@ -13,12 +13,14 @@ import { translateText } from '@/services/translate'
import { useSettingStore } from '@/stores/setting.ts'
import { save } from '@tauri-apps/plugin-dialog'
import { useDownload } from '@/hooks/useDownload'
+import { useGroupStore } from '@/stores/group'
export const useChatMain = () => {
const { removeTag, openMsgSession, userUid } = useCommon()
const settingStore = useSettingStore()
const { chat } = storeToRefs(settingStore)
const globalStore = useGlobalStore()
+ const groupStore = useGroupStore()
const chatStore = useChatStore()
const userStore = useUserStore()?.userInfo
const { downloadFile } = useDownload()
@@ -235,10 +237,126 @@ export const useChatMain = () => {
globalStore.addFriendModalInfo.uid = item.uid || item.fromUser.uid
},
visible: (item: any) => !checkFriendRelation(item.uid || item.fromUser.uid, 'all')
+ },
+ {
+ label: '设为管理员',
+ icon: 'people-safe',
+ click: async (item: any) => {
+ const targetUid = item.uid || item.fromUser.uid
+ const roomId = globalStore.currentSession?.roomId
+ if (!roomId) return
+
+ try {
+ await groupStore.addAdmin([targetUid])
+ window.$message.success('设置管理员成功')
+ } catch (error) {
+ window.$message.error('设置管理员失败')
+ }
+ },
+ visible: (item: any) => {
+ // 1. 检查是否在群聊中
+ const isInGroup = globalStore.currentSession?.type === RoomTypeEnum.GROUP
+ if (!isInGroup) return false
+
+ // 2. 检查房间号是否为1(频道)
+ const roomId = globalStore.currentSession?.roomId
+ if (!roomId || roomId === 1) return false
+
+ // 3. 获取目标用户ID
+ const targetUid = item.uid || item.fromUser?.uid
+ if (!targetUid) return false
+
+ // 4. 检查目标用户是否已经是管理员或群主
+ if (item.roleId === RoleEnum.ADMIN || item.roleId === RoleEnum.LORD) return false
+
+ // 5. 检查当前用户是否是群主
+ const currentUser = groupStore.userList.find((user) => user.uid === userUid.value)
+ return currentUser?.roleId === RoleEnum.LORD
+ }
+ },
+ {
+ label: '撤销管理员',
+ icon: 'reduce-user',
+ click: async (item: any) => {
+ const targetUid = item.uid || item.fromUser.uid
+ const roomId = globalStore.currentSession?.roomId
+ if (!roomId) return
+
+ try {
+ await groupStore.revokeAdmin([targetUid])
+ window.$message.success('撤销管理员成功')
+ } catch (error) {
+ window.$message.error('撤销管理员失败')
+ }
+ },
+ visible: (item: any) => {
+ // 1. 检查是否在群聊中
+ const isInGroup = globalStore.currentSession?.type === RoomTypeEnum.GROUP
+ if (!isInGroup) return false
+
+ // 2. 检查房间号是否为1(频道)
+ const roomId = globalStore.currentSession?.roomId
+ if (!roomId || roomId === 1) return false
+
+ // 3. 获取目标用户ID
+ const targetUid = item.uid || item.fromUser?.uid
+ if (!targetUid) return false
+
+ // 4. 检查目标用户是否是管理员(只能撤销管理员,不能撤销群主)
+ if (item.roleId !== RoleEnum.ADMIN) return false
+
+ // 5. 检查当前用户是否是群主
+ const currentUser = groupStore.userList.find((user) => user.uid === userUid.value)
+ return currentUser?.roleId === RoleEnum.LORD
+ }
}
])
/** 举报选项 */
const report = ref([
+ {
+ label: '移出本群',
+ icon: 'people-delete-one',
+ click: async (item: any) => {
+ const targetUid = item.uid || item.fromUser.uid
+ const roomId = globalStore.currentSession?.roomId
+ if (!roomId) return
+
+ try {
+ await apis.removeGroupMember({ roomId, uid: targetUid })
+ // 从群成员列表中移除该用户
+ groupStore.filterUser(targetUid)
+ window.$message.success('移出群聊成功')
+ } catch (error) {
+ window.$message.error('移出群聊失败')
+ }
+ },
+ visible: (item: any) => {
+ // 1. 检查是否在群聊中
+ const isInGroup = globalStore.currentSession?.type === RoomTypeEnum.GROUP
+ if (!isInGroup) return false
+
+ // 2. 检查房间号是否为1(频道)
+ const roomId = globalStore.currentSession?.roomId
+ if (!roomId || roomId === 1) return false
+
+ // 3. 获取目标用户ID
+ const targetUid = item.uid || item.fromUser?.uid
+ if (!targetUid) return false
+
+ // 4. 检查目标用户是否是群主(群主不能被移出)
+ if (item.roleId === RoleEnum.LORD) return false
+
+ // 5. 检查当前用户是否有权限(群主或管理员)
+ const currentUser = groupStore.userList.find((user) => user.uid === userUid.value)
+ const isLord = currentUser?.roleId === RoleEnum.LORD
+ const isAdmin = currentUser?.roleId === RoleEnum.ADMIN
+
+ // 6. 如果当前用户是管理员,则不能移出其他管理员
+ if (isAdmin && item.roleId === RoleEnum.ADMIN) return false
+
+ return isLord || isAdmin
+ }
+ },
{
label: '举报',
icon: 'caution',
diff --git a/src/layout/index.vue b/src/layout/index.vue
index c409195..1472a45 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -52,6 +52,7 @@ import apis from '@/services/apis.ts'
import { confirm } from '@tauri-apps/plugin-dialog'
import { invoke } from '@tauri-apps/api/core'
import { useCachedStore } from '@/stores/cached'
+import { clearListener, initListener, readCountQueue } from '@/utils/ReadCountQueue'
// 异步加载组件时增加缓存配置
const AsyncLeft = defineAsyncComponent({
@@ -85,10 +86,25 @@ const groupStore = useGroupStore()
const userStore = useUserStore()
const loginStore = useWsLoginStore()
const chatStore = useChatStore()
+const cachedStore = useCachedStore()
const { logout } = useLogin()
// 清空未读消息
// globalStore.unReadMark.newMsgUnreadCount = 0
const shrinkStatus = ref(false)
+
+watch(
+ () => userStore.isSign,
+ (newValue) => {
+ if (newValue) {
+ // 初始化监听器
+ initListener()
+ // 读取消息队列
+ readCountQueue()
+ }
+ },
+ { immediate: true }
+)
+
/**
* event默认如果没有传递值就为true，所以shrinkStatus的值为false就会发生值的变化
* 因为shrinkStatus的值为false，所以v-if="!shrinkStatus" 否则right组件刚开始渲染的时候不会显示
@@ -115,7 +131,6 @@ useMitt.on(WsResponseMessageType.LOGIN_SUCCESS, (data: LoginSuccessResType) => {
})
useMitt.on(WsResponseMessageType.USER_STATE_CHANGE, async (data: { uid: number; userStateId: number }) => {
console.log('收到用户状态改变', data)
- const cachedStore = useCachedStore()
await cachedStore.updateUserState(data)
})
useMitt.on(WsResponseMessageType.OFFLINE, async () => {
@@ -239,4 +254,8 @@ onMounted(async () => {
permissionGranted = permission === 'granted'
}
})
+
+onBeforeUnmount(() => {
+ clearListener()
+})
diff --git a/src/services/http.ts b/src/services/http.ts
index edca213..2868370 100644
--- a/src/services/http.ts
+++ b/src/services/http.ts
@@ -234,9 +234,6 @@ async function Http(
console.log('🔄 使用新Token重试原请求')
return attemptFetch(currentAttempt)
} catch (refreshError) {
- // 刷新token失败,需要重新登录
- localStorage.removeItem('TOKEN')
- localStorage.removeItem('REFRESH_TOKEN')
// 可以触发重新登录事件
window.dispatchEvent(new Event('needReLogin'))
throw error
diff --git a/src/services/urls.ts b/src/services/urls.ts
index 0f3402a..3656d58 100644
--- a/src/services/urls.ts
+++ b/src/services/urls.ts
@@ -39,7 +39,7 @@ export default {
getMsgReadCount: `${prefix + URLEnum.CHAT}/msg/read`, // 消息已读未读数
createGroup: `${prefix + URLEnum.ROOM}/group`, // 新增群组
getGroupUserList: `${prefix + URLEnum.ROOM}/group/member/page`, // 群成员列表
- inviteGroupMember: `${prefix + URLEnum.ROOM}/group/member`, // 邀请群成员
+ inviteGroupMember: `${prefix + URLEnum.ROOM}/group/member`, // 邀请群成员 和 移出群成员(post 和 delete)
exitGroup: `${prefix + URLEnum.ROOM}/group/member/exit`, // 退群
addAdmin: `${prefix + URLEnum.ROOM}/group/admin`, // 添加管理员
revokeAdmin: `${prefix + URLEnum.ROOM}/group/admin`, // 删除管理员
diff --git a/src/services/webSocket.ts b/src/services/webSocket.ts
index 4d8ceaa..946377d 100644
--- a/src/services/webSocket.ts
+++ b/src/services/webSocket.ts
@@ -112,10 +112,10 @@ class WS {
case WorkerMsgEnum.WS_ERROR: {
console.log('WebSocket错误:', (params.value as { msg: string }).msg)
useMitt.emit(WsResponseMessageType.NO_INTERNET, params.value)
- localStorage.removeItem('wsLogin')
// 如果是重连失败，可以提示用户刷新页面
if ((params.value as { msg: string }).msg.includes('连接失败次数过多')) {
// 可以触发UI提示，让用户刷新页面
+ // TODO: 无感帮助用户刷新页面
useMitt.emit('wsReconnectFailed', params.value)
}
break
diff --git a/src/styles/scss/chat-sidebar.scss b/src/styles/scss/chat-sidebar.scss
index fa0ea40..2ba0ac1 100644
--- a/src/styles/scss/chat-sidebar.scss
+++ b/src/styles/scss/chat-sidebar.scss
@@ -1,7 +1,7 @@
.item-box {
@apply relative flex flex-col h-100vh box-border select-none text-[--text-color];
.item {
- height: 42px;
+ height: 46px;
padding: 0 4px;
width: 95%;
box-sizing: border-box;
diff --git a/src/workers/webSocket.worker.ts b/src/workers/webSocket.worker.ts
index ac8485d..9b97ef0 100644
--- a/src/workers/webSocket.worker.ts
+++ b/src/workers/webSocket.worker.ts
@@ -13,7 +13,7 @@ let heartTimer: number | null = null
// 重连次数上限
const reconnectCountMax = 5
let reconnectCount = 0
-// 重连🔐
+// 重连锁
let lockReconnect = false
let token: null | string = null
@@ -67,7 +67,7 @@ const onCloseHandler = () => {
clearHeartPackTimer()
if (lockReconnect) return
- // 添加重连次数限制
+ // 重连次数限制检查
if (reconnectCount >= reconnectCountMax) {
console.log('达到最大重连次数，停止重连')
postMsg({
@@ -80,7 +80,7 @@ const onCloseHandler = () => {
updateConnectionState(ConnectionState.RECONNECTING)
lockReconnect = true
- // 使用 timer worker 替代 setTimeout
+ // 使用 timer worker 发起重连
postMsg({
type: 'startReconnectTimer',
value: {
群主
- 管理员
+ v-if="chatStore.isGroup && groupStore.adminUidList.includes(item.fromUser.uid)"
+ class="flex p-4px rounded-4px bg-#cef9ec size-fit select-none">
+ 管理员
{{ item.name }}
+{{ item.name }}
-
管理员
+ class="flex p-4px rounded-4px bg-#cef9ec size-fit select-none"> +管理员