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

优化

This commit is contained in:
yj 2024-08-22 17:42:40 +08:00
parent 0e7e8c19f6
commit 411608ce20
5 changed files with 59 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/InvitingPersonnelModal/index.module.scss
View File

@ -41,6 +41,7 @@
>div:nth-child(2) {
font-size: 14px;
margin-left: 10px;
white-space: nowrap;
}
&:last-child {

7
src/components/InvitingPersonnelModal/index.tsx
View File

@ -150,9 +150,12 @@ const InvitingPersonnelModal = forwardRef((props: any, ref: any) => {
})
}} disabled={!item.isOnline || item.account === user.account || item.disabled} checked={item.checked}></Checkbox>
<div><Avatar name={item.userName} /></div>
<span>{item.userName}{item.account === user.account ? '(我)' : ''}{item.disabled ? '(已入会)' : ''}</span>
<span>{item.userName}{item.account === user.account ? '(我)' : ''}</span>
</div>
<div>
{item.disabled ? <span style={{ color: '#02B188', marginRight: '4px' }}>已入会</span> : null}
<span style={{ color: item.isOnline ? '#02B188' : 'rgb(221 11 11)' }}>{item.isOnline ? '在线' : '离线'}</span>
</div>
<div style={{ color: item.isOnline ? '#02B188' : 'rgb(221 11 11)' }}>{item.isOnline ? '在线' : '离线'}</div>
</div>) : <span style={{ display: 'block', textAlign: 'center', color: 'white', padding: '30px 0' }}>暂无数据</span>}
</div>
<Pagination size="small" total={list.total} style={{ flexShrink: 0, margin: '10px 0 0' }} onChange={(e) => {

2
src/page/Meeting/index.module.scss
View File

@ -35,7 +35,7 @@
}
>span {
font-size: 16px;
font-size: 13px;
color: #EEEEEE;
flex-grow: 1;
white-space: nowrap;

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

@ -278,7 +278,7 @@ const Meeting: React.FC = () => {
setStatusList((res: any) => {
if (!res.userChatList) {
api.open({
message: item.userName,
message: item.userName + '说：',
description: item.message,
duration: 3,
showProgress: true,
@ -384,20 +384,42 @@ const Meeting: React.FC = () => {
<Button
type="primary"
className='m-ant-btn'
onClick={() => {
PostRoomManager({
onClick={async (e: any) => {
await PostRoomManager({
roomId: state.roomId,
roomNum: state.channelId,
userId: item.uid
})
let i = e.nativeEvent.path;
if (i) {
i.forEach((i: any) => {
if (i.className === 'ant-notification-notice ant-notification-notice-closable') {
i.childNodes.forEach((row: any) => {
console.log(row.className);
if (row.className === 'ant-notification-notice-close') {
row.click()
}
})
}
})
}
}}
>接受</Button>
<Button
type="primary"
onClick={(e: any) => {
const dom = e.target.offsetParent.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement.lastChild;
if (dom) {
dom.click()
let item = e.nativeEvent.path;
if (item) {
item.forEach((item: any) => {
if (item.className === 'ant-notification-notice ant-notification-notice-closable') {
item.childNodes.forEach((row: any) => {
console.log(row.className);
if (row.className === 'ant-notification-notice-close') {
row.click()
}
})
}
})
}
}}
style={{ backgroundColor: '#EC3C3C', marginLeft: '14px' }}
@ -1248,15 +1270,6 @@ const Meeting: React.FC = () => {
setAllUserLook(item)
}}
>全员看Ta</Button> : null}
{item.uid !== user.uid ? <Button
type="primary"
className='m-ant-btn'
size={'small'}
onClick={(event) => {
event.stopPropagation();
getRoomKickout(state.channelId, item.uid, item.userName)
}}
>移出会议</Button> : null}
{item.uid !== user.uid && item.roleId !== '1' ? <Button
type="primary"
className='m-ant-btn'
@ -1296,6 +1309,15 @@ const Meeting: React.FC = () => {
postOpenCamera(!item.enableCamera, item.uid)
}}
>{item.enableCamera ? '关闭视频' : '打开视频'}</Button> : null}
{item.uid !== user.uid ? <Button
type="primary"
style={{ backgroundColor: '#EC3C3C' }}
size={'small'}
onClick={(event) => {
event.stopPropagation();
getRoomKickout(state.channelId, item.uid, item.userName)
}}
>移出会议</Button> : null}
</div>
}>
<div className={styles.meetingContentOperation}>
@ -1417,16 +1439,16 @@ const Meeting: React.FC = () => {
</span>
</div>
<div>
<div>
{item.roleId === '1' || item.isRoomManager ? <div>
<img src={item.enableMicr ? ImageUrl.icon22 : ImageUrl.icon22Active} alt="" onClick={() => {
postOpenMicr(!item.enableMicr, item.uid)
}} title={item.enableMicr ? '静音' : '解除声音'} />
</div>
<div>
</div> : null}
{item.roleId === '1' || item.isRoomManager ? <div>
<img src={item.enableCamera ? ImageUrl.icon23 : ImageUrl.icon23Active} alt="" onClick={() => {
postOpenCamera(!item.enableCamera, item.uid)
}} title={item.enableCamera ? '关闭视频' : '开启视频'} />
</div>
</div> : null}
{item.uid !== user.uid && user.roleId === '1' ? <div>
<Popover placement="left" title={''} content={
<div className='drag'>
@ -1453,8 +1475,7 @@ const Meeting: React.FC = () => {
>{item.isRoomManager ? '取消发言人' : '设为发言人'}</Button> : null}
<Button
type="primary"
className='m-ant-btn'
style={{ width: '100%' }}
style={{ backgroundColor: '#EC3C3C', width: '100%' }}
size={'small'}
onClick={() => {
getRoomKickout(state.channelId, item.uid, item.userName)
@ -1528,15 +1549,6 @@ const Meeting: React.FC = () => {
setAllUserLook(roomUserItem)
}}
>全员看Ta</Button> : null}
{roomUserItem.uid !== user.uid ? <Button
type="primary"
className='m-ant-btn'
size={'small'}
onClick={(event) => {
event.stopPropagation();
getRoomKickout(state.channelId, roomUserItem.uid, roomUserItem.userName)
}}
>移出会议</Button> : null}
{roomUserItem.uid !== user.uid && roomUserItem.roleId !== '1' ? <Button
type="primary"
className='m-ant-btn'
@ -1591,6 +1603,15 @@ const Meeting: React.FC = () => {
})
}}
>{roomUserItem.enableCamera ? '关闭视频' : '打开视频'}</Button> : null}
{roomUserItem.uid !== user.uid ? <Button
type="primary"
style={{ backgroundColor: '#EC3C3C' }}
size={'small'}
onClick={(event) => {
event.stopPropagation();
getRoomKickout(state.channelId, roomUserItem.uid, roomUserItem.userName)
}}
>移出会议</Button> : null}
</div> : <div style={{ color: 'white' }}>用户不在房间内</div>
}>
<div>

2
src/utils/package/agora.ts
View File

@ -269,7 +269,7 @@ const agora = {
let data = {
frameRate: isFluencyPriority ? 30 : 15,
dimensions: {
window: 1920,
width: 1920,
height: 1080,
}
}