diff --git a/continew-admin-generator/src/main/resources/templates/frontend/api.ftl b/continew-admin-generator/src/main/resources/templates/frontend/api.ftl index 5eb76b6b..b89e6baf 100644 --- a/continew-admin-generator/src/main/resources/templates/frontend/api.ftl +++ b/continew-admin-generator/src/main/resources/templates/frontend/api.ftl @@ -22,7 +22,7 @@ export interface ${classNamePrefix}DetailResp { updateUserString: string } -export interface ${classNamePrefix}Query extends PageQuery { +export interface ${classNamePrefix}Query { <#if fieldConfigs??> <#list fieldConfigs as fieldConfig> <#if fieldConfig.showInQuery> @@ -30,10 +30,12 @@ export interface ${classNamePrefix}Query extends PageQuery { + sort: Array } +export interface ${classNamePrefix}PageQuery extends ${classNamePrefix}Query, PageQuery {} /** @desc 查询${businessName}列表 */ -export function list${classNamePrefix}(query: ${classNamePrefix}Query) { +export function list${classNamePrefix}(query: ${classNamePrefix}PageQuery) { return http.get>(`${'$'}{BASE_URL}`, query) } diff --git a/continew-admin-generator/src/main/resources/templates/frontend/index.ftl b/continew-admin-generator/src/main/resources/templates/frontend/index.ftl index e42fd3c7..2d826980 100644 --- a/continew-admin-generator/src/main/resources/templates/frontend/index.ftl +++ b/continew-admin-generator/src/main/resources/templates/frontend/index.ftl @@ -88,7 +88,7 @@ const columns: TableInstanceColumns[] = [ } ] -const queryForm: ${classNamePrefix}Query = reactive({ +const queryForm = reactive<${classNamePrefix}Query>({ <#list fieldConfigs as fieldConfig> <#if fieldConfig.showInQuery> ${fieldConfig.fieldName}: undefined,