yangjie #22

Merged
yangqiang merged 99 commits from yangjie into master 2024-10-22 16:11:46 +08:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit c67585bfec - Show all commits

View File

@ -157,7 +157,7 @@ const UserListWindow: React.FC = () => {
}} /> }} />
</Popover> </Popover>
</div> : null} </div> : null}
{item.uid !== user.uid && !role.ID.includes(item.roleId) ? <div onClick={() => { {item.uid !== user.uid && !role.ID.includes(item.roleId) && role.ID.includes(user.roleId) ? <div onClick={() => {
if (item.isRoomManager) { if (item.isRoomManager) {
channel.postMessage({ channel.postMessage({
type: 'userListWindowDeleteRoomManager', type: 'userListWindowDeleteRoomManager',

View File

@ -2378,7 +2378,7 @@ 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={() => { {item.uid !== user.uid && !role.ID.includes(item.roleId) && role.ID.includes(user.roleId) ? <div onClick={() => {
if (item.isRoomManager) { if (item.isRoomManager) {
DeleteRoomManager({ DeleteRoomManager({
roomId: state.roomId, roomId: state.roomId,