blackteay/vue-element-admin
1
0
Fork 0
mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-09-01 13:39:49 +08:00
Code Issues Releases Wiki Activity

Merge pull request #2 from PanJiaChen/master

Browse Source 
merge update
This commit is contained in:
LimTerran 2020-03-26 12:29:07 +08:00 committed by GitHub
commit 87cbcc2099
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
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')) {
time = parseInt(time) if ((/^[0-9]+$/.test(time))) {
// support "1548221490638"
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
} }

4
src/views/tab/index.vue
View File

@ -13,11 +13,11 @@
</template> </template>
<script> <script>
import tabPane from './components/TabPane' import TabPane from './components/TabPane'
export default { export default {
name: 'Tab', name: 'Tab',
components: { tabPane }, components: { TabPane },
data() { data() {
return { return {
tabMapOptions: [ tabMapOptions: [

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

@ -4,6 +4,11 @@ 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')
}) })