fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-07 22:49:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2024-12-08 05:15:33 +00:00
commit aa709c3e70
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/plugins/@nocobase/plugin-data-visualization/src/server/formatter/mysql-formatter.ts
View File

@ -8,6 +8,7 @@
*/ */
import { Col, Formatter } from './formatter'; import { Col, Formatter } from './formatter';
import moment from 'moment-timezone';
export class MySQLFormatter extends Formatter { export class MySQLFormatter extends Formatter {
convertFormat(format: string) { convertFormat(format: string) {
@ -21,14 +22,10 @@ export class MySQLFormatter extends Formatter {
} }
formatDate(field: Col, format: string, timezoneOffset?: string) { formatDate(field: Col, format: string, timezoneOffset?: string) {
const timezone = this.getTimezoneByOffset(timezoneOffset); const tz = moment.tz(process.env.TZ || 'UTC').format('Z');
format = this.convertFormat(format); format = this.convertFormat(format);
if (timezone) { if (timezoneOffset && tz !== timezoneOffset) {
return this.sequelize.fn( return this.sequelize.fn('date_format', this.sequelize.fn('convert_tz', field, tz, timezoneOffset), format);
'date_format',
this.sequelize.fn('convert_tz', field, process.env.TZ || 'UTC', timezone),
format,
);
} }
return this.sequelize.fn('date_format', field, format); return this.sequelize.fn('date_format', field, format);
} }