mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-07-02 03:02:19 +08:00
fix(data-vi): remove the LIMIT
clause when using aggregate functions without dimensions (#6062)
This commit is contained in:
parent
aa13199bbd
commit
04d75cf430
@ -100,18 +100,21 @@ export class QueryParser {
|
|||||||
} = this.parseDimensions(ctx, dimensions, hasAgg, ctx.get?.('x-timezone'));
|
} = this.parseDimensions(ctx, dimensions, hasAgg, ctx.get?.('x-timezone'));
|
||||||
const order = this.parseOrders(ctx, orders, hasAgg);
|
const order = this.parseOrders(ctx, orders, hasAgg);
|
||||||
|
|
||||||
|
const queryParams = {
|
||||||
|
where,
|
||||||
|
attributes: [...measureAttributes, ...dimensionAttributes],
|
||||||
|
include,
|
||||||
|
group,
|
||||||
|
order,
|
||||||
|
subQuery: false,
|
||||||
|
raw: true,
|
||||||
|
};
|
||||||
|
if (!hasAgg || dimensions.length) {
|
||||||
|
queryParams['limit'] = limit || 2000;
|
||||||
|
}
|
||||||
ctx.action.params.values = {
|
ctx.action.params.values = {
|
||||||
...ctx.action.params.values,
|
...ctx.action.params.values,
|
||||||
queryParams: {
|
queryParams,
|
||||||
where,
|
|
||||||
attributes: [...measureAttributes, ...dimensionAttributes],
|
|
||||||
include,
|
|
||||||
group,
|
|
||||||
order,
|
|
||||||
limit: limit || 2000,
|
|
||||||
subQuery: false,
|
|
||||||
raw: true,
|
|
||||||
},
|
|
||||||
fieldMap: { ...measureFieldMap, ...dimensionFieldMap },
|
fieldMap: { ...measureFieldMap, ...dimensionFieldMap },
|
||||||
};
|
};
|
||||||
await next();
|
await next();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user