diff --git a/apps/web-antd/src/api/im/message/channel/index.ts b/apps/web-antd/src/api/im/message/channel/index.ts index c727d29c3..10d861717 100644 --- a/apps/web-antd/src/api/im/message/channel/index.ts +++ b/apps/web-antd/src/api/im/message/channel/index.ts @@ -16,7 +16,7 @@ export namespace ImChannelMessageApi { /** 拉取当前用户应收的频道消息(离线增量);按 minId 游标分页 */ -export function pullChannelMessages( +export function pullChannelMessageList( params: { minId: number; size?: number }, signal?: AbortSignal, ) { diff --git a/apps/web-antd/src/api/im/message/group/index.ts b/apps/web-antd/src/api/im/message/group/index.ts index 3ea832f46..200e1c6f9 100644 --- a/apps/web-antd/src/api/im/message/group/index.ts +++ b/apps/web-antd/src/api/im/message/group/index.ts @@ -45,7 +45,7 @@ export function sendGroupMessage(data: ImGroupMessageApi.GroupMessageSendReqVO) } /** 拉取群聊消息(增量) */ -export function pullGroupMessages( +export function pullGroupMessageList( params: { minId: number | string; size: number }, signal?: AbortSignal, ) { diff --git a/apps/web-antd/src/api/im/message/private/index.ts b/apps/web-antd/src/api/im/message/private/index.ts index 9240c99ae..7c40ab65c 100644 --- a/apps/web-antd/src/api/im/message/private/index.ts +++ b/apps/web-antd/src/api/im/message/private/index.ts @@ -41,7 +41,7 @@ export function sendPrivateMessage(data: ImPrivateMessageApi.PrivateMessageSendR } /** 拉取私聊消息(增量) */ -export function pullPrivateMessages( +export function pullPrivateMessageList( params: { minId: number | string; size: number }, signal?: AbortSignal, ) { diff --git a/apps/web-antd/src/views/im/home/composables/useMessagePuller.ts b/apps/web-antd/src/views/im/home/composables/useMessagePuller.ts index 50af50259..b974d710c 100644 --- a/apps/web-antd/src/views/im/home/composables/useMessagePuller.ts +++ b/apps/web-antd/src/views/im/home/composables/useMessagePuller.ts @@ -6,9 +6,9 @@ import type { ImPrivateMessageApi } from '#/api/im/message/private' import { watch } from 'vue' -import { pullChannelMessages as apiPullChannelMessages } from '#/api/im/message/channel' -import { pullGroupMessages as apiPullGroupMessages } from '#/api/im/message/group' -import { getPrivateMaxReadMessageId as apiGetPrivateMaxReadMessageId, pullPrivateMessages as apiPullPrivateMessages } from '#/api/im/message/private' +import { pullChannelMessageList as apiPullChannelMessageList } from '#/api/im/message/channel' +import { pullGroupMessageList as apiPullGroupMessageList } from '#/api/im/message/group' +import { getPrivateMaxReadMessageId as apiGetPrivateMaxReadMessageId, pullPrivateMessageList as apiPullPrivateMessageList } from '#/api/im/message/private' import { getCurrentUserId } from '#/views/im/utils/auth' import { buildChannelConversationStub } from '../../utils/channel' @@ -179,12 +179,12 @@ export const useMessagePuller = () => { isActive: isStillValid, fetchPage: ({ minId, size }) => { if (isPrivate) { - return apiPullPrivateMessages({ minId, size }, signal) + return apiPullPrivateMessageList({ minId, size }, signal) } if (isChannel) { - return apiPullChannelMessages({ minId, size }, signal) + return apiPullChannelMessageList({ minId, size }, signal) } - return apiPullGroupMessages({ minId, size }, signal) + return apiPullGroupMessageList({ minId, size }, signal) }, applyPage: async (list, nextMinId) => { const pulledMessages: PulledMessage[] = [] diff --git a/apps/web-antdv-next/src/api/im/message/channel/index.ts b/apps/web-antdv-next/src/api/im/message/channel/index.ts index c727d29c3..10d861717 100644 --- a/apps/web-antdv-next/src/api/im/message/channel/index.ts +++ b/apps/web-antdv-next/src/api/im/message/channel/index.ts @@ -16,7 +16,7 @@ export namespace ImChannelMessageApi { /** 拉取当前用户应收的频道消息(离线增量);按 minId 游标分页 */ -export function pullChannelMessages( +export function pullChannelMessageList( params: { minId: number; size?: number }, signal?: AbortSignal, ) { diff --git a/apps/web-antdv-next/src/api/im/message/group/index.ts b/apps/web-antdv-next/src/api/im/message/group/index.ts index 3ea832f46..200e1c6f9 100644 --- a/apps/web-antdv-next/src/api/im/message/group/index.ts +++ b/apps/web-antdv-next/src/api/im/message/group/index.ts @@ -45,7 +45,7 @@ export function sendGroupMessage(data: ImGroupMessageApi.GroupMessageSendReqVO) } /** 拉取群聊消息(增量) */ -export function pullGroupMessages( +export function pullGroupMessageList( params: { minId: number | string; size: number }, signal?: AbortSignal, ) { diff --git a/apps/web-antdv-next/src/api/im/message/private/index.ts b/apps/web-antdv-next/src/api/im/message/private/index.ts index 9240c99ae..7c40ab65c 100644 --- a/apps/web-antdv-next/src/api/im/message/private/index.ts +++ b/apps/web-antdv-next/src/api/im/message/private/index.ts @@ -41,7 +41,7 @@ export function sendPrivateMessage(data: ImPrivateMessageApi.PrivateMessageSendR } /** 拉取私聊消息(增量) */ -export function pullPrivateMessages( +export function pullPrivateMessageList( params: { minId: number | string; size: number }, signal?: AbortSignal, ) { diff --git a/apps/web-antdv-next/src/views/im/home/composables/useMessagePuller.ts b/apps/web-antdv-next/src/views/im/home/composables/useMessagePuller.ts index 50af50259..b974d710c 100644 --- a/apps/web-antdv-next/src/views/im/home/composables/useMessagePuller.ts +++ b/apps/web-antdv-next/src/views/im/home/composables/useMessagePuller.ts @@ -6,9 +6,9 @@ import type { ImPrivateMessageApi } from '#/api/im/message/private' import { watch } from 'vue' -import { pullChannelMessages as apiPullChannelMessages } from '#/api/im/message/channel' -import { pullGroupMessages as apiPullGroupMessages } from '#/api/im/message/group' -import { getPrivateMaxReadMessageId as apiGetPrivateMaxReadMessageId, pullPrivateMessages as apiPullPrivateMessages } from '#/api/im/message/private' +import { pullChannelMessageList as apiPullChannelMessageList } from '#/api/im/message/channel' +import { pullGroupMessageList as apiPullGroupMessageList } from '#/api/im/message/group' +import { getPrivateMaxReadMessageId as apiGetPrivateMaxReadMessageId, pullPrivateMessageList as apiPullPrivateMessageList } from '#/api/im/message/private' import { getCurrentUserId } from '#/views/im/utils/auth' import { buildChannelConversationStub } from '../../utils/channel' @@ -179,12 +179,12 @@ export const useMessagePuller = () => { isActive: isStillValid, fetchPage: ({ minId, size }) => { if (isPrivate) { - return apiPullPrivateMessages({ minId, size }, signal) + return apiPullPrivateMessageList({ minId, size }, signal) } if (isChannel) { - return apiPullChannelMessages({ minId, size }, signal) + return apiPullChannelMessageList({ minId, size }, signal) } - return apiPullGroupMessages({ minId, size }, signal) + return apiPullGroupMessageList({ minId, size }, signal) }, applyPage: async (list, nextMinId) => { const pulledMessages: PulledMessage[] = [] diff --git a/apps/web-antdv-next/src/views/im/home/pages/conversation/components/input/message-input.vue b/apps/web-antdv-next/src/views/im/home/pages/conversation/components/input/message-input.vue index 3b40c43bb..4186a076c 100644 --- a/apps/web-antdv-next/src/views/im/home/pages/conversation/components/input/message-input.vue +++ b/apps/web-antdv-next/src/views/im/home/pages/conversation/components/input/message-input.vue @@ -8,7 +8,7 @@ import { computed, onBeforeUnmount, onMounted, ref, useTemplateRef, watch } from import { IconifyIcon as Icon } from '@vben/icons' import { isOpenableUrl } from '@vben/utils' -import { Button, Dropdown, Menu, message, Tooltip } from 'antdv-next' +import { Button, Dropdown, Menu, message, SpaceCompact, Tooltip } from 'antdv-next' import { uploadFile } from '#/api/infra/file' import { @@ -1110,10 +1110,9 @@ async function onVideoPicked(e: Event) { -