From 64fb09146f9a208b35e850ff5b0da794172ed387 Mon Sep 17 00:00:00 2001 From: Finley Ge <32237950+FinleyGe@users.noreply.github.com> Date: Tue, 25 Mar 2025 22:31:31 +0800 Subject: [PATCH] fix: member list, login button (#4322) --- .../support/permission/MemberManager/MemberModal.tsx | 2 -- .../account/team/OrgManage/OrgMemberManageModal.tsx | 5 +---- .../app/src/pageComponents/login/LoginForm/FormLayout.tsx | 1 + 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/projects/app/src/components/support/permission/MemberManager/MemberModal.tsx b/projects/app/src/components/support/permission/MemberManager/MemberModal.tsx index 22e56d470..42534f59c 100644 --- a/projects/app/src/components/support/permission/MemberManager/MemberModal.tsx +++ b/projects/app/src/components/support/permission/MemberManager/MemberModal.tsx @@ -66,8 +66,6 @@ function MemberModal({ members: orgMembers, MemberScrollData: OrgMemberScrollData, onPathClick, - refresh, - updateCurrentOrg, orgs } = useOrg({ getPermission: false }); diff --git a/projects/app/src/pageComponents/account/team/OrgManage/OrgMemberManageModal.tsx b/projects/app/src/pageComponents/account/team/OrgManage/OrgMemberManageModal.tsx index aec30c1b0..0bb789c86 100644 --- a/projects/app/src/pageComponents/account/team/OrgManage/OrgMemberManageModal.tsx +++ b/projects/app/src/pageComponents/account/team/OrgManage/OrgMemberManageModal.tsx @@ -56,10 +56,7 @@ function OrgMemberManageModal({ ScrollData: MemberScrollData, isLoading: isLoadingMembers } = useScrollPagination(getTeamMembers, { - pageSize: 20, - params: { - withLeaved: false - } + pageSize: 20 }); const { diff --git a/projects/app/src/pageComponents/login/LoginForm/FormLayout.tsx b/projects/app/src/pageComponents/login/LoginForm/FormLayout.tsx index 286cd5cb1..db310bc06 100644 --- a/projects/app/src/pageComponents/login/LoginForm/FormLayout.tsx +++ b/projects/app/src/pageComponents/login/LoginForm/FormLayout.tsx @@ -134,6 +134,7 @@ const FormLayout = ({ children, setPageType, pageType }: Props) => { }); router.replace(item.redirectUrl, '_self'); } + item.pageType && setPageType(item.pageType); }, [lastRoute, router, setLoginStore, setPageType] );