marking
/
WGShare.Client.Electron
18
0
Fork 0
Code Pull Requests 1 Actions Releases 4 Activity

Merge pull request 'yangjie' (#30) from yangjie into master 

Reviewed-on: #30
This commit is contained in:
yangqiang 2024-10-29 17:46:21 +08:00
parent 4550e9da9b e849e01876
commit cfdf042eaf
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/page/Meeting/NoticeWindow/index.tsx
View File

@ -22,7 +22,7 @@ const NoticeWindow: React.FC = () => {
message: '', message: '',
description: <div> description: <div>
<span style={{ fontSize: '16px' }}>{noticeItem.uname}申请发言</span> <span style={{ fontSize: '16px' }}>{noticeItem.uname}申请发言</span>
<div style={{ display: 'flex', justifyContent: 'flex-end' }}> <div style={{ display: 'flex', justifyContent: 'flex-end' }} className='drag'>
<Button <Button
type="primary" type="primary"
className='m-ant-btn' className='m-ant-btn'

3
src/page/Meeting/index.tsx
View File

@ -668,7 +668,6 @@ const Meeting: React.FC = () => {
} }
return '' return ''
}) })
await stopScreenCapture() await stopScreenCapture()
} else { } else {
message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}${item.user.userName}为发言人`) message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}${item.user.userName}为发言人`)
@ -693,7 +692,7 @@ const Meeting: React.FC = () => {
message: '', message: '',
description: <div> description: <div>
<span style={{ fontSize: '16px' }}>{item.uname}申请发言</span> <span style={{ fontSize: '16px' }}>{item.uname}申请发言</span>
<div style={{ display: 'flex', justifyContent: 'flex-end' }}> <div style={{ display: 'flex', justifyContent: 'flex-end' }} className='drag'>
<Button <Button
type="primary" type="primary"
className='m-ant-btn' className='m-ant-btn'