scout666/chat-pc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: scout666:1edb639ad9e5eab8dae4c3bbef1e04a11b88d9f4
Branches Tags
scout666:main
scout666:dev
scout666:wyfMain-dev
scout666:xingyy
scout666:yink
scout666:main-backup
..
compare: scout666:8ce7d143ce599e3f5e21b578a4c552ddb8f65c82
Branches Tags
scout666:dev
scout666:main
scout666:wyfMain-dev
scout666:xingyy
scout666:yink
scout666:main-backup

4 Commits
1edb639ad9 ... 8ce7d143ce

Author SHA1 Message Date
Phoenix
8ce7d143ce 12 2025-05-27 11:43:58 +08:00
Phoenix
58b70f84d7 1 2025-05-27 11:42:34 +08:00
Phoenix
6d663d3d01 Merge branch 'main' of http://172.16.100.91:3000/scout666/chat-pc 2025-05-27 11:38:24 +08:00
Phoenix
b117765bdc fix: 修复用户信息处理和组件逻辑 
- 在useSessionMenu.ts中，修正用户信息处理逻辑，使用正确的用户ID
- 在IndexSider.vue中，移除不必要的watch监听器，简化代码
- 在PanelContent.vue中，优化右键菜单逻辑，确保仅在特定条件下触发
 2025-05-27 11:38:22 +08:00
4 changed files with 4 additions and 116 deletions
Show Stats Expand all files Collapse all files

106
components.d.ts vendored
View File

@ -1,106 +0,0 @@
/* eslint-disable */
// @ts-nocheck
// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
// biome-ignore lint: disable
export {}
/* prettier-ignore */
declare module 'vue' {
export interface GlobalComponents {
ApplyTab: typeof import('./src/components/group/manage/ApplyTab.vue')['default']
AudioMessage: typeof import('./src/components/talk/message/AudioMessage.vue')['default']
Avatar: typeof import('./src/components/base/Avatar.vue')['default']
AvatarCropper: typeof import('./src/components/base/AvatarCropper.vue')['default']
AvatarModule: typeof import('./src/components/avatar-module/index.vue')['default']
CodeMessage: typeof import('./src/components/talk/message/CodeMessage.vue')['default']
ConfigTab: typeof import('./src/components/group/manage/ConfigTab.vue')['default']
ConfirmBox: typeof import('./src/components/confirm-box/index.vue')['default']
ContactModal: typeof import('./src/components/user/ContactModal.vue')['default']
CustomBtn: typeof import('./src/components/common/customBtn.vue')['default']
CustomModal: typeof import('./src/components/common/customModal.vue')['default']
DetailTab: typeof import('./src/components/group/manage/DetailTab.vue')['default']
DialogApi: typeof import('./src/components/common/DialogApi.vue')['default']
Editor: typeof import('./src/components/editor/Editor.vue')['default']
EditorEmail: typeof import('./src/components/user/EditorEmail.vue')['default']
EditorMobile: typeof import('./src/components/user/EditorMobile.vue')['default']
EditorPassword: typeof import('./src/components/user/EditorPassword.vue')['default']
FileMessage: typeof import('./src/components/talk/message/FileMessage.vue')['default']
Flnindex: typeof import('./src/components/flnlayout/tree/flnindex.vue')['default']
ForwardMessage: typeof import('./src/components/talk/message/ForwardMessage.vue')['default']
ForwardRecord: typeof import('./src/components/talk/ForwardRecord.vue')['default']
GroupApply: typeof import('./src/components/group/GroupApply.vue')['default']
GroupLaunch: typeof import('./src/components/group/GroupLaunch.vue')['default']
GroupNotice: typeof import('./src/components/group/GroupNotice.vue')['default']
GroupNoticeMessage: typeof import('./src/components/talk/message/GroupNoticeMessage.vue')['default']
GroupPanel: typeof import('./src/components/group/GroupPanel.vue')['default']
HighLightText: typeof import('./src/components/search/highLightText.vue')['default']
HistoryRecord: typeof import('./src/components/talk/HistoryRecord.vue')['default']
ImageMessage: typeof import('./src/components/talk/message/ImageMessage.vue')['default']
LinkMessage: typeof import('./src/components/talk/message/LinkMessage.vue')['default']
Loading: typeof import('./src/components/base/Loading.vue')['default']
LoginMessage: typeof import('./src/components/talk/message/LoginMessage.vue')['default']
Manage: typeof import('./src/components/group/manage/index.vue')['default']
MeEditorCode: typeof import('./src/components/editor/MeEditorCode.vue')['default']
MeEditorEmoticon: typeof import('./src/components/editor/MeEditorEmoticon.vue')['default']
MeEditorImage: typeof import('./src/components/editor/MeEditorImage.vue')['default']
MeEditorLocation: typeof import('./src/components/editor/MeEditorLocation.vue')['default']
MeEditorRecorder: typeof import('./src/components/editor/MeEditorRecorder.vue')['default']
MeEditorVote: typeof import('./src/components/editor/MeEditorVote.vue')['default']
MemberTab: typeof import('./src/components/group/manage/MemberTab.vue')['default']
MessageApi: typeof import('./src/components/common/MessageApi.vue')['default']
MixedMessage: typeof import('./src/components/talk/message/MixedMessage.vue')['default']
NAvatar: typeof import('naive-ui')['NAvatar']
NButton: typeof import('naive-ui')['NButton']
NCheckbox: typeof import('naive-ui')['NCheckbox']
NDatePicker: typeof import('naive-ui')['NDatePicker']
NDropdown: typeof import('naive-ui')['NDropdown']
NEmpty: typeof import('naive-ui')['NEmpty']
NIcon: typeof import('naive-ui')['NIcon']
NImage: typeof import('naive-ui')['NImage']
NInput: typeof import('naive-ui')['NInput']
NModal: typeof import('naive-ui')['NModal']
NoticeEditor: typeof import('./src/components/group/manage/NoticeEditor.vue')['default']
NoticeTab: typeof import('./src/components/group/manage/NoticeTab.vue')['default']
NotificationApi: typeof import('./src/components/common/NotificationApi.vue')['default']
NPopover: typeof import('naive-ui')['NPopover']
NRadio: typeof import('naive-ui')['NRadio']
NScrollbar: typeof import('naive-ui')['NScrollbar']
NSpin: typeof import('naive-ui')['NSpin']
NTag: typeof import('naive-ui')['NTag']
NVirtualList: typeof import('naive-ui')['NVirtualList']
RevokeMessage: typeof import('./src/components/talk/message/RevokeMessage.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
SearchByCondition: typeof import('./src/components/search/searchByCondition.vue')['default']
SearchItem: typeof import('./src/components/search/searchItem.vue')['default']
SearchList: typeof import('./src/components/search/searchList.vue')['default']
SysGroupAdminMessage: typeof import('./src/components/talk/message/system/SysGroupAdminMessage.vue')['default']
SysGroupCancelMutedMessage: typeof import('./src/components/talk/message/system/SysGroupCancelMutedMessage.vue')['default']
SysGroupCreateMessage: typeof import('./src/components/talk/message/system/SysGroupCreateMessage.vue')['default']
SysGroupDismissed: typeof import('./src/components/talk/message/system/SysGroupDismissed.vue')['default']
SysGroupInfoChangeMessage: typeof import('./src/components/talk/message/system/SysGroupInfoChangeMessage.vue')['default']
SysGroupJoinMessage: typeof import('./src/components/talk/message/system/SysGroupJoinMessage.vue')['default']
SysGroupMemberCancelMutedMessage: typeof import('./src/components/talk/message/system/SysGroupMemberCancelMutedMessage.vue')['default']
SysGroupMemberKickedMessage: typeof import('./src/components/talk/message/system/SysGroupMemberKickedMessage.vue')['default']
SysGroupMemberMutedMessage: typeof import('./src/components/talk/message/system/SysGroupMemberMutedMessage.vue')['default']
SysGroupMemberQuitMessage: typeof import('./src/components/talk/message/system/SysGroupMemberQuitMessage.vue')['default']
SysGroupMemberRemovedMessage: typeof import('./src/components/talk/message/system/SysGroupMemberRemovedMessage.vue')['default']
SysGroupMutedMessage: typeof import('./src/components/talk/message/system/SysGroupMutedMessage.vue')['default']
SysGroupTransferMessage: typeof import('./src/components/talk/message/system/SysGroupTransferMessage.vue')['default']
SysTextMessage: typeof import('./src/components/talk/message/system/SysTextMessage.vue')['default']
TextMessage: typeof import('./src/components/talk/message/TextMessage.vue')['default']
Treelabel: typeof import('./src/components/flnlayout/tree/treelabel.vue')['default']
UnknownMessage: typeof import('./src/components/talk/message/UnknownMessage.vue')['default']
UploadsModal: typeof import('./src/components/base/UploadsModal.vue')['default']
UserCardModal: typeof import('./src/components/user/UserCardModal.vue')['default']
VideoMessage: typeof import('./src/components/talk/message/VideoMessage.vue')['default']
VoteMessage: typeof import('./src/components/talk/message/VoteMessage.vue')['default']
XAddressSelect: typeof import('./src/components/x-naive-ui/x-address-select/index.vue')['default']
XNDataTable: typeof import('./src/components/x-naive-ui/x-n-data-table/index.vue')['default']
XNModal: typeof import('./src/components/x-naive-ui/x-n-modal/index.vue')['default']
XNUpload: typeof import('./src/components/x-naive-ui/x-n-upload/index.vue')['default']
XSearchForm: typeof import('./src/components/x-naive-ui/x-search-form/index.vue')['default']
Xtime: typeof import('./src/components/base/Xtime.vue')['default']
}
}

4
src/hooks/useSessionMenu.ts
View File

@ -108,8 +108,8 @@ export function useSessionMenu() {
const onUserInfo = (item: ISession) => {
console.error('item',item)
debugger
user(item.receiver_id)
user(item.id)
}
// 移除会话

7
src/views/message/inner/IndexSider.vue
View File

@ -298,13 +298,6 @@ const items = computed((): ISession[] => {
return [...topItems, ...normalItems]
})
watch(
() => talkStore,
(newValue, oldValue) => {
// console.log(newValue)
},
{ deep: true, immediate: true }
)
watch(
() => state.addressBookSearchNickName,
(newValue, oldValue) => {

3
src/views/message/inner/panel/PanelContent.vue
View File

@ -324,13 +324,14 @@ const retry=(item:any)=>{
}
const onContextMenuAvatar=(e:any,item:any)=>{
console.log('item',item)
e.preventDefault()
if(item.float!=='right'){
bus.emit(EditorConst.Mention, {
id: item.user_id,
value: item.nickname
})
}
}
</script>