Skip to content

Commit

Permalink
优化日期解析，支持更多格式
Browse files Browse the repository at this point in the history
  • Loading branch information
@xuliangzhan
xuliangzhan committed Jun 17, 2021
1 parent 4278260 commit ae7f7f9
Show file tree
Hide file tree
Showing 9 changed files with 200 additions and 108 deletions.
2 changes: 1 addition & 1 deletion docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
}
})();</script><link href=/xe-utils/static/css/app.64f06e6d.css rel=preload as=style><link href=/xe-utils/static/css/chunk-vendors.42851454.css rel=preload as=style><link href=/xe-utils/static/js/app.a0b9b204.js rel=preload as=script><link href=/xe-utils/static/js/chunk-vendors.8cc45737.js rel=preload as=script><link href=/xe-utils/static/css/chunk-vendors.42851454.css rel=stylesheet><link href=/xe-utils/static/css/app.64f06e6d.css rel=stylesheet></head><body><noscript><strong>We're sorry but xe-utils doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=https://cdn.jsdelivr.net/npm/xe-utils></script><script src=https://cdn.jsdelivr.net/npm/xe-ajax></script><script src=https://cdn.jsdelivr.net/npm/xe-clipboard></script><script src=/xe-utils/static/js/chunk-vendors.8cc45737.js></script><script src=/xe-utils/static/js/app.a0b9b204.js></script></body></html>
})();</script><link href=/xe-utils/static/css/app.7136ffeb.css rel=preload as=style><link href=/xe-utils/static/css/chunk-vendors.42851454.css rel=preload as=style><link href=/xe-utils/static/js/app.fcd3a9dc.js rel=preload as=script><link href=/xe-utils/static/js/chunk-vendors.8cc45737.js rel=preload as=script><link href=/xe-utils/static/css/chunk-vendors.42851454.css rel=stylesheet><link href=/xe-utils/static/css/app.7136ffeb.css rel=stylesheet></head><body><noscript><strong>We're sorry but xe-utils doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=https://cdn.jsdelivr.net/npm/xe-utils></script><script src=https://cdn.jsdelivr.net/npm/xe-ajax></script><script src=https://cdn.jsdelivr.net/npm/xe-clipboard></script><script src=/xe-utils/static/js/chunk-vendors.8cc45737.js></script><script src=/xe-utils/static/js/app.fcd3a9dc.js></script></body></html>
2 changes: 1 addition & 1 deletion docs/static/css/app.64f06e6d.css → docs/static/css/app.7136ffeb.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion docs/static/js/app.a0b9b204.js
View file

This file was deleted.

1 change: 1 addition & 0 deletions docs/static/js/app.fcd3a9dc.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions func/helperGetUTCDateTime.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function helperGetUTCDateTime (dates) {
return Date.UTC(dates[0], dates[1], dates[2], dates[3], dates[4], dates[5], dates[6])
function helperGetUTCDateTime (resMaps) {
return Date.UTC(resMaps.y, resMaps.M || 0, resMaps.d || 1, resMaps.H || 0, resMaps.m || 0, resMaps.s || 0, resMaps.S || 0)
}

module.exports = helperGetUTCDateTime
223 changes: 134 additions & 89 deletions func/toStringDate.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
var setupDefaults = require('./setupDefaults')

var staticParseInt = require('./staticParseInt')

var helperGetUTCDateTime = require('./helperGetUTCDateTime')
Expand All @@ -8,88 +6,141 @@ var helperGetDateTime = require('./helperGetDateTime')
var isString = require('./isString')
var isDate = require('./isDate')

var d2RE = '.{1}(\\d{2})'
var parseREs = ['(\\d{3,4})', d2RE, d2RE, d2RE, d2RE, d2RE, '.{1}(\\d+)', '(([zZ])|([-+]\\d{2}:?\\d{2}))']
var defaultFormatRules = []
for (var len = parseREs.length - 1; len >= 0; len--) {
function getParseRule (txt) {
return '(\\d{' + txt + '})'
}

function toParseMs (num) {
if (num < 10) {
return num * 100
} else if (num < 100) {
return num * 10
}
return num
}

function toParseNum (num) {
return isNaN(num) ? num : staticParseInt(num)
}

var d2 = getParseRule('2')
var d1or2 = getParseRule('1,2')
var d1or3 = getParseRule('1,3')
var d3or4 = getParseRule('3,4')
var place = '.{1}'
var d1Or2RE = place + d1or2
var dzZ = '(([zZ])|([-+]\\d{2}:?\\d{2}))'

var defaulParseStrs = [d3or4, d1Or2RE, d1Or2RE, d1Or2RE, d1Or2RE, d1Or2RE, place + d1or3, dzZ]
var defaulParseREs = []

for (var len = defaulParseStrs.length - 1; len >= 0; len--) {
var rule = ''
for (var i = 0; i < len + 1; i++) {
rule += parseREs[i]
rule += defaulParseStrs[i]
}
defaultFormatRules.push(new RegExp('^' + rule + '$'))
defaulParseREs.push(new RegExp('^' + rule + '$'))
}

/**
* 解析默认格式
*/
function parseDefaultRules (str) {
var fMatchs, rests = []
for (var dfrIndex = 0, dfrLen = defaultFormatRules.length; dfrIndex < dfrLen; dfrIndex++) {
fMatchs = str.match(defaultFormatRules[dfrIndex])
if (fMatchs) {
var yyyy = fMatchs[1]
var MM = fMatchs[2]
var SSS = fMatchs[7]
if (yyyy) {
rests[0] = yyyy
}
if (MM) {
rests[1] = staticParseInt(MM) - 1
}
rests[2] = fMatchs[3]
rests[3] = fMatchs[4]
rests[4] = fMatchs[5]
rests[5] = fMatchs[6]
if (SSS) {
var sLen = SSS.length
if (sLen === 1) {
SSS = SSS + '00'
} else if (sLen === 2) {
SSS = SSS + '0'
} else {
SSS = SSS.substring(0, 3)
}
rests[6] = SSS
}
rests[7] = fMatchs[8]
var matchRest, resMaps = {}
for (var i = 0, dfrLen = defaulParseREs.length; i < dfrLen; i++) {
matchRest = str.match(defaulParseREs[i])
if (matchRest) {
resMaps.y = matchRest[1]
resMaps.M = matchRest[2]
resMaps.d = matchRest[3]
resMaps.H = matchRest[4]
resMaps.m = matchRest[5]
resMaps.s = matchRest[6]
resMaps.S = matchRest[7]
resMaps.Z = matchRest[8]
break
}
}
return rests
return resMaps
}

var customFormatRules = [
{ rules: [['yyyy', 4]] },
{ rules: [['MM', 2], ['M', 1]], offset: -1 },
{ rules: [['dd', 2], ['d', 1]] },
{ rules: [['HH', 2], ['H', 1]] },
{ rules: [['mm', 2], ['m', 1]] },
{ rules: [['ss', 2], ['s', 1]] },
{ rules: [['SSS', 3], ['SS', 2], ['S', 1]] },
{ rules: [['ZZ', 5], ['Z', 6], ['Z', 5], ['Z', 1]] }
var customParseStrs = [
['yyyy', d3or4],
['yy', d2],
['MM', d2],
['M', d1or2],
['dd', d2],
['d', d1or2],
['HH', d2],
['H', d1or2],
['mm', d2],
['m', d1or2],
['ss', d2],
['s', d1or2],
['SSS', getParseRule('3')],
['S', d1or3],
['Z', dzZ]
]
var parseRuleMaps = {}
var parseRuleKeys = ['\\[([^\\]]+)\\]']

for (var i = 0; i < customParseStrs.length; i++) {
var itemRule = customParseStrs[i]
parseRuleMaps[itemRule[0]] = itemRule[1] + '?'
parseRuleKeys.push(itemRule[0])
}

var customParseRes = new RegExp(parseRuleKeys.join('|'), 'g')
var cacheFormatMaps = {}

/**
* 解析自定义格式
*/
function parseCustomRules (str, format) {
var arr, sIndex, fIndex, fLen, fItem, rules, rIndex, rLen, tempMatch
var rests = []
for (fIndex = 0, fLen = customFormatRules.length; fIndex < fLen; fIndex++) {
fItem = customFormatRules[fIndex]
for (rIndex = 0, rules = fItem.rules, rLen = rules.length; rIndex < rLen; rIndex++) {
arr = rules[rIndex]
sIndex = format.indexOf(arr[0])
if (sIndex > -1) {
tempMatch = str.substring(sIndex, sIndex + arr[1])
if (tempMatch && tempMatch.length === arr[1]) {
if (fItem.offset) {
tempMatch = staticParseInt(tempMatch) + fItem.offset
}
rests[fIndex] = tempMatch
break
}
}
if (rIndex === rLen - 1) {
return rests
var cacheItem = cacheFormatMaps[format]
if (!cacheItem) {
var posIndexs = []
var re = format.replace(/([$(){}*+.?\\^|])/g, "\\$1").replace(customParseRes, function (text, val) {
var firstChar = text.charAt(0)
// 如果为转义符号:[关键字]
if (firstChar === '[') {
return val
}
posIndexs.push(firstChar)
return parseRuleMaps[text]
})
cacheItem = cacheFormatMaps[format] = {
_i: posIndexs,
_r: new RegExp(re)
}
}
var resMaps = {}
var matchRest = str.match(cacheItem._r)
if (matchRest) {
var _i = cacheItem._i
for (var i = 1, len = matchRest.length; i < len; i++) {
resMaps[_i[i - 1]] = matchRest[i]
}
return resMaps
}
return rests
return resMaps
}

/**
* 解析时区
*/
function parseTimeZone (resMaps) {
// 如果为UTC 时间
if (/^[zZ]/.test(resMaps.Z)) {
return new Date(helperGetUTCDateTime(resMaps))
} else {
// 如果指定时区，时区转换
var matchRest = resMaps.Z.match(/([-+])(\d{2}):?(\d{2})/)
if (matchRest) {
return new Date(helperGetUTCDateTime(resMaps) - (matchRest[1] === '-' ? -1 : 1) * staticParseInt(matchRest[2]) * 3600000 + staticParseInt(matchRest[3]) * 60000)
}
}
return new Date('')
}

/**
Expand All @@ -100,35 +151,29 @@ function parseCustomRules (str, format) {
* @return {Date}
*/
function toStringDate (str, format) {
var rest, isDType
if (str) {
isDType = isDate(str)
var isDType = isDate(str)
if (isDType || (!format && /^[0-9]{11,15}$/.test(str))) {
rest = new Date(isDType ? helperGetDateTime(str) : staticParseInt(str))
} else if (isString(str)) {
var tempMatch
var rests = format ? parseCustomRules(str, format) : parseDefaultRules(str)
var zStr = rests[7]
if (rests[0]) {
// 解析时区
if (zStr) {
// 如果为UTC 时间
if (zStr[0] === 'z' || zStr[0] === 'Z') {
rest = new Date(helperGetUTCDateTime(rests))
} else {
// 如果指定时区，时区转换
tempMatch = zStr.match(/([-+])(\d{2}):?(\d{2})/)
if (tempMatch) {
rest = new Date(helperGetUTCDateTime(rests) - (tempMatch[1] === '-' ? -1 : 1) * staticParseInt(tempMatch[2]) * 3600000 + staticParseInt(tempMatch[3]) * 60000)
}
}
return new Date(isDType ? helperGetDateTime(str) : staticParseInt(str))
}
if (isString(str)) {
var resMaps = format ? parseCustomRules(str, format) : parseDefaultRules(str)
if (resMaps.y) {
if (resMaps.M) {
resMaps.M = toParseNum(resMaps.M) - 1
}
if (resMaps.S) {
resMaps.S = toParseMs(toParseNum(resMaps.S))
}
if (resMaps.Z) {
return parseTimeZone(resMaps)
} else {
rest = new Date(rests[0] || 0, rests[1] || 0, rests[2] || 1, rests[3] || 0, rests[4] || 0, rests[5] || 0, rests[6] || 0)
return new Date(resMaps.y, resMaps.M || 0, resMaps.d || 1, resMaps.H || 0, resMaps.m || 0, resMaps.s || 0, resMaps.S || 0)
}
}
}
}
return rest ? rest : new Date('')
return new Date('')
}

module.exports = toStringDate
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "xe-utils",
"version": "3.2.1",
"version": "3.3.0",
"description": "JavaScript 函数库、工具类",
"main": "index.js",
"unpkg": "dist/xe-utils.umd.min.js",
Expand Down
12 changes: 4 additions & 8 deletions src/views/API.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2417,10 +2417,6 @@ export default {
// Wed Dec 20 2017 10:10:00 GMT+0800 (中国标准时间)
XEUtils.toStringDate('12/20/2017 10:10:30.100', 'MM/dd/yyyy HH:mm:ss.SSS')
// Wed Dec 20 2017 10:10:30 GMT+0800 (中国标准时间)
XEUtils.toStringDate('Year:2018 Month:01 Day:26', 'Year:yyyy Month:MM Day:dd')
// Fri Jan 26 2018 00:00:00 GMT+0800 (中国标准时间)
XEUtils.toStringDate('yyyy:2017 MM:01 dd:20', '%%%%:yyyy %%:MM %%:dd')
// Fri Jan 20 2017 00:00:00 GMT+0800 (中国标准时间)
`
]
},
Expand All @@ -2441,12 +2437,12 @@ export default {
['hh', '12小时制', '自动补0', ' 01~12'],
['H', '24小时制', '', '0~23'],
['HH', '24小时制', '自动补0', '00~23'],
['m', '分钟', '', ''],
['m', '分钟', '', '0~59'],
['mm', '分钟', '自动补0', '00~59'],
['s', '秒', '', ''],
['s', '秒', '', '0~59'],
['ss', '秒', '自动补0', '00~59'],
['S', '毫秒', '', ''],
['SSS', '毫秒', '自动补0', ''],
['S', '毫秒', '', '0~999'],
['SSS', '毫秒', '自动补0', '000~999'],
['a', 'am/pm，小写', '', 'am/pm'],
['A', 'AM/PM，大写', '', 'AM/PM'],
['D', '年份的第几天', '', '1~366'],
Expand Down
Loading

0 comments on commit ae7f7f9

Please sign in to comment.