dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9550 from dataease/dev

Browse Source 
merge fix
This commit is contained in:
fit2cloudrd 2024-05-09 09:16:17 +08:00 committed by GitHub
commit 4144eeabaa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/frontend/src/components/canvas/utils/utils.js
View File

@ -472,7 +472,10 @@ export function exportExcelDownload(chart, snapshot, width, height, loadingWrapp
if ((chart.render === 'echarts' || ['text', 'label'].includes(chart.type)) && !(chart.data?.series?.length && chart.data?.series[0].data?.length)) {
callBack()
return
} else if ((chart.render === 'antv' && !['text', 'label'].includes(chart.type)) && !chart.data?.data?.length) {
} else if ((chart.render === 'antv' && !['text', 'label', 'flow-map'].includes(chart.type)) && !chart.data?.data?.length) {
callBack()
return
} else if (chart.type === 'flow-map' && !chart.data?.tableRow?.length) {
callBack()
return
}

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
}
}