Skip to content

Commit 8cc2ff8

Browse files
authored
Merge pull request chaitin#299 from awesomeYG/fix-settings-page-size
fix: 成员管理中添加pagesize 和 page传参
2 parents dcfdd3c + 9f773c5 commit 8cc2ff8

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

ui/src/pages/generalSetting/components/adminLoginHistory.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ type LoginHistory = NonNullable<
1313
>[number];
1414

1515
const AdminLoginHistory = () => {
16-
const { data, loading } = useRequest(() => getAdminLoginHistory({}));
16+
const { data, loading } = useRequest(() => getAdminLoginHistory({page: 1, size: 50}));
1717
const columns: ColumnsType<LoginHistory> = [
1818
{
1919
title: '账号',
@@ -79,7 +79,7 @@ const AdminLoginHistory = () => {
7979
pagination={false}
8080
rowKey='id'
8181
loading={loading}
82-
sx={{ mx: -2 }}
82+
sx={{ mx: -2, maxHeight: '900px', overflow: 'auto' }}
8383
/>
8484
</Card>
8585
);

ui/src/pages/memberManage/groupList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const GroupList = () => {
3030
const [openCreateGroupModal, setOpenCreateGroupModal] = useState(false);
3131
const [openUpdateGroupModal, setOpenUpdateGroupModal] = useState(false);
3232
const [currentGroup, setCurrentGroup] = useState<DomainUserGroup | null>(null);
33-
const groupData = useRequest(() => getListUserGroup({}));
33+
const groupData = useRequest(() => getListUserGroup({page: 1, size: 999}));
3434
const userData = useRequest(() => getListUser({}));
3535
const adminData = useRequest(() => getListAdminUser({}));
3636

ui/src/pages/memberManage/memberManage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ const MemberManage = () => {
151151
const [open, setOpen] = useState(false);
152152
const [resetPasswordOpen, setResetPasswordOpen] = useState(false);
153153
const [currentUser, setCurrentUser] = useState<DomainUser | null>(null);
154-
const { data, loading, refresh } = useRequest(() => getListUser({}));
154+
const { data, loading, refresh } = useRequest(() => getListUser({page: 1, size: 999}));
155155
const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
156156

157157
const handleClick = (

0 commit comments

Comments
 (0)