diff --git a/packages/actions/src/__tests__/index.ts b/packages/actions/src/__tests__/index.ts index aa7b57c60..51609810a 100644 --- a/packages/actions/src/__tests__/index.ts +++ b/packages/actions/src/__tests__/index.ts @@ -53,7 +53,7 @@ interface ActionParams { filterByTk?: any; sort?: string[]; page?: number; - perPage?: number; + pageSize?: number; values?: any; /** * @deprecated diff --git a/packages/actions/src/__tests__/list-action.test.ts b/packages/actions/src/__tests__/list-action.test.ts index 9fb5b3e93..a10163ba4 100644 --- a/packages/actions/src/__tests__/list-action.test.ts +++ b/packages/actions/src/__tests__/list-action.test.ts @@ -87,7 +87,7 @@ describe('list action', () => { .resource('posts') .list({ fields: ['id'], - perPage: 1, + pageSize: 1, page: 2, sort: ['id'], }); diff --git a/packages/actions/src/actions/list.ts b/packages/actions/src/actions/list.ts index 887626c40..d8ecaa58a 100644 --- a/packages/actions/src/actions/list.ts +++ b/packages/actions/src/actions/list.ts @@ -6,23 +6,23 @@ export const DEFAULT_PER_PAGE = 20; function pageArgsToLimitArgs( page: number, - perPage: number, + pageSize: number, ): { offset: number; limit: number; } { return { - offset: (page - 1) * perPage, - limit: perPage, + offset: (page - 1) * pageSize, + limit: pageSize, }; } -function totalPage(total, perPage): number { - return Math.ceil(total / perPage); +function totalPage(total, pageSize): number { + return Math.ceil(total / pageSize); } export async function list(ctx: Context, next) { - const { page = DEFAULT_PAGE, perPage = DEFAULT_PER_PAGE, fields, filter, appends, except, sort } = ctx.action.params; + const { page = DEFAULT_PAGE, pageSize = DEFAULT_PER_PAGE, fields, filter, appends, except, sort } = ctx.action.params; const repository = getRepositoryFromParams(ctx); @@ -32,15 +32,15 @@ export async function list(ctx: Context, next) { appends, except, sort, - ...pageArgsToLimitArgs(parseInt(String(page)), parseInt(String(perPage))), + ...pageArgsToLimitArgs(parseInt(String(page)), parseInt(String(pageSize))), }); ctx.body = { count, rows, page, - perPage, - totalPage: totalPage(count, perPage), + pageSize, + totalPage: totalPage(count, pageSize), }; await next(); diff --git a/packages/resourcer/src/action.ts b/packages/resourcer/src/action.ts index 701807667..398fe3f24 100644 --- a/packages/resourcer/src/action.ts +++ b/packages/resourcer/src/action.ts @@ -89,11 +89,11 @@ export interface ActionOptions { /** * 每页显示数量 */ - perPage?: number; + pageSize?: number; /** * 最大每页显示数量 */ - maxPerPage?: number; + maxPageSize?: number; /** * 中间件 */ @@ -155,7 +155,7 @@ export interface ActionParams { /** * 每页显示数量 */ - perPage?: number; + pageSize?: number; /** * 数据,默认为 options.defaultValues + request.body */ diff --git a/packages/test/src/mockServer.ts b/packages/test/src/mockServer.ts index f7d5f931b..d36f0c83f 100644 --- a/packages/test/src/mockServer.ts +++ b/packages/test/src/mockServer.ts @@ -9,7 +9,7 @@ interface ActionParams { filter?: any; sort?: string[]; page?: number; - perPage?: number; + pageSize?: number; values?: any; /** * @deprecated