Merge pull request #380 from APIParkLab/feature/1.9-OAuth

fix: Fix department selection issue

Author: NINGyv179

frontend/packages/core/src/pages/member/MemberList.tsx

@@ -154,11 +154,12 @@ const MemberList = () => {
   const [tableHttpReload, setTableHttpReload] = useState(true)
   const [tableListDataSource, setTableListDataSource] = useState<MemberTableListItem[]>([])
   const pageListRef = useRef<ActionType>(null)
-  const { topGroupId, selectedDepartmentIds, refreshGroup } = useOutletContext<{
+  const { topGroupId, selectedDepartmentIds, refreshGroup, refreshTableCount } = useOutletContext<{
     topGroupId: string
     departmentList: DepartmentListItem[]
     selectedDepartmentIds: string[]
     refreshGroup: () => void
+    refreshTableCount: number
   }>()
   const AddMemberRef = useRef<MemberDropdownModalHandle>(null)
   const EditMemberRef = useRef<MemberDropdownModalHandle>(null)
@@ -416,6 +417,13 @@ const MemberList = () => {
     getDepartmentList()
   }, [])
 
+  // 监听外部刷新触发器
+  useEffect(() => {
+    if (refreshTableCount > 0) {
+      manualReloadTable()
+    }
+  }, [refreshTableCount])
+
   const getDepartmentList = async () => {
     setDepartmentValueEnum([])
     const { code, data, msg } = await fetchData<BasicResponse<{ department: DepartmentListItem }>>(

frontend/packages/core/src/pages/member/MemberPage.tsx

@@ -36,6 +36,11 @@ const MemberPage = ()=>{
         const [selectedDepartmentId, setSelectedDepartmentId] = useState<string>('-1')
         const {accessData,state} = useGlobalContext()
         const [refreshMemberCount, setRefreshMemberCount] = useState<number>(0)
+        const [refreshTableCount, setRefreshTableCount] = useState<number>(0)
+        
+        const refreshMemberTable = () => {
+            setRefreshTableCount(prev => prev + 1)
+        }
     const onSearchWordChange = (e:string)=>{
             setSearchWord(e || '')
         }
@@ -90,7 +95,7 @@ const MemberPage = ()=>{
                         case 'addChild':
                             return AddChildRef.current?.save().then((res)=>{if(res === true)getDepartmentList()})
                         case 'addMember':
-                            return AddMemberRef.current?.save().then((res)=>{if(res === true){getDepartmentList();setRefreshMemberCount(pre=>pre+1)}})
+                            return AddMemberRef.current?.save().then((res)=>{if(res === true){getDepartmentList();setRefreshMemberCount(pre=>pre+1);refreshMemberTable()}})
                         case 'rename':
                             return RenameRef.current?.save().then((res)=>{if(res === true)getDepartmentList()})
                         case 'delete':
@@ -262,7 +267,7 @@ const MemberPage = ()=>{
                         </div>
                     </div>
                     <div className="flex-1 p-btnbase pr-PAGE_INSIDE_X overflow-x-hidden">
-                        <Outlet context={{refreshMemberCount, selectedDepartmentIds,refreshGroup:()=>getDepartmentList()}}/>
+                        <Outlet context={{refreshMemberCount, selectedDepartmentIds,refreshGroup:()=>getDepartmentList(), refreshTableCount}}/>
                     </div>
                 </div>
             </InsidePage>);