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 +8 -3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d29f3c707d - Show all commits

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

@ -109,7 +109,6 @@
position: absolute; position: absolute;
z-index: 1; z-index: 1;
width: 100%; width: 100%;
height: 100%;
left: 0; left: 0;
top: 0; top: 0;

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

@ -2730,7 +2730,13 @@ const Meeting: React.FC = () => {
}}> }}>
{isScreenCapture ? <div className={`${styles.meetingAbsolute}`}> {isScreenCapture ? <div className={`${styles.meetingAbsolute}`}>
<div style={{ top: '0px' }} className={`${styles.meetingAbsoluteText}`}>{currentSpeakUser.length ? '正在说话:' + currentSpeakUser.join(';') : '正在说话:'}</div> <div style={{ top: '0px' }} className={`${styles.meetingAbsoluteText}`}>{currentSpeakUser.length ? '正在说话:' + currentSpeakUser.join(';') : '正在说话:'}</div>
<div className={`${styles.meetingAbsoluteVideoView}`} id='meetingAbsoluteVideoView' style={{ overflowY: roomUserList.filter((item: any) => item.isRoom).length > 4 && isExpand ? 'auto' : 'hidden' }}> <div
className={`${styles.meetingAbsoluteVideoView}`}
id='meetingAbsoluteVideoView'
style={{
overflowY: roomUserList.filter((item: any) => item.isRoom).length > 4 && isExpand ? 'auto' : 'hidden',
height: isExpand ? `calc((4 * 160px) + 15px)` : '100%'
}}>
{roomUserList {roomUserList
.filter((item: any) => item.isRoom && item.isAdmin) .filter((item: any) => item.isRoom && item.isAdmin)
.map((item: any) => ( .map((item: any) => (
@ -2748,7 +2754,7 @@ const Meeting: React.FC = () => {
<div style={{ bottom: '0px' }} className={`${styles.meetingAbsoluteText} drag`} onClick={() => { <div style={{ bottom: '0px' }} className={`${styles.meetingAbsoluteText} drag`} onClick={() => {
setIsExpand(!isExpand) setIsExpand(!isExpand)
window.electron.setChildWindow({ window.electron.setChildWindow({
height: !isExpand ? 4 * 160 + 15 : 160, height: !isExpand ? 4 * 160 + (15 + 20) : 160,
key: 'main' key: 'main'
}) })
}}><span>{isExpand ? '收起' : '查看参会者'}</span></div> }}><span>{isExpand ? '收起' : '查看参会者'}</span></div>