* [Bugfix] 修复英文时间时期的bug

* [bugfix] 修复session时间日期的问题

* [Bugfix] 修改时间日志格式化错误

* [Update] 修改函数名称

* [Update] 修改函数顺序

* [Update] 注释部分迁移文件内容
This commit is contained in:
老广
2019-07-22 17:15:24 +08:00
committed by GitHub
parent 5f59c729b7
commit 5db704f793
10 changed files with 41 additions and 33 deletions

View File

@@ -1091,7 +1091,7 @@ function objectAttrsIsList(obj, attrs) {
function objectAttrsIsDatetime(obj, attrs) {
attrs.forEach(function (attr) {
obj[attr] = formatDateAsCN(obj[attr]);
obj[attr] = toSafeDateISOStr(obj[attr]);
})
}
@@ -1105,29 +1105,37 @@ function objectAttrsIsBool(obj, attrs) {
})
}
function cleanDate(d) {
if (typeof d === 'number'){
return d
}
if (typeof d === "string") {
d = d.replaceAll('-', '/')
}
for (var i=0; i<2; i++) {
if (isNaN(Date.parse(d))) {
d = d.split('+')[0].trimRight();
} else {
return d
function cleanDateStr(d) {
for (var i=0;i<3;i++) {
if (!isNaN(Date.parse(d))){
return d;
}
if (!isNaN(Number(d))) {
return d;
}
switch (i) {
case 0:
d = d.replaceAll('-', '/');
break;
case 1:
d = d.split('+')[0].trimRight();
break;
}
}
return ''
return null;
}
function safeDate(s) {
s = cleanDate(s);
s = cleanDateStr(s);
return new Date(s)
}
function formatDateAsCN(d) {
function toSafeDateISOStr(s) {
var d = safeDate(s);
return d.toISOString();
}
function toSafeLocalDateStr(d) {
var date = safeDate(d);
var date_s = date.toLocaleString(navigator.language, {hour12: false});
return date_s.split("/").join('-')
@@ -1149,7 +1157,7 @@ function getTimeUnits(u) {
"m": "分",
"s": "秒",
};
if (navigator.language || "zh-CN") {
if (navigator.language === "zh-CN") {
return units[u]
}
return u