更新
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
* @Date: 2020-12-29 16:49:28
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2023-12-07 10:00:51
|
||||
* @LastEditTime: 2024-09-10 15:15:21
|
||||
* @FilePath: \basic-admin\src\filters\basicData\index.js
|
||||
* @Description:
|
||||
*/
|
||||
@@ -47,7 +47,7 @@ export function parseTime(time, pattern) {
|
||||
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
|
||||
time = parseInt(time)
|
||||
} else if (typeof time === 'string') {
|
||||
time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.\d{3}/gm),'');
|
||||
time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.\d{3}/gm), '');
|
||||
}
|
||||
if ((typeof time === 'number') && (time.toString().length === 10)) {
|
||||
time = time * 1000
|
||||
@@ -61,14 +61,25 @@ export function parseTime(time, pattern) {
|
||||
h: date.getHours(),
|
||||
i: date.getMinutes(),
|
||||
s: date.getSeconds(),
|
||||
a: date.getDay()
|
||||
a: date.getDay(),
|
||||
w: '',
|
||||
}
|
||||
const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
|
||||
const time_str = format.replace(/{([ymdhisaw])+}/g, (result, key) => {
|
||||
let value = formatObj[key]
|
||||
// Note: getDay() returns 0 on Sunday
|
||||
if (key === 'a') {
|
||||
return ['日', '一', '二', '三', '四', '五', '六'][value]
|
||||
}
|
||||
if (key === 'w') {
|
||||
const current = new Date(time);
|
||||
current.setHours(0, 0, 0);
|
||||
current.setDate(current.getDate() + 4 - (current.getDay() || 7));
|
||||
const firstThursday = new Date(current.getFullYear(), 0, 4);
|
||||
firstThursday.setDate(firstThursday.getDate() + 4 - (firstThursday.getDay() || 7));
|
||||
const time1 = current.getTime() - firstThursday.getTime();
|
||||
const weeks = Math.ceil(time1 / (7 * 24 * 3600 * 1000));
|
||||
return (weeks + 1)
|
||||
}
|
||||
if (result.length > 0 && value < 10) {
|
||||
value = '0' + value
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user