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