yangjie #41

Merged
yangqiang merged 20 commits from yangjie into master 2024-12-11 14:52:08 +08:00
1 changed files with 39 additions and 20 deletions
Showing only changes of commit cb1593a76f - Show all commits

View File

@ -435,6 +435,7 @@ const Meeting: React.FC = () => {
if (!data) { if (!data) {
setIsScreenCapture(bool => { setIsScreenCapture(bool => {
if (!bool) { if (!bool) {
if (role.ID.includes(userInfo.roleId)) {
confirm({ confirm({
title: '提示', title: '提示',
icon: <ExclamationCircleFilled />, icon: <ExclamationCircleFilled />,
@ -456,6 +457,9 @@ const Meeting: React.FC = () => {
showSingIn() showSingIn()
} }
}) })
} else {
showSingIn()
}
} }
return bool return bool
}) })
@ -2851,6 +2855,21 @@ const Meeting: React.FC = () => {
</label> </label>
<span>{row.title}</span> <span>{row.title}</span>
</div> </div>
case '录制':
case '录制中':
if (role.ID.includes(user.roleId)) {
return <div
className='drag'
onClick={() => changeStatusList(row, itemIndex, rowIndex)}
onMouseDown={() => changeFooterListSelect(row, itemIndex, rowIndex, true)}
onMouseUp={() => changeFooterListSelect(row, itemIndex, rowIndex, false)}
onMouseLeave={() => changeFooterListSelect(row, itemIndex, rowIndex, false)}
key={rowIndex}>
{row.select ? <img src={row.iconSelect} alt="" /> : <img src={row.active ? row.iconActive : row.icon} alt="" />}
<span>{row.title}</span>
</div>
}
return null
default: default:
return <div return <div
className='drag' className='drag'