Merge branch 'next' into develop

This commit is contained in:
nocobase[bot] 2025-01-14 11:40:31 +00:00
commit 3de514b302

View File

@ -100,19 +100,22 @@ export class QueryParser {
} = this.parseDimensions(ctx, dimensions, hasAgg, ctx.get?.('x-timezone'));
const order = this.parseOrders(ctx, orders, hasAgg);
ctx.action.params.values = {
...ctx.action.params.values,
queryParams: {
const queryParams = {
where,
attributes: [...measureAttributes, ...dimensionAttributes],
include,
group,
order,
limit: limit || 2000,
offset: offset || 0,
subQuery: false,
raw: true,
},
};
if (!hasAgg || dimensions.length) {
queryParams['limit'] = limit || 2000;
queryParams['offset'] = offset || 0;
}
ctx.action.params.values = {
...ctx.action.params.values,
queryParams,
fieldMap: { ...measureFieldMap, ...dimensionFieldMap },
};
await next();