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,29 +2619,33 @@ const Meeting: React.FC = () => {
} }
// 设置模式 // 设置模式
const setSyncView = (mode: string) => { const setSyncView = (mode: string) => {
confirm({ if (isShare && mode === 'FreedomMode') {
title: '提示', message.error('共享中,无法切换模式')
icon: <ExclamationCircleFilled />, } else {
content: `是否将当前房间切换为${getMeetingContentBodyLeftModeText(mode)}?`, confirm({
centered: true, title: '提示',
okText: '确定', icon: <ExclamationCircleFilled />,
cancelText: '取消', content: `是否将当前房间切换为${getMeetingContentBodyLeftModeText(mode)}?`,
async onOk() { centered: true,
await window.electron.onInvoke('sendOper2User', { okText: '确定',
uid: userInfo.uid, cancelText: '取消',
contentString: JSON.stringify({ async onOk() {
mode, await window.electron.onInvoke('sendOper2User', {
type: 'mode' uid: userInfo.uid,
contentString: JSON.stringify({
mode,
type: 'mode'
})
}) })
}) setModeOpen(false)
setModeOpen(false) storage.setItem('meetingMode', mode)
storage.setItem('meetingMode', mode) },
}, onCancel() {
onCancel() { setModeOpen(false)
setModeOpen(false) storage.setItem('meetingMode', mode)
storage.setItem('meetingMode', mode) }
} })
}) }
} }
// 判断是否出现滚动条 // 判断是否出现滚动条
const hasScrollbar = () => { const hasScrollbar = () => {