消息发送-2:sessionType统一和MsgType保持一致

This commit is contained in:
bob
2024-09-15 14:01:33 +08:00
parent 767981bc46
commit fda668cae2
2 changed files with 15 additions and 13 deletions

View File

@@ -6,6 +6,7 @@ import UserCard from '../user/UserCard.vue'
import GroupCard from '../group/GroupCard.vue'
import { sessionShowTime } from '@/utils/common'
import { Top, Bottom, MuteNotification, Bell } from '@element-plus/icons-vue'
import { MsgType } from '@/proto/msg'
const props = defineProps(['sessionId', 'sessionType', 'objectInfo'])
const emit = defineEmits(['exportData'])
@@ -24,9 +25,9 @@ const sessionInfo = computed(() => {
const showName = computed(() => {
switch (props.sessionType) {
case 'chat':
case MsgType.CHAT:
return props.objectInfo.nickName
case 'groupchat':
case MsgType.GROUP_CHAT:
return props.objectInfo.groupName
default:
return ''
@@ -35,9 +36,9 @@ const showName = computed(() => {
const showId = computed(() => {
switch (props.sessionType) {
case 'chat':
case MsgType.CHAT:
return props.objectInfo.account
case 'groupchat':
case MsgType.GROUP_CHAT:
return props.objectInfo.groupId
default:
return ''
@@ -46,8 +47,8 @@ const showId = computed(() => {
const showAvatarThumb = computed(() => {
switch (props.sessionType) {
case 'chat':
case 'groupchat':
case MsgType.CHAT:
case MsgType.GROUP_CHAT:
return props.objectInfo.avatarThumb
default:
return ''
@@ -68,10 +69,10 @@ const handleGroupCard = (flag) => {
}
const showSomeoneCard = () => {
switch (props.sessionType) {
case 'chat':
case MsgType.CHAT:
isShowUserCard.value = true
break
case 'groupchat':
case MsgType.GROUP_CHAT:
isShowGroupCard.value = true
break
default:

View File

@@ -78,9 +78,9 @@ onMounted(async () => {
const showName = computed(() => {
switch (curSessionType.value) {
case 'chat':
case MsgType.CHAT:
return curObject.value.nickName
case 'groupchat':
case MsgType.GROUP_CHAT:
return curObject.value.groupName
default:
return ''
@@ -89,9 +89,9 @@ const showName = computed(() => {
const showId = computed(() => {
switch (curSessionType.value) {
case 'chat':
case MsgType.CHAT:
return curObject.value.account
case 'groupchat':
case MsgType.GROUP_CHAT:
return curObject.value.groupId
default:
return ''
@@ -135,6 +135,7 @@ const handleExportData = (data) => {
}
// 发送事件要做的事情
const handleExportContent = (content) => {
// TODO 这里还要考虑失败情况1消息发不出去2消息发出去了服务器不发“已发送”
wsConnect.sendMsg(curObject.value.account, MsgType.CHAT, content, (deliveredMsg) => {
messageData.addMsgRecord(curSessionId.value, {
msgId: deliveredMsg.body.msgId,
@@ -207,7 +208,7 @@ watch(() => messageData.msgRecords[curSessionId.value], () => {
<el-header class="header bdr-b">
<div class="show-name-id">
<span class="show-name">{{ showName }}</span>
<span v-if="curSessionType === 'chat'" class="show-id">{{ showId }}</span>
<span v-if="curSessionType === MsgType.CHAT" class="show-id">{{ showId }}</span>
</div>
<div class="action-set">