yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

会话和消息处理

im
dylanmay 2024-10-26 19:45:08 +08:00
parent 90461a8cdf
commit f3968db2e0
14 changed files with 191 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
.vscode/settings.json vendored
View File

@ -1,5 +1,7 @@
{
"typescript.tsdk": "node_modules/typescript/lib",
"typescript.tsdk": "./node_modules/typescript/lib",
"volar.tsPlugin": true,
"volar.tsPluginStatus": false,
"npm.packageManager": "pnpm",
"editor.tabSize": 2,
"prettier.printWidth": 100, // 超过最大值换行
@ -62,7 +64,7 @@
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescriptreact]": {
"editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
@ -83,53 +85,74 @@
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit",
"source.fixAll.stylelint": "explicit"
"source.fixAll.eslint": "explicit"
},
"[vue]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit",
"source.fixAll.stylelint": "explicit"
}
},
"i18n-ally.localesPaths": ["src/locales"],
"i18n-ally.keystyle": "nested",
"i18n-ally.sortKeys": true,
"i18n-ally.namespace": false,
"i18n-ally.namespace": true,
"i18n-ally.enabledParsers": ["ts"],
"i18n-ally.sourceLanguage": "en",
"i18n-ally.displayLanguage": "zh-CN",
"i18n-ally.enabledFrameworks": ["vue", "react"],
"cSpell.words": [
"brotli",
"browserslist",
"codemirror",
"commitlint",
"cropperjs",
"echart",
"echarts",
"esnext",
"esno",
"iconify",
"INTLIFY",
"lintstagedrc",
"logicflow",
"nprogress",
"pinia",
"pnpm",
"qrcode",
"sider",
"sortablejs",
"stylelint",
"svgs",
"unocss",
"unplugin",
"unref",
"videojs",
"VITE",
"vitejs",
"vueuse",
"wangeditor",
"xingyu",
"yudao",
"zxcvbn"
"unocss",
"browserslist",
"esnext",
"unplugin",
"qrcode",
"sider",
"pinia",
"sider",
"nprogress",
"INTLIFY",
"stylelint",
"esno",
"vitejs",
"sortablejs",
"codemirror",
"iconify",
"commitlint",
"videojs",
"echarts",
"wangeditor",
"cropperjs",
"logicflow",
"vueuse",
"zxcvbn",
"lintstagedrc",
"brotli",
"sider",
"pnpm"
],
"vetur.format.scriptInitialIndent": true,
"vetur.format.styleInitialIndent": true,
"vetur.validation.script": false,
"MicroPython.executeButton": [
{
"text": "▶",
"tooltip": "运行",
"alignment": "left",
"command": "extension.executeFile",
"priority": 3.5
}
],
"MicroPython.syncButton": [
{
"text": "$(sync)",
"tooltip": "同步",
"alignment": "left",
"command": "extension.execute",
"priority": 4
}
],
// 控制相关文件嵌套展示
"explorer.fileNesting.enabled": true,
@ -138,8 +161,7 @@
"*.ts": "$(capture).test.ts, $(capture).test.tsx",
"*.tsx": "$(capture).test.ts, $(capture).test.tsx",
"*.env": "$(capture).env.*",
"package.json": "pnpm-lock.yaml,yarn.lock,LICENSE,README*,CHANGELOG*,CNAME,.gitattributes,.eslintrc-auto-import.json,.gitignore,prettier.config.js,stylelint.config.js,commitlint.config.js,.stylelintignore,.prettierignore,.gitpod.yml,.eslintrc.js,.eslintignore"
"package.json": "pnpm-lock.yaml,yarn.lock,LICENSE,README*,CHANGELOG*,CNAME,.gitattributes,.gitignore,prettier.config.js,stylelint.config.js,commitlint.config.js,.stylelintignore,.prettierignore,.gitpod.yml,.eslintrc.js,.eslintignore"
},
"terminal.integrated.scrollback": 10000,
"nuxt.isNuxtApp": false
"terminal.integrated.scrollback": 10000
}

4
src/views/chat/ChatPage/Index.vue
View File

@ -1,6 +1,6 @@
<template>
<view class="flex h-full flex-1">
<ToolSection @menuSelectChange="toolMenuSelectChange" />
<ToolSection @menu-select-change="toolMenuSelectChange" />
<Session v-if="bussinessType === MENU_LIST_ENUM.CONVERSATION" />
<Friends v-if="bussinessType === MENU_LIST_ENUM.FRIENDS" />
<view v-if="bussinessType === MENU_LIST_ENUM.CONVERSATION" class="flex w-full flex-col">
@ -22,7 +22,7 @@ import Session from '../components/Session/Index.vue'
import Friends from '../components/Friends/Index.vue'
import ChatHeader from '../components/ChatHeader/Index.vue'
import ChatMessage from '../components/ChatMessage/Index.vue'
import InputSection from '../components/InputSection/index.vue'
import InputSection from '../components/InputSection/Index.vue'
import FriendDetail from '../components/FriendDetail/Index.vue'
import { MENU_LIST_ENUM } from '../types/index.d.ts'

5
src/views/chat/api/messageApi.ts
View File

@ -17,8 +17,7 @@ export interface SendMsg {
}
export interface SessionMsgReq {
receiverId: number
conversationType: number
conversationNo: string
sendTime: Date
}
@ -41,7 +40,7 @@ export default class MessageApi {
* @returns Promise<Array<MessageModelType>>
*/
static getSessionMsg(params: SessionMsgReq): Promise<Array<MessageModelType>> {
return request.get({ url: '/im/message/list', params })
return request.get({ url: '/im/message/listByNo', params })
}
/**

41
src/views/chat/components/ChatMessage/Index.vue
View File

@ -1,18 +1,12 @@
<template>
<view
class="flex flex-col items-start w-full border-b-1 border-b-gray border-b-solid flex-1 border-b-1 border-b-gray border-b-solid py-2 overflow-scroll"
>
ref="listBoxRef">
<template v-for="item in chatStore.currentSession?.msgList">
<TextMsg
v-if="item.contentType === ContentType.TEXT"
:key="item.clientMessageId"
:message="item"
/>
<TextMsg v-if="item.contentType === ContentType.TEXT" :key="item.clientMessageId" :message="item" class="py-1" />
<ImageMsg
v-if="item.contentType === ContentType.IMAGE"
:key="item.clientMessageId"
:message="item"
/>
v-if="item.contentType === ContentType.IMAGE" :key="item.clientMessageId" :message="item"
class="py-1" />
</template>
</view>
</template>
@ -26,4 +20,31 @@ import { ContentType } from '../../types/index.d.ts'
defineOptions({ name: 'ChatMessage' })
const chatStore = useChatStore()
const listBoxRef = ref<HTMLElement | null>(null)
const msgListLength = computed(() => {
return chatStore.currentSession ? chatStore.currentSession.msgList.length : 0
})
const scrollToBottom = () => {
nextTick(() => {
if (listBoxRef.value) {
console.log("scrollToBottom");
listBoxRef.value.scrollTop = listBoxRef.value.scrollHeight;
}
});
};
watch(msgListLength, (newLength, oldLength) => {
if (newLength > oldLength) {
scrollToBottom()
}
})
watch(() => chatStore.currentSessionIndex, () => {
scrollToBottom()
})
</script>

16
src/views/chat/components/InputSection/Index.vue
View File

@ -3,7 +3,7 @@
class="flex flex-col items-center w-full border-b-1 border-b-gray border-b-solid"
style="height: 248px; min-height: 248px"
>
<view class="flex p-2 w-full" style="height: 20px">
<view class="flex p-2 w-full" style="height: 32px">
<Icon icon="ep:apple" color="var(--top-header-text-color)" class="custom-hover" />
<Icon icon="ep:folder" color="var(--top-header-text-color)" class="custom-hover" />
<Icon icon="ep:chat-line-square" color="var(--top-header-text-color)" class="custom-hover" />
@ -26,6 +26,7 @@ import TextMessage from '../../model/TextMessage'
import { useChatStoreWithOut } from '../../store/chatstore'
import { CONVERSATION_TYPE } from '../../types/index.d.ts'
import { SendStatus, MessageRole, ContentType } from '../../types/index.d.ts'
import { useUserStoreWithOut } from '../../../../store/modules/user';
defineOptions({ name: 'InputSection' })
@ -38,20 +39,23 @@ const onEnter = () => {
}
const createTextMessage = (content: string): TextMessage => {
console.log('====>>>>', content)
const userStore = useUserStoreWithOut()
// 部分信息从account信息里面获取
const msg = new TextMessage(
'',
'',
'',
userStore.user.avatar,
userStore.user.nickname,
new Date().getTime(),
false,
content,
MessageRole.SELF,
SendStatus.SENDING,
chatStore.currentSession?.id || '',
chatStore.currentSession?.targetId,
chatStore.currentSession?.type || CONVERSATION_TYPE.SINGLE
chatStore.currentSession ? chatStore.currentSession.targetId : 0,
chatStore.currentSession?.type || CONVERSATION_TYPE.SINGLE,
chatStore.currentSession?.conversationNo || ''
)
return msg

2
src/views/chat/components/Message/BaseMsg.vue
View File

@ -4,7 +4,7 @@
:class="props.message.role === MessageRole.SELF ? 'flex-row-reverse' : 'flex-row'"
>
<el-avatar shape="square" size="default" class="mx-2" :src="props.message.avatar" />
<view class="flex flex-col">
<view class="flex flex-col" :class="props.message.role === MessageRole.SELF ? 'items-end' : 'items-start'">
<label class="text-xs text-gray-4 mb-1">{{ props.message.nickname }}</label>
<view class="flex items-center">
<el-icon v-if="props.message.sendStatus === SendStatus.SENDING" class="is-loading"

2
src/views/chat/components/Session/Index.vue
View File

@ -1,5 +1,5 @@
<template>
<view class="flex flex-col items-center h-full py-2 b-1 b-gray b-solid" style="width: 248px">
<view class="flex flex-col items-center h-full py-2 b-1 b-gray b-solid" style="width: 258px">
<view class="flex flex-col w-full">
<SessionItem
v-for="(item, index) in chatStore.sessionList"

52
src/views/chat/components/SessionItem/Index.vue
View File

@ -1,23 +1,16 @@
<template>
<view class="flex py-2 border-b-gray-3 border-b-solid items-center px-2" :class="bgColor()">
<el-avatar shape="square" size="default" class="mr-2">
{{ props.conversation.name || '' }}
</el-avatar>
<el-avatar shape="square" size="default" class="mr-2" :src="props.conversation.avatar" />
<view class="flex flex-col flex-1 tems-end h-full">
<label
class="text-black-c text-size-sm font-medium text-ellipsis text-nowrap"
:class="namefontColor()"
>{{ props.conversation.name }}</label
>
<label
class="text-gray-f text-size-sm text-ellipsis text-nowrap mr-1"
:class="timefontColor()"
>{{ props.conversation.description }}</label
>
<label class="text-black-c text-size-sm font-medium text-ellipsis text-nowrap" :class="namefontColor()">{{
props.conversation.nickname || '' }}</label>
<label class="text-gray-f text-size-sm text-ellipsis text-nowrap mr-1" :class="timefontColor()">{{ lastMessage
}}</label>
</view>
<view class="flex items-end h-full flex-col">
<label class="text-gray-f text-size-xs text-nowrap" :class="timefontColor()">{{
formatPast(new Date(props.conversation.updateTime), 'YYYY-MM-DD')
formatPast(new Date(props.conversation.updateTime), 'YYYY/MM/DD')
}}</label>
</view>
</view>
@ -25,16 +18,17 @@
<script lang="ts" setup>
import { PropType } from 'vue'
import { ConversationModelType } from '../../types'
import { ContentType, ConversationModelType } from '../../types/index.d.ts'
import { formatPast } from '@/utils/formatTime'
import { useChatStore } from '../../store/chatstore'
import TextMessage from '../../model/TextMessage';
defineOptions({ name: 'SessionItem' })
const props = defineProps({
conversation: {
type: Object as PropType<ConversationModelType>,
default: () => {}
default: () => { }
},
index: Number
})
@ -51,6 +45,32 @@ const namefontColor = () => {
const timefontColor = () => {
return props.index === chatStore.currentSessionIndex ? 'text-white' : 'timeColor'
}
/**
* TODO: 修改为后端计算，否则在没有打开聊天窗口的时候，没有数据。
*/
const lastMessage = computed(() => {
if (props.conversation.msgList.length === 0) {
return props.conversation.lastMessageDescription
}
const lastIndex = props.conversation.msgList.length - 1
const lastMessage = props.conversation.msgList[lastIndex]
if (!lastMessage) {
return ''
}
if (lastMessage.contentType === ContentType.TEXT) {
return (lastMessage as TextMessage).content
} else if (lastMessage.contentType === ContentType.IMAGE) {
return '[图片]'
} else {
return '[其他]'
}
})
</script>
<style lang="scss" scoped>

20
src/views/chat/model/BaseConversation.ts
View File

@ -7,31 +7,39 @@ export default class BaseConversation {
public description: string
public createTime: number
public updateTime: number
public unreadCount: number
public unreadMessagesCount: number
public msgList: Array<MessageModelType>
public type: ConversationType
public targetId: number
public senderId: number
public conversationNo: string
public lastMessageDescription: string
constructor(
id: string,
avatar: string,
name: string,
descrition: string,
lastMessageDescription: string,
createTime: number,
updateTime: number,
unreadCount: number,
unreadMessagesCount: number,
msgList: Array<MessageModelType>,
type: ConversationType,
targetId: number
targetId: number,
senderId: number,
conversationNo: string
) {
this.id = id
this.avatar = avatar
this.name = name
this.description = descrition
this.lastMessageDescription = lastMessageDescription
this.createTime = createTime
this.updateTime = updateTime
this.unreadCount = unreadCount
this.unreadMessagesCount = unreadMessagesCount
this.msgList = msgList
this.type = type
this.targetId = targetId
this.senderId = senderId
this.conversationNo = conversationNo
}
}

5
src/views/chat/model/BaseMessage.ts
View File

@ -13,6 +13,7 @@ export default class BaseMessage {
clientMessageId: string
receiverId: number
conversationType: number
conversationNo: string
constructor(
id: string,
avatar: string,
@ -24,7 +25,8 @@ export default class BaseMessage {
contentType: ContentType,
conversationId: string,
receiverId: number,
conversationType: number
conversationType: number,
conversationNo: string
) {
this.id = id
this.avatar = avatar
@ -38,6 +40,7 @@ export default class BaseMessage {
this.receiverId = receiverId
this.clientMessageId = this.generateClientMessageId()
this.conversationType = conversationType
this.conversationNo = conversationNo
}
private generateClientMessageId() {

16
src/views/chat/model/ChatConversation.ts
View File

@ -6,25 +6,29 @@ export class ChatConversation extends BaseConversation {
id: string,
avatar: string,
name: string,
descrition: string,
lastMessageDescription: string,
createTime: number,
updateTime: number,
unreadCount: number,
unreadMessagesCount: number,
msgList: Array<BaseMessage>,
type: number,
targetId: number
targetId: number,
senderId: number,
conversationNo: string
) {
super(
id,
avatar,
name,
descrition,
lastMessageDescription,
createTime,
updateTime,
unreadCount,
unreadMessagesCount,
msgList,
type,
targetId
targetId,
senderId,
conversationNo
)
}
}

6
src/views/chat/model/ImageMessage.ts
View File

@ -15,7 +15,8 @@ export default class ImageMessage extends BaseMessage {
sendStatus: SendStatus,
conversationId: string,
receiverId: number,
conversationType: number
conversationType: number,
conversationNo: string
) {
super(
id,
@ -28,7 +29,8 @@ export default class ImageMessage extends BaseMessage {
ContentType.IMAGE,
conversationId,
receiverId,
conversationType
conversationType,
conversationNo
)
this.content = content
}

6
src/views/chat/model/TextMessage.ts
View File

@ -15,7 +15,8 @@ export default class TextMessage extends BaseMessage {
sendStatus: SendStatus,
conversationId: string,
receiverId: number,
conversationType: number
conversationType: number,
conversationNo: string
) {
super(
id,
@ -28,7 +29,8 @@ export default class TextMessage extends BaseMessage {
ContentType.TEXT,
conversationId,
receiverId,
conversationType
conversationType,
conversationNo
)
this.content = content
}

17
src/views/chat/store/chatstore.ts
View File

@ -11,12 +11,12 @@ interface ChatStoreModel {
sessionList: Array<ConversationModelType>
currentSession: ConversationModelType | null
currentSessionIndex: number
inputText: string
inputText: string,
}
export const useChatStore = defineStore('chatStore', {
state: (): ChatStoreModel => ({
sessionList: reactive<Array<ConversationModelType>>([]),
sessionList: [],
currentSession: null,
currentSessionIndex: 0,
inputText: ''
@ -121,6 +121,10 @@ export const useChatStore = defineStore('chatStore', {
updateTime: item.lastReadTime,
name: item.targetId,
targetId: item.targetId,
senderId: item.userId,
conversationNo: item.no,
unreadMessagesCount: item.unreadMessagesCount,
description: item.lastMessageDescription,
msgList: []
}))
} catch (error) {
@ -133,17 +137,14 @@ export const useChatStore = defineStore('chatStore', {
return
}
const receiverId = this.currentSession.targetId
const type = this.currentSession.type
const userStore = useUserStoreWithOut()
try {
const res = await MessageApi.getSessionMsg({
receiverId: receiverId,
conversationType: type,
sendTime: new Date()
conversationNo: this.currentSession.conversationNo
// sendTime: new Date().toISOString().slice(0, -1)
})
const userStore = useUserStoreWithOut()
this.currentSession.msgList = res.map((item) => {
return {