yangjie #22

Merged
yangqiang merged 99 commits from yangjie into master 2024-10-22 16:11:46 +08:00
2 changed files with 31 additions and 4 deletions
Showing only changes of commit 50e15e43bf - Show all commits

View File

@ -1,5 +1,4 @@
.shareScreenWindow { .shareScreenWindow {
background-color: #07090B;
color: white; color: white;
height: 100%; height: 100%;
width: 100%; width: 100%;
@ -12,13 +11,30 @@
padding: 4px; padding: 4px;
box-sizing: border-box; box-sizing: border-box;
background-color: lighten(#07090B, 4%); background-color: lighten(#07090B, 4%);
display: flex;
justify-content: space-between;
align-items: center;
>span:nth-child(2) {
cursor: pointer;
background-color: #FF5219;
padding: 1px 10px;
border-radius: 2px;
font-size: 12px;
}
} }
.shareScreenWindowContent { .shareScreenWindowContent {
flex-grow: 1; flex-grow: 1;
display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
opacity: 0;
background-color: #07090B;
display: flex;
&:hover {
opacity: 1 !important;
}
.shareScreenWindowContentList { .shareScreenWindowContentList {
display: flex; display: flex;

View File

@ -46,6 +46,7 @@ const ShareScreenWindow: React.FC = () => {
}, },
]) ])
const [time, setTime] = useState('') const [time, setTime] = useState('')
const [isHover, setIsHover] = useState(true)
const [roomUserLists, setRoomUserLists] = useState<any>([]) const [roomUserLists, setRoomUserLists] = useState<any>([])
const channel = new BroadcastChannel('meeting_channel'); const channel = new BroadcastChannel('meeting_channel');
const userInfo = JSON.parse(storage.getItem('user') as string) const userInfo = JSON.parse(storage.getItem('user') as string)
@ -109,8 +110,18 @@ const ShareScreenWindow: React.FC = () => {
return ( return (
<> <>
<div className={styles.shareScreenWindow}> <div className={styles.shareScreenWindow}>
<div className={styles.shareScreenWindowTitle}>{time} </div> <div className={styles.shareScreenWindowTitle}>
<div className={`${styles.shareScreenWindowContent} drag`}> <span>{time} </span>
{isHover ? <span className='drag' onClick={() => {
channel.postMessage({
type: 'shareScreenWindowClose'
});
}}></span> : null}
</div>
<div className={`${styles.shareScreenWindowContent} drag`}
onMouseEnter={() => setIsHover(false)}
onMouseLeave={() => setIsHover(true)}
>
<div className={styles.shareScreenWindowContentList}> <div className={styles.shareScreenWindowContentList}>
{footerLists.map((item: any, index: number) => { {footerLists.map((item: any, index: number) => {
return ( return (