yovinchen/guigu-oa-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:fixed parseTime bug in ie and safari

Browse Source 
776f10e197
This commit is contained in:
潘嘉晨
2020-06-04 21:19:22 +08:00
parent 4502d3ebc7
commit 97290e6f49
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/utils/index.js
View File

@@ -17,9 +17,17 @@ export function parseTime(time, cFormat) {
if (typeof time === 'object') { if (typeof time === 'object') {
date = time date = time
} else { } else {
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { if ((typeof time === 'string')) {
if ((/^[0-9]+$/.test(time))) {
// support "1548221490638"
time = parseInt(time) time = parseInt(time)
} else {
// support safari
// https://stackoverflow.com/questions/4310953/invalid-date-in-safari
time = time.replace(new RegExp(/-/gm), '/')
} }
}
if ((typeof time === 'number') && (time.toString().length === 10)) { if ((typeof time === 'number') && (time.toString().length === 10)) {
time = time * 1000 time = time * 1000
} }

3
tests/unit/utils/parseTime.spec.js
View File

@@ -5,6 +5,9 @@ describe('Utils:parseTime', () => {
it('timestamp', () => { it('timestamp', () => {
expect(parseTime(d)).toBe('2018-07-13 17:54:01') expect(parseTime(d)).toBe('2018-07-13 17:54:01')
}) })
it('timestamp string', () => {
expect(parseTime((d + ''))).toBe('2018-07-13 17:54:01')
})
it('ten digits timestamp', () => { it('ten digits timestamp', () => {
expect(parseTime((d / 1000).toFixed(0))).toBe('2018-07-13 17:54:01') expect(parseTime((d / 1000).toFixed(0))).toBe('2018-07-13 17:54:01')
}) })