diff --git a/src/components/InvitingPersonnelModal/index.tsx b/src/components/InvitingPersonnelModal/index.tsx index 793a966..fd5dbff 100644 --- a/src/components/InvitingPersonnelModal/index.tsx +++ b/src/components/InvitingPersonnelModal/index.tsx @@ -11,8 +11,9 @@ const InvitingPersonnelModal = forwardRef((props: any, ref: any) => { useImperativeHandle(ref, () => ({ changeInvitingPersonnelModal: () => { let userInfo = JSON.parse(storage.getItem('user') as string) + setCheckedList([]) setUser(userInfo) - getUserList() + getUserList(true) setIsInvitingPersonnelModal(true) } })) @@ -53,7 +54,7 @@ const InvitingPersonnelModal = forwardRef((props: any, ref: any) => { } }, [optionsValue]); // 获取用户列表 - const getUserList = async (): Promise => { + const getUserList = async (bool: boolean = false): Promise => { Promise.all([ GetRoomUser(state.channelId), GetUserList({ @@ -70,8 +71,8 @@ const InvitingPersonnelModal = forwardRef((props: any, ref: any) => { data: res[1].data.items.map((item: any) => { return { ...item, - checked: checkedList.find((checkedItem: any) => checkedItem.id === item.id) ? true : false, - disabled: res[0].data.find((row: any) => row.account === item.account) ? true : false + checked: bool ? false : checkedList.find((checkedItem: any) => checkedItem.id === item.id) ? true : false, + disabled: bool ? false : res[0].data.find((row: any) => row.account === item.account) ? true : false } }), }) @@ -86,6 +87,7 @@ const InvitingPersonnelModal = forwardRef((props: any, ref: any) => { footer={null} onCancel={() => setIsInvitingPersonnelModal(false)} centered + destroyOnClose={true} width={'700px'} >
@@ -137,7 +139,7 @@ const InvitingPersonnelModal = forwardRef((props: any, ref: any) => { return checkedList } }) - }} defaultChecked={item.checked} disabled={!item.isOnline || item.account === user.account || item.disabled}> + }} disabled={!item.isOnline || item.account === user.account || item.disabled} checked={item.checked}>
{item.userName}
diff --git a/src/components/QuitTips/index.tsx b/src/components/QuitTips/index.tsx index 8115ebc..d823f8e 100644 --- a/src/components/QuitTips/index.tsx +++ b/src/components/QuitTips/index.tsx @@ -47,7 +47,7 @@ const QuitTips = forwardRef((props: any, ref: any) => { { setIsTips(e.target.checked) storage.setItem('isTips', e.target.checked) - }} defaultChecked={isTips}>不再提示 + }} checked={isTips}>不再提示
{ setIsView(e.target.checked) - }} defaultChecked={isView}>同步所有视图 + }} checked={isView}>同步所有视图 ) diff --git a/src/page/Home/Index/index.tsx b/src/page/Home/Index/index.tsx index 90d3f30..54bf1fe 100644 --- a/src/page/Home/Index/index.tsx +++ b/src/page/Home/Index/index.tsx @@ -24,8 +24,15 @@ const Index: React.FC = () => { const [user, setUser] = useState({}); const [joinRoomFrom, setJoinRoomFrom] = useState('') useEffect(() => { + let time = null as any let userInfo = JSON.parse(storage.getItem('user') as string) setUser(userInfo) + time = setInterval(() => { + getRoomList() + }, 1000 * 30) + return () => { + clearInterval(time) + } }, []); useEffect(() => { getRoomList() diff --git a/src/page/Home/User/index.tsx b/src/page/Home/User/index.tsx index 5d519aa..4c72aaa 100644 --- a/src/page/Home/User/index.tsx +++ b/src/page/Home/User/index.tsx @@ -387,7 +387,7 @@ const User: React.FC = () => {