From d68bf9c3f6a23468b253833614a46d57af01eb1a Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Fri, 8 Nov 2024 15:18:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 6 ++++++ src/page/Meeting/index.module.scss | 14 ++++++++++++++ src/page/Meeting/index.tsx | 8 ++++++++ 3 files changed, 28 insertions(+) diff --git a/main.js b/main.js index 386f5f2..c933883 100644 --- a/main.js +++ b/main.js @@ -570,6 +570,12 @@ app.on('ready', () => { case 'noticeWindow': childWindow[config.key].setBounds({ width: config.width, height: config.height }) break; + default: + mainWindow.setMinimumSize(250, config.height); + mainWindow.setMaximumSize(250, config.height); + mainWindow.setSize(250, config.height) + mainWindow.setBounds({ height: config.height }) + break; } }); // 隐藏显示子窗口 diff --git a/src/page/Meeting/index.module.scss b/src/page/Meeting/index.module.scss index 11ba7ea..97678a3 100644 --- a/src/page/Meeting/index.module.scss +++ b/src/page/Meeting/index.module.scss @@ -115,6 +115,20 @@ display: flex; justify-content: center; align-items: center; + z-index: 1; + } + + .meetingAbsoluteText { + position: absolute; + width: 100%; + bottom: 0; + left: 0; + color: white; + text-align: center; + z-index: 1; + background-color: rgba(0, 0, 0, 0.5); + cursor: pointer; + font-size: 14px; } } diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 8fe5559..267fccb 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -147,6 +147,7 @@ const Meeting: React.FC = () => { const [roomUserList, setRoomUserList] = useState([]) const [_speackUid, setSpeackUid] = useState([]) const [chatList, setChatList] = useState([]) + const [isExpand, setIsExpand] = useState(false) const [currentVideoId, setCurrentVideoId] = useState('') let [currentSeconds, setCurrentSeconds] = useState(0) const [currentEffective, setCurrentEffective] = useState(4) @@ -2084,6 +2085,13 @@ const Meeting: React.FC = () => { {footerList[0][1].active ?
: null} +
{ + setIsExpand(!isExpand) + window.electron.setChildWindow({ + height: isExpand ? 160 : 20, + key: 'main' + }) + }}>{isExpand ? '展开' : '收起'}
: null} {contextHolder}