yangjie #22

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

View File

@ -6,7 +6,6 @@ import { Button, Input, Modal, Popover } from 'antd';
import Avatar from '@/components/Avatar'; import Avatar from '@/components/Avatar';
import { useEffect, useState, useRef } from "react"; import { useEffect, useState, useRef } from "react";
import { storage } from '@/utils'; import { storage } from '@/utils';
import { GetRoomUser } from '@/api/Meeting';
import { setKeyOpenChildWindow } from '@/utils/package/public'; import { setKeyOpenChildWindow } from '@/utils/package/public';
import EquipmentManagement from '@/components/EquipmentManagement'; import EquipmentManagement from '@/components/EquipmentManagement';
const { confirm } = Modal; const { confirm } = Modal;
@ -20,7 +19,6 @@ const UserListWindow: React.FC = () => {
const userInfo = JSON.parse(storage.getItem('user') as string) const userInfo = JSON.parse(storage.getItem('user') as string)
useEffect(() => { useEffect(() => {
setUser(userInfo) setUser(userInfo)
getRoomUser()
channel.onmessage = function (event) { channel.onmessage = function (event) {
const { type, roomUserList, showDriverList } = event.data; const { type, roomUserList, showDriverList } = event.data;
switch (type) { switch (type) {
@ -32,21 +30,10 @@ const UserListWindow: React.FC = () => {
break; break;
} }
} }
channel.postMessage({
type: 'userListWindowGetRoomUserList'
});
}, []); }, []);
// 获取房间用户
const getRoomUser = async (): Promise<void> => {
const data = JSON.parse(storage.getItem('stateInfo') as string)
GetRoomUser(data.channelId).then(res => {
if (res.code === 200) {
res.data.forEach((item: any) => {
item.isShow = true;
item.isRoom = true;
item.isAdmin = role.ID.includes(item.roleId) || item.isRoomManager
})
setRoomUserList(res.data)
}
})
}
return ( return (
<> <>
<div className={`${styles.userListWindow}`}> <div className={`${styles.userListWindow}`}>

View File

@ -301,6 +301,16 @@ const Meeting: React.FC = () => {
userId: userListWindowPostRoomManager.uid userId: userListWindowPostRoomManager.uid
}) })
break; break;
case 'userListWindowGetRoomUserList':
setRoomUserList(((res: any) => {
channel.postMessage({
type: 'roomUserList',
roomUserList: res,
});
return res
}))
break;
break;
case 'userListWindowGetRoomKickout': case 'userListWindowGetRoomKickout':
GetRoomKickout(state.channelId, userListWindowGetRoomKickout.uid) GetRoomKickout(state.channelId, userListWindowGetRoomKickout.uid)
break; break;