fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-01 18:52:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
xilesun 2025-01-14 19:39:39 +08:00
commit bbb89d5f35
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/plugins/@nocobase/plugin-data-visualization/src/server/query-parser/query-parser.ts
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);
const queryParams = {
where,
attributes: [...measureAttributes, ...dimensionAttributes],
include,
group,
order,
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: {
where,
attributes: [...measureAttributes, ...dimensionAttributes],
include,
group,
order,
limit: limit || 2000,
offset: offset || 0,
subQuery: false,
raw: true,
},
queryParams,
fieldMap: { ...measureFieldMap, ...dimensionFieldMap },
};
await next();