gfwleak/cyber-narrator-cn-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CN-1415 fix: 修复搜索历史排序与时间展示问题

Browse Source
This commit is contained in:
刘洪洪
2023-11-08 15:42:23 +08:00
parent 78105475fb
commit 1410f890f3
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/tools.js
View File

@@ -1407,10 +1407,10 @@ export const myHighLight = {
export const changeTimeByDate = (date) => {
if (date) {
const nowDate = Date.now()
const oldDate = Date.parse(date)
const oldDate = isNaN(date) ? Date.parse(date) : date
const diff = Math.floor((nowDate - oldDate) / 1000)
if (diff < 60) {
return 60 + i18n.global.t('entity.search.secondsAgo')
return diff + i18n.global.t('entity.search.secondsAgo')
} else if (diff >= 60 && diff < 3600) {
const minutes = Math.floor(diff / 60)
return minutes === 1 ? `${minutes} ${i18n.global.t('entity.search.minuteAgo')}` : `${minutes} ${i18n.global.t('entity.search.minutesAgo')}`
@@ -1418,7 +1418,7 @@ export const changeTimeByDate = (date) => {
const hours = Math.floor(diff / 3600)
return hours === 1 ? `${hours} ${i18n.global.t('entity.search.hourAgo')}` : `${hours} ${i18n.global.t('entity.search.hoursAgo')}`
} else {
return new Date(oldDate)
return (new Date(oldDate).toString()).replace(/GMT.*/, '')
}
}
}