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

yangjie #51

Open
yangqiang wants to merge 34 commits from yangjie into master
pull from: yangjie
merge into: marking:master
Conversation 0 Commits 34 Files Changed 31 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2d4d8c4344 - Show all commits

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

@ -83,10 +83,10 @@ const UserListWindow: React.FC = () => {
<div> <div>
<div><Avatar name={item.userName} /></div> <div><Avatar name={item.userName} /></div>
<span> <span>
{item.userName}{item.uid === user.uid ? '(我)' : ''} {item.userName}
{role.ID.includes(item.roleId) || item.isRoomManager ? {role.ID.includes(item.roleId) || item.isRoomManager ?
<span> <span>
{role.ID.includes(item.roleId) ? '管理员' : '发言人'} {role.ID.includes(item.roleId) ? item.uid === user.uid ? '(管理员，我)' : '(管理员)' : item.uid === user.uid ? '(发言人，我)' : '(发言人)'}
</span> </span>
: null} : null}
</span> </span>

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

@ -3178,10 +3178,10 @@ const Meeting: React.FC = () => {
<div> <div>
<div><Avatar name={item.userName} /></div> <div><Avatar name={item.userName} /></div>
<span> <span>
<span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', maxWidth: role.ID.includes(item.roleId) || item.isRoomManager ? '200px' : '200px' }} title={item.userName}>{item.userName}{item.uid === user.uid ? '(我)' : ''}</span> <span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', maxWidth: role.ID.includes(item.roleId) || item.isRoomManager ? '200px' : '200px' }} title={item.userName}>{item.userName}</span>
{role.ID.includes(item.roleId) || item.isRoomManager ? {role.ID.includes(item.roleId) || item.isRoomManager ?
<span> <span>
{role.ID.includes(item.roleId) ? '(管理员)' : '(发言人)'} {role.ID.includes(item.roleId) ? item.uid === user.uid ? '(管理员，我)' : '(管理员)' : item.uid === user.uid ? '(发言人，我)' : '(发言人)'}
</span> </span>
: null} : null}
</span> </span>