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

yangjie #22

Merged
yangqiang merged 99 commits from yangjie into master 2024-10-22 16:11:46 +08:00
Conversation 0 Commits 99 Files Changed 34 +41 -41
2 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dabeb8dfef - Show all commits

42
src/page/Meeting/UserListWindow/index.tsx
View File

@ -96,27 +96,6 @@ const UserListWindow: React.FC = () => {
</span> </span>
</div> </div>
<div> <div>
{item.uid !== user.uid && !role.ID.includes(item.roleId) ? <div onClick={() => {
if (item.isRoomManager) {
channel.postMessage({
type: 'userListWindowDeleteRoomManager',
userListWindowDeleteRoomManager: {
uid: item.uid
}
});
} else {
channel.postMessage({
type: 'userListWindowPostRoomManager',
userListWindowPostRoomManager: {
uid: item.uid
}
});
}
}}>
{!item.isRoomManager ?
<img src={ImageUrl.icon50} alt="" title='允许发言' /> :
<img src={ImageUrl.icon51} alt="" title='取消发言' />}
</div> : null}
{role.ID.includes(item.roleId) || item.isRoomManager ? <div> {role.ID.includes(item.roleId) || item.isRoomManager ? <div>
<img src={item.enableMicr ? ImageUrl.icon22 : ImageUrl.icon22Active} alt="" onClick={() => { <img src={item.enableMicr ? ImageUrl.icon22 : ImageUrl.icon22Active} alt="" onClick={() => {
channel.postMessage({ channel.postMessage({
@ -184,6 +163,27 @@ const UserListWindow: React.FC = () => {
}} /> }} />
</Popover> </Popover>
</div> : null} </div> : null}
{item.uid !== user.uid && !role.ID.includes(item.roleId) ? <div onClick={() => {
if (item.isRoomManager) {
channel.postMessage({
type: 'userListWindowDeleteRoomManager',
userListWindowDeleteRoomManager: {
uid: item.uid
}
});
} else {
channel.postMessage({
type: 'userListWindowPostRoomManager',
userListWindowPostRoomManager: {
uid: item.uid
}
});
}
}}>
{!item.isRoomManager ?
<img src={ImageUrl.icon50} alt="" title='允许发言' /> :
<img src={ImageUrl.icon51} alt="" title='取消发言' />}
</div> : null}
</div> </div>
</div> : null </div> : null
) )

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

@ -2265,26 +2265,6 @@ const Meeting: React.FC = () => {
</span> </span>
</div> </div>
<div> <div>
{item.uid !== user.uid && !role.ID.includes(item.roleId) ? <div onClick={() => {
if (item.isRoomManager) {
DeleteRoomManager({
roomId: state.roomId,
roomNum: state.channelId,
userId: item.uid
})
} else {
postRoomManager({
roomId: state.roomId,
roomNum: state.channelId,
userId: item.uid
})
}
}}>
{!item.isRoomManager ?
<img src={ImageUrl.icon50} alt="" title='允许发言' /> :
<img src={ImageUrl.icon51} alt="" title='取消发言' />
}
</div> : null}
{role.ID.includes(item.roleId) || item.isRoomManager ? <div> {role.ID.includes(item.roleId) || item.isRoomManager ? <div>
<img src={item.enableMicr ? ImageUrl.icon22 : ImageUrl.icon22Active} alt="" onClick={() => { <img src={item.enableMicr ? ImageUrl.icon22 : ImageUrl.icon22Active} alt="" onClick={() => {
postOpenMicr(!item.enableMicr, item.uid) postOpenMicr(!item.enableMicr, item.uid)
@ -2320,6 +2300,26 @@ const Meeting: React.FC = () => {
<EllipsisOutlined style={{ color: '#fff', fontSize: '20px' }} /> <EllipsisOutlined style={{ color: '#fff', fontSize: '20px' }} />
</Popover> </Popover>
</div> : null} </div> : null}
{item.uid !== user.uid && !role.ID.includes(item.roleId) ? <div onClick={() => {
if (item.isRoomManager) {
DeleteRoomManager({
roomId: state.roomId,
roomNum: state.channelId,
userId: item.uid
})
} else {
postRoomManager({
roomId: state.roomId,
roomNum: state.channelId,
userId: item.uid
})
}
}}>
{!item.isRoomManager ?
<img src={ImageUrl.icon50} alt="" title='允许发言' /> :
<img src={ImageUrl.icon51} alt="" title='取消发言' />
}
</div> : null}
</div> </div>
</div> : null </div> : null
) )