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

优化

This commit is contained in:
yj 2024-08-09 14:39:29 +08:00
parent 39dbaa825d
commit 0b8c9cb05c
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -584,7 +584,6 @@ const Meeting: React.FC = () => {
} }
// 分享屏幕 // 分享屏幕
const clickSharedScreen = async (): Promise<void> => { const clickSharedScreen = async (): Promise<void> => {
setIsSharePopConfirm(false)
let data = sharedScreenList.find((item: any) => item.sourceId === sharedScreenItem.sourceId) let data = sharedScreenList.find((item: any) => item.sourceId === sharedScreenItem.sourceId)
if (data) { if (data) {
const footerListTemplate = [...footerList] const footerListTemplate = [...footerList]
@ -765,18 +764,6 @@ const Meeting: React.FC = () => {
return '' return ''
} }
// 是否有人分享屏幕确认框
const handleOpenChange = (newOpen: boolean): void => {
if (newOpen) {
if (isShare) {
setIsSharePopConfirm(true)
} else {
clickSharedScreen()
}
} else {
setIsSharePopConfirm(false)
}
};
return ( return (
<> <>
<div className={styles.meeting} onClick={() => { <div className={styles.meeting} onClick={() => {
@ -1127,27 +1114,35 @@ const Meeting: React.FC = () => {
</div> </div>
<div> <div>
<Button type="primary" onClick={() => { <Button type="primary" onClick={() => {
setIsSharedScreenModal(false)
setIsSharePopConfirm(false) setIsSharePopConfirm(false)
setIsSharedScreenModal(false)
}} style={{ backgroundColor: '#31353A', marginRight: '14px' }}>取消</Button> }} style={{ backgroundColor: '#31353A', marginRight: '14px' }}>取消</Button>
<Popconfirm {isShare ? <Popconfirm
title="提示" title="提示"
description={`用户${isShareUser?.userName}正在屏幕，是否继续共享？`} description={`用户${isShareUser?.userName}正在屏幕，是否继续共享？`}
open={isSharePopConfirm} open={isSharePopConfirm}
onOpenChange={handleOpenChange}
onConfirm={async () => { onConfirm={async () => {
await onInvoke('sendOper', { await onInvoke('sendOper', {
roomNum: state.channelId, roomNum: state.channelId,
type: 4, type: 4,
}) })
setIsSharePopConfirm(false)
clickSharedScreen() clickSharedScreen()
}} }}
onCancel={() => { }} onCancel={() => {
setIsSharePopConfirm(false)
}}
okText="是" okText="是"
cancelText="否" cancelText="否"
> >
<Button type="primary" className='m-ant-btn'>共享</Button> <Button type="primary" className='m-ant-btn' onClick={() => {
</Popconfirm> setIsSharePopConfirm(true)
}}>共享</Button>
</Popconfirm> :
<Button type="primary" className='m-ant-btn' onClick={() => {
clickSharedScreen()
}}>共享</Button>
}
</div> </div>
</div> </div>
</div> </div>