Skip to content

fix: offset calculation of timezone plugin #2227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

fix: offset calculation of timezone plugin #2227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c80f997
fix: offset calculation of timezone plugin
Pareder Feb 5, 2023
5fa5173
fix: remove ms unit on diff calculation
Pareder Feb 20, 2023
4ac8881
Merge remote-tracking branch 'upstream/dev' into fix/timezone
Pareder Aug 21, 2023
5cab1ea
fix: remove usage of CustomParseFormat plugin
Pareder Aug 21, 2023
5c7598a
Merge remote-tracking branch 'upstream/dev' into fix/timezone
Pareder Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/plugin/timezone/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ const getDateTimeFormat = (timezone, options = {}) => {
return dtf
}

function parseParts(parts) {
const objParts = parts.reduce((obj, part) => ({
...obj,
[part.type]: part.value,
}), {})
return new Date(objParts.year, objParts.month - 1, objParts.day, objParts.hour, objParts.minute, objParts.second)
}

export default (o, c, d) => {
let defaultTimezone

Expand Down Expand Up @@ -95,8 +103,8 @@ export default (o, c, d) => {
proto.tz = function (timezone = defaultTimezone, keepLocalTime) {
const oldOffset = this.utcOffset()
const date = this.toDate()
const target = date.toLocaleString('en-US', { timeZone: timezone })
const diff = Math.round((date - new Date(target)) / 1000 / 60)
const target = parseParts(getDateTimeFormat(timezone).formatToParts(date))
const diff = Math.round((date - target) / 1000 / 60)
let ins = d(target, { locale: this.$L }).$set(MS, this.$ms)
.utcOffset((-Math.round(date.getTimezoneOffset() / 15) * 15) - diff, true)
if (keepLocalTime) {
Expand Down
2 changes: 1 addition & 1 deletion test/plugin/timezone.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ describe('Get offsetName', () => {
})
})

describe('CustomPraseFormat', () => {
describe('CustomParseFormat', () => {
const result = 1602786600
it('normal', () => {
expect(dayjs.tz('2020/10/15 12:30', DEN).unix()).toBe(result)
Expand Down