yangjie #51

Open
yangqiang wants to merge 34 commits from yangjie into master
1 changed files with 27 additions and 23 deletions
Showing only changes of commit 621ef06aba - Show all commits

View File

@ -1591,7 +1591,7 @@ const Meeting: React.FC = () => {
}); });
const peoPleLength = res.filter((item: any) => (role.ID.includes(item.roleId) || item.isRoomManager) && item.isRoom).length const peoPleLength = res.filter((item: any) => (role.ID.includes(item.roleId) || item.isRoomManager) && item.isRoom).length
setIsAdmin(peoPleLength) setIsAdmin(peoPleLength)
if (peoPleLength >= 6) { if (peoPleLength > 6) {
setMeetingMode('StandardMode') setMeetingMode('StandardMode')
} }
return res return res
@ -2619,6 +2619,9 @@ const Meeting: React.FC = () => {
} }
// 设置模式 // 设置模式
const setSyncView = (mode: string) => { const setSyncView = (mode: string) => {
if (isShare && mode === 'FreedomMode') {
message.error('共享中,无法切换模式')
} else {
confirm({ confirm({
title: '提示', title: '提示',
icon: <ExclamationCircleFilled />, icon: <ExclamationCircleFilled />,
@ -2643,6 +2646,7 @@ const Meeting: React.FC = () => {
} }
}) })
} }
}
// 判断是否出现滚动条 // 判断是否出现滚动条
const hasScrollbar = () => { const hasScrollbar = () => {
let element = document.getElementById('videoView') as HTMLDivElement let element = document.getElementById('videoView') as HTMLDivElement