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

优化

This commit is contained in:
yj 2024-08-19 10:19:11 +08:00
parent 1d8b5bb2ee
commit d470ebd528
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,10 @@
>span { >span {
font-size: 16px; font-size: 16px;
color: #EEEEEE; color: #EEEEEE;
flex-grow: 1;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
} }
} }
} }

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

@ -1060,7 +1060,7 @@ const Meeting: React.FC = () => {
<Avatar name={currentLookUserAccount.userName} /> <Avatar name={currentLookUserAccount.userName} />
</div>} </div>}
</div> </div>
{meetingContentUser(currentLookUserAccount)} {meetingContentUser(currentLookUserAccount, true)}
</div> : null} </div> : null}
{currentLookUserStatus === 1 && currentLookUserAccount ? {currentLookUserStatus === 1 && currentLookUserAccount ?
<div className={`${styles.meetingContentSwiperCard} ${setMeetingContentSwiperCardClass()}`}> <div className={`${styles.meetingContentSwiperCard} ${setMeetingContentSwiperCardClass()}`}>
@ -1069,7 +1069,7 @@ const Meeting: React.FC = () => {
<Avatar name={currentLookUserAccount.userName} /> <Avatar name={currentLookUserAccount.userName} />
</div>} </div>}
</div> </div>
{meetingContentUser(currentLookUserAccount)} {meetingContentUser(currentLookUserAccount, true)}
{currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)} {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
</div> : null} </div> : null}
{currentLookUserStatus === 2 && currentLookUserAccount ? {currentLookUserStatus === 2 && currentLookUserAccount ?
@ -1079,7 +1079,7 @@ const Meeting: React.FC = () => {
<Avatar name={currentLookUserAccount.userName} /> <Avatar name={currentLookUserAccount.userName} />
</div> </div>
</div> </div>
{meetingContentUser(currentLookUserAccount)} {meetingContentUser(currentLookUserAccount, true)}
</div> : null} </div> : null}
{currentLookUserStatus === 3 && currentLookUserAccount ? {currentLookUserStatus === 3 && currentLookUserAccount ?
<div className={`${styles.meetingContentSwiperCard} ${setMeetingContentSwiperCardClass()}`}> <div className={`${styles.meetingContentSwiperCard} ${setMeetingContentSwiperCardClass()}`}>
@ -1088,7 +1088,7 @@ const Meeting: React.FC = () => {
<Avatar name={currentLookUserAccount.userName} /> <Avatar name={currentLookUserAccount.userName} />
</div> </div>
</div> </div>
{meetingContentUser(currentLookUserAccount)} {meetingContentUser(currentLookUserAccount, true)}
{currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)} {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
</div> : null} </div> : null}
{currentLookUserStatus === 4 && currentLookUserAccount ? {currentLookUserStatus === 4 && currentLookUserAccount ?
@ -1098,7 +1098,7 @@ const Meeting: React.FC = () => {
<Avatar name={currentLookUserAccount.userName} /> <Avatar name={currentLookUserAccount.userName} />
</div> </div>
</div> </div>
{meetingContentUser(currentLookUserAccount)} {meetingContentUser(currentLookUserAccount, true)}
</div> : null} </div> : null}
</div> </div>
</div> </div>
@ -1380,7 +1380,7 @@ const Meeting: React.FC = () => {
) )
} }
const meetingContentUser = (item: any) => { const meetingContentUser = (item: any, bool?: boolean) => {
return ( return (
<> <>
<div className={styles.meetingContentUser}> <div className={styles.meetingContentUser}>
@ -1390,7 +1390,10 @@ const meetingContentUser = (item: any) => {
<img src={ImageUrl.icon32} alt="" /> <img src={ImageUrl.icon32} alt="" />
</div> : null} </div> : null}
{!item.enableMicr ? <img src={item.enableMicr ? ImageUrl.icon22 : ImageUrl.icon22Active} alt="" /> : ''} {!item.enableMicr ? <img src={item.enableMicr ? ImageUrl.icon22 : ImageUrl.icon22Active} alt="" /> : ''}
<span>{item.userName}{item.roleId === '1' || item.isRoomManager ? item.roleId === '1' ? '(管理员)' : '(发言人)' : ''}</span> <span style={{ width: bool ? '' : '8vw' }} title={`${item.userName}${item.roleId === '1' || item.isRoomManager ? item.roleId === '1' ? '(管理员)' : '(发言人)' : ''}`}>
{item.userName}
{item.roleId === '1' || item.isRoomManager ? item.roleId === '1' ? '(管理员)' : '(发言人)' : ''}
</span>
</div> </div>
</div> </div>
</> </>