This commit is contained in:
parent
a275885115
commit
0de1122908
|
|
@ -11,8 +11,9 @@ const InvitingPersonnelModal = forwardRef((props: any, ref: any) => {
|
||||||
useImperativeHandle(ref, () => ({
|
useImperativeHandle(ref, () => ({
|
||||||
changeInvitingPersonnelModal: () => {
|
changeInvitingPersonnelModal: () => {
|
||||||
let userInfo = JSON.parse(storage.getItem('user') as string)
|
let userInfo = JSON.parse(storage.getItem('user') as string)
|
||||||
|
setCheckedList([])
|
||||||
setUser(userInfo)
|
setUser(userInfo)
|
||||||
getUserList()
|
getUserList(true)
|
||||||
setIsInvitingPersonnelModal(true)
|
setIsInvitingPersonnelModal(true)
|
||||||
}
|
}
|
||||||
}))
|
}))
|
||||||
|
|
@ -53,7 +54,7 @@ const InvitingPersonnelModal = forwardRef((props: any, ref: any) => {
|
||||||
}
|
}
|
||||||
}, [optionsValue]);
|
}, [optionsValue]);
|
||||||
// 获取用户列表
|
// 获取用户列表
|
||||||
const getUserList = async (): Promise<void> => {
|
const getUserList = async (bool: boolean = false): Promise<void> => {
|
||||||
Promise.all([
|
Promise.all([
|
||||||
GetRoomUser(state.channelId),
|
GetRoomUser(state.channelId),
|
||||||
GetUserList({
|
GetUserList({
|
||||||
|
|
@ -70,8 +71,8 @@ const InvitingPersonnelModal = forwardRef((props: any, ref: any) => {
|
||||||
data: res[1].data.items.map((item: any) => {
|
data: res[1].data.items.map((item: any) => {
|
||||||
return {
|
return {
|
||||||
...item,
|
...item,
|
||||||
checked: checkedList.find((checkedItem: any) => checkedItem.id === item.id) ? true : false,
|
checked: bool ? false : checkedList.find((checkedItem: any) => checkedItem.id === item.id) ? true : false,
|
||||||
disabled: res[0].data.find((row: any) => row.account === item.account) ? 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}
|
footer={null}
|
||||||
onCancel={() => setIsInvitingPersonnelModal(false)}
|
onCancel={() => setIsInvitingPersonnelModal(false)}
|
||||||
centered
|
centered
|
||||||
|
destroyOnClose={true}
|
||||||
width={'700px'}
|
width={'700px'}
|
||||||
>
|
>
|
||||||
<div className={styles.invitingPersonnelModal}>
|
<div className={styles.invitingPersonnelModal}>
|
||||||
|
|
@ -137,7 +139,7 @@ const InvitingPersonnelModal = forwardRef((props: any, ref: any) => {
|
||||||
return checkedList
|
return checkedList
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}} defaultChecked={item.checked} disabled={!item.isOnline || item.account === user.account || item.disabled}></Checkbox>
|
}} disabled={!item.isOnline || item.account === user.account || item.disabled} checked={item.checked}></Checkbox>
|
||||||
<div><Avatar name={item.userName} /></div>
|
<div><Avatar name={item.userName} /></div>
|
||||||
<span>{item.userName}</span>
|
<span>{item.userName}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ const QuitTips = forwardRef((props: any, ref: any) => {
|
||||||
<Checkbox onChange={(e) => {
|
<Checkbox onChange={(e) => {
|
||||||
setIsTips(e.target.checked)
|
setIsTips(e.target.checked)
|
||||||
storage.setItem('isTips', e.target.checked)
|
storage.setItem('isTips', e.target.checked)
|
||||||
}} defaultChecked={isTips}>不再提示</Checkbox>
|
}} checked={isTips}>不再提示</Checkbox>
|
||||||
<div>
|
<div>
|
||||||
<Button type="primary" className='m-ant-btn' onClick={() => {
|
<Button type="primary" className='m-ant-btn' onClick={() => {
|
||||||
setIsCloseModal(false)
|
setIsCloseModal(false)
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ const SpeakerModeModal = forwardRef((props: any, ref: any) => {
|
||||||
</div>
|
</div>
|
||||||
<Checkbox onChange={(e) => {
|
<Checkbox onChange={(e) => {
|
||||||
setIsView(e.target.checked)
|
setIsView(e.target.checked)
|
||||||
}} defaultChecked={isView}>同步所有视图</Checkbox>
|
}} checked={isView}>同步所有视图</Checkbox>
|
||||||
</Modal>
|
</Modal>
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -24,8 +24,15 @@ const Index: React.FC = () => {
|
||||||
const [user, setUser] = useState<any>({});
|
const [user, setUser] = useState<any>({});
|
||||||
const [joinRoomFrom, setJoinRoomFrom] = useState<string>('')
|
const [joinRoomFrom, setJoinRoomFrom] = useState<string>('')
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
let time = null as any
|
||||||
let userInfo = JSON.parse(storage.getItem('user') as string)
|
let userInfo = JSON.parse(storage.getItem('user') as string)
|
||||||
setUser(userInfo)
|
setUser(userInfo)
|
||||||
|
time = setInterval(() => {
|
||||||
|
getRoomList()
|
||||||
|
}, 1000 * 30)
|
||||||
|
return () => {
|
||||||
|
clearInterval(time)
|
||||||
|
}
|
||||||
}, []);
|
}, []);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
getRoomList()
|
getRoomList()
|
||||||
|
|
|
||||||
|
|
@ -387,7 +387,7 @@ const User: React.FC = () => {
|
||||||
<Button type="primary" className='m-ant-btn' onClick={() => {
|
<Button type="primary" className='m-ant-btn' onClick={() => {
|
||||||
DeleteUser(selectedRowKeys).then(res => {
|
DeleteUser(selectedRowKeys).then(res => {
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
setDeleteUserPawModal(true)
|
setDeleteUserPawModal(false)
|
||||||
setSelectedRowKeys([])
|
setSelectedRowKeys([])
|
||||||
message.success('删除成功!')
|
message.success('删除成功!')
|
||||||
getUserList()
|
getUserList()
|
||||||
|
|
|
||||||
|
|
@ -872,6 +872,16 @@ const Meeting: React.FC = () => {
|
||||||
keyword: e.target.value
|
keyword: e.target.value
|
||||||
})
|
})
|
||||||
}}
|
}}
|
||||||
|
onPressEnter={() => {
|
||||||
|
if (fileList.pageIndex === 1) {
|
||||||
|
getRoomFile()
|
||||||
|
} else {
|
||||||
|
setFileList({
|
||||||
|
...fileList,
|
||||||
|
pageIndex: 1
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}}
|
||||||
onBlur={() => {
|
onBlur={() => {
|
||||||
if (fileList.pageIndex === 1) {
|
if (fileList.pageIndex === 1) {
|
||||||
getRoomFile()
|
getRoomFile()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue