diff --git a/src/page/Meeting/index.module.scss b/src/page/Meeting/index.module.scss index 87e9b40..2b77ba7 100644 --- a/src/page/Meeting/index.module.scss +++ b/src/page/Meeting/index.module.scss @@ -410,6 +410,7 @@ } } .meetingContentBodyLeftSpeakerModeNoScrollbar{ + width: 246px !important; &::-webkit-scrollbar { display: none; } diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index e529fc5..f9e8806 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -2139,8 +2139,8 @@ const Meeting: React.FC = () => { window.electron.createChildWindow('show') setKeyOpenChildWindow('shareScreenWindow', true) window.electron.setMainWindowSize({ - width: 270, - height: 160, + width: 250, + height: 200, }) window.electron.setPosition('right') } @@ -2201,6 +2201,7 @@ const Meeting: React.FC = () => { } // 停止共享 const stopScreenCapture = async (): Promise => { + setMeetingMode('StandardMode') const footerListTemplate = [...footerList] await agora.leaveChannelEx(userInfo.screenShareId) agora.stopScreenCapture() @@ -2701,18 +2702,11 @@ const Meeting: React.FC = () => {
{currentSpeakUser.length ? '正在说话:' + currentSpeakUser.join(';') : '正在说话:'}
{ setIsExpand(!isExpand) - // 临时方案 - window.electron.setMainWindowSize({ - width: 270, - height: !isExpand ? 160 * 4 : 160, + window.electron.setChildWindow({ + height: !isExpand ? 160 * 4 : 200, + width: 250, + key: 'main' }) - window.electron.setPosition('right') - // 更新壳子 - // window.electron.setChildWindow({ - // height: !isExpand ? 160 * 4 : 160, - // width: 270, - // key: 'main' - // }) }}>{isExpand ? '收起' : '查看参会者'}
: null} {contextMenu ?
{
}
-
+
{isAdmin && currentLookUserAccount && !isScreenCapture ? getSettingIcon() : null}
{roomUserList.map((item: any, index: number) => {