yangjie #49

Merged
yangqiang merged 71 commits from yangjie into master 2025-03-10 14:21:26 +08:00
2 changed files with 22 additions and 17 deletions
Showing only changes of commit 550073a73a - Show all commits

View File

@ -127,7 +127,8 @@ const Home: React.FC = () => {
})} })}
</div> </div>
<div> <div>
{version} <span>:{version}</span>
{/* <span>new</span> */}
</div> </div>
<div> <div>
<Popover <Popover

View File

@ -2224,24 +2224,28 @@ const Meeting: React.FC = () => {
const sendMsg = (text?: string): void => { const sendMsg = (text?: string): void => {
let msg = text ? text : textMsg; let msg = text ? text : textMsg;
if (msg) { if (msg) {
window.electron.onInvoke('sendChannelMsg', { setRoomUserItem((res: any) => {
roomNum: state.channelId, let row = res.find((item: any) => item.uid === userInfo.uid)
msg: msg, window.electron.onInvoke('sendChannelMsg', {
}) roomNum: state.channelId,
let item = { msg: msg,
uid: userInfo.uid, })
userName: userInfo.userName, let item = {
message: msg, uid: userInfo.uid,
timestamp: +new Date() userName: row.userName,
} message: msg,
setChatList((newChatList: any) => [...newChatList, item]) timestamp: +new Date()
window.electron.windowHandleMessage({
key: 'chatSmallWindow',
parmes: {
chatListIten: item,
} }
setChatList((newChatList: any) => [...newChatList, item])
window.electron.windowHandleMessage({
key: 'chatSmallWindow',
parmes: {
chatListIten: item,
}
})
chatScrollBotton()
return res
}) })
chatScrollBotton()
} else { } else {
message.error('请输入内容!') message.error('请输入内容!')
} }