Compare commits

..

No commits in common. "d68bf9c3f6a23468b253833614a46d57af01eb1a" and "f34731f040ebf524bcf9b29c812d8d2d46534bf1" have entirely different histories.

3 changed files with 0 additions and 28 deletions

View File

@ -570,12 +570,6 @@ app.on('ready', () => {
case 'noticeWindow': case 'noticeWindow':
childWindow[config.key].setBounds({ width: config.width, height: config.height }) childWindow[config.key].setBounds({ width: config.width, height: config.height })
break; break;
default:
mainWindow.setMinimumSize(250, config.height);
mainWindow.setMaximumSize(250, config.height);
mainWindow.setSize(250, config.height)
mainWindow.setBounds({ height: config.height })
break;
} }
}); });
// 隐藏显示子窗口 // 隐藏显示子窗口

View File

@ -115,20 +115,6 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: 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;
} }
} }

View File

@ -147,7 +147,6 @@ const Meeting: React.FC = () => {
const [roomUserList, setRoomUserList] = useState<any>([]) const [roomUserList, setRoomUserList] = useState<any>([])
const [_speackUid, setSpeackUid] = useState<any>([]) const [_speackUid, setSpeackUid] = useState<any>([])
const [chatList, setChatList] = useState<any>([]) const [chatList, setChatList] = useState<any>([])
const [isExpand, setIsExpand] = useState(false)
const [currentVideoId, setCurrentVideoId] = useState('') const [currentVideoId, setCurrentVideoId] = useState('')
let [currentSeconds, setCurrentSeconds] = useState(0) let [currentSeconds, setCurrentSeconds] = useState(0)
const [currentEffective, setCurrentEffective] = useState(4) const [currentEffective, setCurrentEffective] = useState(4)
@ -2085,13 +2084,6 @@ const Meeting: React.FC = () => {
{footerList[0][1].active ? <div className={styles.meetingAbsoluteLoading}> {footerList[0][1].active ? <div className={styles.meetingAbsoluteLoading}>
<Avatar name={user.userName} /> <Avatar name={user.userName} />
</div> : null} </div> : null}
<div className={`${styles.meetingAbsoluteText} drag`} onClick={() => {
setIsExpand(!isExpand)
window.electron.setChildWindow({
height: isExpand ? 160 : 20,
key: 'main'
})
}}><span>{isExpand ? '展开' : '收起'}</span></div>
</div> : null} </div> : null}
{contextHolder} {contextHolder}
<div className={styles.meetingHeader}> <div className={styles.meetingHeader}>