yangjie #22

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

View File

@ -9,7 +9,6 @@ const NoticeWindow: React.FC = () => {
} }
}); });
const channel = new BroadcastChannel('meeting_channel'); const channel = new BroadcastChannel('meeting_channel');
let time: NodeJS.Timeout;
useEffect(() => { useEffect(() => {
channel.onmessage = function (event) { channel.onmessage = function (event) {
const { type, noticeItem } = event.data; const { type, noticeItem } = event.data;
@ -64,6 +63,15 @@ const NoticeWindow: React.FC = () => {
></Button> ></Button>
</div> </div>
</div>, </div>,
onClose: () => {
const dom = document.getElementsByClassName('ant-notification')
if (dom.length === 0) {
window.electron.setChildWindowShow({
key: 'noticeWindow',
bool: false
})
}
},
duration: 10, duration: 10,
placement: 'bottomRight', placement: 'bottomRight',
showProgress: true, showProgress: true,
@ -72,24 +80,10 @@ const NoticeWindow: React.FC = () => {
break; break;
} }
} }
}, []);
useEffect(() => {
setTimeout(() => {
time = setInterval(() => {
const dom = document.getElementsByClassName('ant-notification')
if (dom.length === 0) {
window.electron.setChildWindowShow({
key: 'noticeWindow',
bool: false
})
}
}, 1000)
}, 4000);
return () => { return () => {
clearInterval(time)
channel.close(); channel.close();
}; };
}, []) }, []);
return ( return (
<> <>
<div className={`${styles.noticeWindow} drag`}> <div className={`${styles.noticeWindow} drag`}>