From 0de11229086977600fd0ff14bca28775bc9d0206 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Fri, 26 Jul 2024 13:45:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/InvitingPersonnelModal/index.tsx | 12 +++++++-----
 src/components/QuitTips/index.tsx               |  2 +-
 src/components/SpeakerModeModal/index.tsx       |  2 +-
 src/page/Home/Index/index.tsx                   |  7 +++++++
 src/page/Home/User/index.tsx                    |  2 +-
 src/page/Meeting/index.tsx                      | 10 ++++++++++
 6 files changed, 27 insertions(+), 8 deletions(-)

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<void> => {
+  const getUserList = async (bool: boolean = false): Promise<void> => {
     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'}
       >
         <div className={styles.invitingPersonnelModal}>
@@ -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}></Checkbox>
+                    }} disabled={!item.isOnline || item.account === user.account || item.disabled} checked={item.checked}></Checkbox>
                     <div><Avatar name={item.userName} /></div>
                     <span>{item.userName}</span>
                   </div>
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) => {
             <Checkbox onChange={(e) => {
               setIsTips(e.target.checked)
               storage.setItem('isTips', e.target.checked)
-            }} defaultChecked={isTips}>不再提示</Checkbox>
+            }} checked={isTips}>不再提示</Checkbox>
             <div>
               <Button type="primary" className='m-ant-btn' onClick={() => {
                 setIsCloseModal(false)
diff --git a/src/components/SpeakerModeModal/index.tsx b/src/components/SpeakerModeModal/index.tsx
index aee07d6..c1ef692 100644
--- a/src/components/SpeakerModeModal/index.tsx
+++ b/src/components/SpeakerModeModal/index.tsx
@@ -46,7 +46,7 @@ const SpeakerModeModal = forwardRef((props: any, ref: any) => {
         </div>
         <Checkbox onChange={(e) => {
           setIsView(e.target.checked)
-        }} defaultChecked={isView}>同步所有视图</Checkbox>
+        }} checked={isView}>同步所有视图</Checkbox>
       </Modal>
     </>
   )
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<any>({});
   const [joinRoomFrom, setJoinRoomFrom] = useState<string>('')
   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 = () => {
             <Button type="primary" className='m-ant-btn' onClick={() => {
               DeleteUser(selectedRowKeys).then(res => {
                 if (res.code === 200) {
-                  setDeleteUserPawModal(true)
+                  setDeleteUserPawModal(false)
                   setSelectedRowKeys([])
                   message.success('删除成功！')
                   getUserList()
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index c2482c4..000869e 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -872,6 +872,16 @@ const Meeting: React.FC = () => {
                       keyword: e.target.value
                     })
                   }}
+                  onPressEnter={() => {
+                    if (fileList.pageIndex === 1) {
+                      getRoomFile()
+                    } else {
+                      setFileList({
+                        ...fileList,
+                        pageIndex: 1
+                      })
+                    }
+                  }}
                   onBlur={() => {
                     if (fileList.pageIndex === 1) {
                       getRoomFile()