test/nocobase2
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2024-12-01 19:58:15 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge branch 'next' into develop
Some checks are pending
E2E / Build (push) Waiting to run
Details
E2E / Core and plugins (push) Blocked by required conditions
Details
E2E / plugin-workflow (push) Blocked by required conditions
Details
E2E / plugin-workflow-approval (push) Blocked by required conditions
Details
E2E / plugin-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase backend test / sqlite-test (20, false) (push) Waiting to run
Details
NocoBase backend test / sqlite-test (20, true) (push) Waiting to run
Details
NocoBase backend test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
Details
NocoBase backend test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
Details
NocoBase backend test / postgres-test (public, 20, public, false) (push) Waiting to run
Details
NocoBase backend test / postgres-test (public, 20, public, true) (push) Waiting to run
Details
NocoBase backend test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
Details
NocoBase backend test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
Details
NocoBase backend test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
Details
NocoBase backend test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
Details
NocoBase backend test / mysql-test (20, false) (push) Waiting to run
Details
NocoBase backend test / mysql-test (20, true) (push) Waiting to run
Details
NocoBase backend test / mariadb-test (20, false) (push) Waiting to run
Details
NocoBase backend test / mariadb-test (20, true) (push) Waiting to run
Details
Test on Windows / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
nocobase[bot] 2024-11-27 11:57:18 +00:00
commit 28114f645f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/plugins/@nocobase/plugin-data-visualization/src/server/__tests__/formatter.test.ts
View File

@ -71,7 +71,6 @@ describe('formatter', () => {
const ctx = {
app,
db,
timezone: '+05:30',
action: {
params: {
values: {
@ -85,6 +84,7 @@ describe('formatter', () => {
},
},
},
get: () => '+05:30',
} as any;
const queryParser = createQueryParser(db);
await compose([parseFieldAndAssociations, queryParser.parse(), queryData])(ctx, async () => {});
@ -112,7 +112,7 @@ describe('formatter', () => {
const ctx = {
app,
db,
timezone: '+05:30',
get: () => '+05:30',
action: {
params: {
values: {
@ -153,7 +153,7 @@ describe('formatter', () => {
const ctx = {
app,
db,
timezone: '+05:30',
get: () => '+05:30',
action: {
params: {
values: {
@ -202,7 +202,7 @@ describe('formatter', () => {
const ctx = {
app,
db,
timezone: '+05:30',
get: () => '+05:30',
action: {
params: {
values: {
@ -250,7 +250,7 @@ describe('formatter', () => {
const ctx = {
app,
db,
timezone: '+05:30',
get: () => '+05:30',
action: {
params: {
values: {

2
packages/plugins/@nocobase/plugin-data-visualization/src/server/query-parser/query-parser.ts
View File

@ -97,7 +97,7 @@ export class QueryParser {
attributes: dimensionAttributes,
group,
fieldMap: dimensionFieldMap,
} = this.parseDimensions(ctx, dimensions, hasAgg, ctx.timezone);
} = this.parseDimensions(ctx, dimensions, hasAgg, ctx.get?.('x-timezone'));
const order = this.parseOrders(ctx, orders, hasAgg);
ctx.action.params.values = {