marking
/
WGShare.Client.Electron
18
0
Fork 0
Code Pull Requests 1 Actions Releases 4 Activity

优化

This commit is contained in:
yj 2024-08-12 16:01:05 +08:00
parent cb6aa21477
commit fcefaea359
2 changed files with 24 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/page/Meeting/index.module.scss
View File

@ -283,9 +283,12 @@
bottom: 16px; bottom: 16px;
z-index: 2; z-index: 2;
cursor: pointer; cursor: pointer;
display: flex;
justify-content: center;
align-items: center;
background-color: rgba(0, 0, 0, 0.5); background-color: rgba(0, 0, 0, 0.5);
padding: 5px;
box-sizing: border-box; box-sizing: border-box;
padding: 0px 5px;
} }
.meetingContentSwiperCardShare { .meetingContentSwiperCardShare {

88
src/page/Meeting/index.tsx
View File

@ -4,7 +4,7 @@ import Operation from '@/components/Operation';
import SpeakerModeModal from '@/components/SpeakerModeModal'; import SpeakerModeModal from '@/components/SpeakerModeModal';
import InvitingPersonnelModal from '@/components/InvitingPersonnelModal'; import InvitingPersonnelModal from '@/components/InvitingPersonnelModal';
import { Button, Input, Popover, Modal, Checkbox, message, Popconfirm } from "antd"; import { Button, Input, Popover, Modal, Checkbox, message, Popconfirm } from "antd";
import { SearchOutlined, SmallDashOutlined } from '@ant-design/icons'; import { SearchOutlined, EllipsisOutlined } from '@ant-design/icons';
import { useLocation, useNavigate } from 'react-router-dom'; import { useLocation, useNavigate } from 'react-router-dom';
import { thumbImageBufferToBase64 } from '@/utils/package/base64' import { thumbImageBufferToBase64 } from '@/utils/package/base64'
import { storage } from '@/utils'; import { storage } from '@/utils';
@ -788,11 +788,11 @@ const Meeting: React.FC = () => {
}) })
} }
// 设置全员观看 // 设置全员观看
const setAllUserLook = (): void => { const setAllUserLook = (item: any): void => {
if (isShare) { if (isShare) {
allUserLook(String(isShare) === currentLookUserAccount.screenShareId ? currentLookUserAccount.screenShareId : currentLookUserAccount.uid) allUserLook(String(isShare) === item.screenShareId ? item.screenShareId : item.uid)
} else { } else {
allUserLook(currentLookUserAccount.uid) allUserLook(item.uid)
} }
} }
return ( return (
@ -873,6 +873,22 @@ const Meeting: React.FC = () => {
{String(isShare) === item.screenShareId ? <div className={styles.meetingContentSwiperCardShare}> {String(isShare) === item.screenShareId ? <div className={styles.meetingContentSwiperCardShare}>
屏幕分享中 屏幕分享中
</div> : null} </div> : null}
<Popover placement="top" title={''} content={
<div>
<Button
type="primary"
className='m-ant-btn'
onClick={() => setAllUserLook(item)}
>全员看Ta</Button>
</div>
}>
<div className={styles.meetingContentOperation}>
<EllipsisOutlined style={{
color: '#fff',
fontSize: '20px'
}} />
</div>
</Popover>
</div> </div>
} }
)} )}
@ -893,22 +909,6 @@ const Meeting: React.FC = () => {
</div>} </div>}
</div> </div>
{meetingContentUser(currentLookUserAccount)} {meetingContentUser(currentLookUserAccount)}
<Popover placement="top" title={''} content={
<div>
<Button
type="primary"
className='m-ant-btn'
onClick={() => setAllUserLook()}
>全员看Ta</Button>
</div>
}>
<div className={styles.meetingContentOperation}>
<SmallDashOutlined style={{
color: '#fff',
fontSize: '30px'
}} />
</div>
</Popover>
{currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)} {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
</div> : null} </div> : null}
{currentLookUserStatus === 2 && currentLookUserAccount ? {currentLookUserStatus === 2 && currentLookUserAccount ?
@ -919,22 +919,6 @@ const Meeting: React.FC = () => {
</div> </div>
</div> </div>
{meetingContentUser(currentLookUserAccount)} {meetingContentUser(currentLookUserAccount)}
<Popover placement="top" title={''} content={
<div>
<Button
type="primary"
className='m-ant-btn'
onClick={() => setAllUserLook()}
>全员看Ta</Button>
</div>
}>
<div className={styles.meetingContentOperation}>
<SmallDashOutlined style={{
color: '#fff',
fontSize: '30px'
}} />
</div>
</Popover>
{currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)} {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
</div> : null} </div> : null}
{currentLookUserStatus === 3 && currentLookUserAccount ? {currentLookUserStatus === 3 && currentLookUserAccount ?
@ -945,22 +929,6 @@ const Meeting: React.FC = () => {
</div> </div>
</div> </div>
{meetingContentUser(currentLookUserAccount)} {meetingContentUser(currentLookUserAccount)}
<Popover placement="top" title={''} content={
<div>
<Button
type="primary"
className='m-ant-btn'
onClick={() => setAllUserLook()}
>全员看Ta</Button>
</div>
}>
<div className={styles.meetingContentOperation}>
<SmallDashOutlined style={{
color: '#fff',
fontSize: '30px'
}} />
</div>
</Popover>
{currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)} {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
</div> : null} </div> : null}
{currentLookUserStatus === 4 && currentLookUserAccount ? {currentLookUserStatus === 4 && currentLookUserAccount ?
@ -971,22 +939,6 @@ const Meeting: React.FC = () => {
</div> </div>
</div> </div>
{meetingContentUser(currentLookUserAccount)} {meetingContentUser(currentLookUserAccount)}
<Popover placement="top" title={''} content={
<div>
<Button
type="primary"
className='m-ant-btn'
onClick={() => setAllUserLook()}
>全员看Ta</Button>
</div>
}>
<div className={styles.meetingContentOperation}>
<SmallDashOutlined style={{
color: '#fff',
fontSize: '30px'
}} />
</div>
</Popover>
{currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)} {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
</div> : null} </div> : null}
</div> </div>