hsu-utils 0.0.50 → 0.0.52
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -3
- package/dist/hsu-utils.js +2 -2
- package/dist/hsu-utils.min.js +1 -1
- package/dist/hsu-utils.min.js.LICENSE.txt +1 -1
- package/es/GetDateRange/index.d.ts +1 -1
- package/es/GetDateRange/index.js +7 -3
- package/lib/GetDateRange/index.d.ts +1 -1
- package/lib/GetDateRange/index.js +7 -3
- package/package.json +1 -1
|
@@ -4,7 +4,7 @@ export interface GetDateRangeOptions {
|
|
|
4
4
|
amount?: number;
|
|
5
5
|
type: DateRangeType;
|
|
6
6
|
baseDate?: string | Date | Dayjs;
|
|
7
|
-
unit?: 'day' | 'week' | 'month' | 'year';
|
|
7
|
+
unit?: 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'year';
|
|
8
8
|
minDate?: string | Date | Dayjs;
|
|
9
9
|
maxDate?: string | Date | Dayjs;
|
|
10
10
|
hasTime?: boolean;
|
package/es/GetDateRange/index.js
CHANGED
|
@@ -3,7 +3,7 @@ import quarterOfYear from 'dayjs/plugin/quarterOfYear';
|
|
|
3
3
|
import weekOfYear from 'dayjs/plugin/weekOfYear';
|
|
4
4
|
dayjs.extend(quarterOfYear);
|
|
5
5
|
dayjs.extend(weekOfYear);
|
|
6
|
-
function getFormat(type, unit = 'day', hasTime =
|
|
6
|
+
function getFormat(type, unit = 'day', hasTime = false) {
|
|
7
7
|
let baseFormat;
|
|
8
8
|
switch (type) {
|
|
9
9
|
case 'today':
|
|
@@ -31,6 +31,10 @@ function getFormat(type, unit = 'day', hasTime = true) {
|
|
|
31
31
|
case 'month':
|
|
32
32
|
baseFormat = 'YYYY-MM';
|
|
33
33
|
break;
|
|
34
|
+
case 'second':
|
|
35
|
+
case 'minute':
|
|
36
|
+
case 'hour':
|
|
37
|
+
return 'YYYY-MM-DD HH:mm:ss';
|
|
34
38
|
case 'week':
|
|
35
39
|
case 'day':
|
|
36
40
|
default:
|
|
@@ -39,13 +43,13 @@ function getFormat(type, unit = 'day', hasTime = true) {
|
|
|
39
43
|
}
|
|
40
44
|
break;
|
|
41
45
|
}
|
|
42
|
-
if (hasTime &&
|
|
46
|
+
if (hasTime && baseFormat.endsWith('DD')) {
|
|
43
47
|
return `${baseFormat} HH:mm:ss`;
|
|
44
48
|
}
|
|
45
49
|
return baseFormat;
|
|
46
50
|
}
|
|
47
51
|
export default function getDateRange(options) {
|
|
48
|
-
const { type, amount = 0, baseDate, unit = 'day', minDate: minDateLimit, maxDate: maxDateLimit, hasTime =
|
|
52
|
+
const { type, amount = 0, baseDate, unit = 'day', minDate: minDateLimit, maxDate: maxDateLimit, hasTime = false } = options;
|
|
49
53
|
const base = baseDate ? dayjs(baseDate) : dayjs();
|
|
50
54
|
let minDate;
|
|
51
55
|
let maxDate;
|
|
@@ -4,7 +4,7 @@ export interface GetDateRangeOptions {
|
|
|
4
4
|
amount?: number;
|
|
5
5
|
type: DateRangeType;
|
|
6
6
|
baseDate?: string | Date | Dayjs;
|
|
7
|
-
unit?: 'day' | 'week' | 'month' | 'year';
|
|
7
|
+
unit?: 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'year';
|
|
8
8
|
minDate?: string | Date | Dayjs;
|
|
9
9
|
maxDate?: string | Date | Dayjs;
|
|
10
10
|
hasTime?: boolean;
|
|
@@ -10,7 +10,7 @@ dayjs_1.default.extend(quarterOfYear_1.default);
|
|
|
10
10
|
dayjs_1.default.extend(weekOfYear_1.default);
|
|
11
11
|
function getFormat(type, unit, hasTime) {
|
|
12
12
|
if (unit === void 0) { unit = 'day'; }
|
|
13
|
-
if (hasTime === void 0) { hasTime =
|
|
13
|
+
if (hasTime === void 0) { hasTime = false; }
|
|
14
14
|
var baseFormat;
|
|
15
15
|
switch (type) {
|
|
16
16
|
case 'today':
|
|
@@ -38,6 +38,10 @@ function getFormat(type, unit, hasTime) {
|
|
|
38
38
|
case 'month':
|
|
39
39
|
baseFormat = 'YYYY-MM';
|
|
40
40
|
break;
|
|
41
|
+
case 'second':
|
|
42
|
+
case 'minute':
|
|
43
|
+
case 'hour':
|
|
44
|
+
return 'YYYY-MM-DD HH:mm:ss';
|
|
41
45
|
case 'week':
|
|
42
46
|
case 'day':
|
|
43
47
|
default:
|
|
@@ -46,13 +50,13 @@ function getFormat(type, unit, hasTime) {
|
|
|
46
50
|
}
|
|
47
51
|
break;
|
|
48
52
|
}
|
|
49
|
-
if (hasTime &&
|
|
53
|
+
if (hasTime && baseFormat.endsWith('DD')) {
|
|
50
54
|
return "".concat(baseFormat, " HH:mm:ss");
|
|
51
55
|
}
|
|
52
56
|
return baseFormat;
|
|
53
57
|
}
|
|
54
58
|
function getDateRange(options) {
|
|
55
|
-
var type = options.type, _a = options.amount, amount = _a === void 0 ? 0 : _a, baseDate = options.baseDate, _b = options.unit, unit = _b === void 0 ? 'day' : _b, minDateLimit = options.minDate, maxDateLimit = options.maxDate, _c = options.hasTime, hasTime = _c === void 0 ?
|
|
59
|
+
var type = options.type, _a = options.amount, amount = _a === void 0 ? 0 : _a, baseDate = options.baseDate, _b = options.unit, unit = _b === void 0 ? 'day' : _b, minDateLimit = options.minDate, maxDateLimit = options.maxDate, _c = options.hasTime, hasTime = _c === void 0 ? false : _c;
|
|
56
60
|
var base = baseDate ? (0, dayjs_1.default)(baseDate) : (0, dayjs_1.default)();
|
|
57
61
|
var minDate;
|
|
58
62
|
var maxDate;
|