center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #9546 from dataease/pr@dev@fix_linkage-time

Browse Source 
fix(仪表板): 解决因时区问题导致的年月日格式的时间字段联动不准确问题
This commit is contained in:
王嘉豪 2024-05-08 18:49:31 +08:00 committed by GitHub
commit 4ec81438c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/frontend/src/utils/timeUitils.js
View File

@ -1,4 +1,5 @@
export const getRange = (selectValue, timeGranularity) => {
export const getRange = (outerTimeValue, timeGranularity) => {
const selectValue = timeGranularity === 'y_M_d_H' ? outerTimeValue + ':' : outerTimeValue
if (new Date(selectValue).toString() === 'Invalid Date') {
return selectValue
}
@ -57,7 +58,8 @@ const getMonthEnd = timestamp => {
}
const getDayEnd = timestamp => {
return [+new Date(timestamp), +new Date(timestamp) + 60 * 1000 * 60 * 24 - 1000]
const utcTime = getUtcTime(timestamp)
return [+utcTime, +utcTime + 60 * 1000 * 60 * 24 - 1000]
}
const getHourEnd = timestamp => {
@ -89,3 +91,12 @@ const getDayBegin = timestamp => {
return +new Date(timestamp)
}
const getUtcTime = timestamp => {
if (timestamp) {
const time = new Date(timestamp)
const utcDate = new Date(time.getUTCFullYear(), time.getUTCMonth(), time.getUTCDate(), time.getUTCHours(), time.getUTCMinutes(), time.getUTCSeconds())
return utcDate
} else {
return timestamp
}
}