diff --git a/src/global.d.ts b/src/global.d.ts index 94527a2..977ae55 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -175,6 +175,11 @@ interface TableParam { filters?: Record } +interface UserGetParam extends PageParam { + searchValue?: string + searchRegex?: boolean +} + interface UserAddEditParam { id?: string username: string diff --git a/src/pages/system/User.tsx b/src/pages/system/User.tsx index 672ef65..e168541 100644 --- a/src/pages/system/User.tsx +++ b/src/pages/system/User.tsx @@ -348,14 +348,16 @@ const User: React.FC = () => { > - - - + {value.id !== '0' ? ( + + + + ) : undefined} ), onOk: () => @@ -583,7 +585,19 @@ const User: React.FC = () => { setIsLoadingUserData(true) - void r_sys_user_get() + void r_sys_user_get({ + currentPage: tableParams.pagination?.current, + pageSize: tableParams.pagination?.pageSize, + sortField: + tableParams.sortField && tableParams.sortOrder + ? (tableParams.sortField as string) + : undefined, + sortOrder: + tableParams.sortField && tableParams.sortOrder ? tableParams.sortOrder : undefined, + searchValue: searchValue.trim().length ? searchValue : undefined, + searchRegex: isUseRegex ? isUseRegex : undefined, + ...tableParams.filters + }) .then((res) => { const data = res.data if (data.code === DATABASE_SELECT_SUCCESS) { diff --git a/src/services/system.tsx b/src/services/system.tsx index 15efd36..6dfd943 100644 --- a/src/services/system.tsx +++ b/src/services/system.tsx @@ -13,7 +13,8 @@ import request from '@/services/index' export const r_sys_user_info = () => request.get(URL_SYS_USER_INFO) -export const r_sys_user_get = () => request.get>(URL_SYS_USER) +export const r_sys_user_get = (param: UserGetParam) => + request.get>(URL_SYS_USER, param) export const r_sys_user_add = (param: UserAddEditParam) => request.post(URL_SYS_USER, param)