almighty-tool 0.0.2 → 0.0.3
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/lib/formats/date.format.d.ts +1 -1
- package/lib/formats/date.format.js +56 -39
- package/lib/formats/date.format.js.map +1 -1
- package/lib/locales/en/index.d.ts +14 -0
- package/lib/locales/en/index.js +14 -0
- package/lib/locales/en/index.js.map +1 -1
- package/lib/locales/zh-cn/index.js +7 -7
- package/lib/locales/zh-cn/index.js.map +1 -1
- package/package.json +2 -2
|
@@ -3,15 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
var tslib_1 = require("tslib");
|
|
4
4
|
var dayjs_1 = (0, tslib_1.__importDefault)(require("dayjs"));
|
|
5
5
|
require("dayjs/locale/en");
|
|
6
|
-
require("
|
|
6
|
+
require("dayjs/locale/zh-cn");
|
|
7
7
|
var relativeTime_1 = (0, tslib_1.__importDefault)(require("dayjs/plugin/relativeTime"));
|
|
8
8
|
var lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
|
|
9
|
+
var en_1 = (0, tslib_1.__importDefault)(require("../locales/en"));
|
|
9
10
|
var zh_cn_1 = (0, tslib_1.__importDefault)(require("../locales/zh-cn"));
|
|
10
11
|
var general_1 = (0, tslib_1.__importDefault)(require("../common/general"));
|
|
11
12
|
var DEFAULT_I18N_KEY = 'almighty-tool/formats/date-format#i18n';
|
|
12
13
|
var i18n = {
|
|
13
|
-
t: function (key, _values) {
|
|
14
|
-
|
|
14
|
+
t: function (key, _values, locale) {
|
|
15
|
+
switch (locale) {
|
|
16
|
+
case 'en':
|
|
17
|
+
return lodash_1.default.get(en_1.default, key);
|
|
18
|
+
case 'zh-cn':
|
|
19
|
+
default:
|
|
20
|
+
return lodash_1.default.get(zh_cn_1.default, key);
|
|
21
|
+
}
|
|
15
22
|
},
|
|
16
23
|
};
|
|
17
24
|
/** 日期格式化工具 */
|
|
@@ -25,45 +32,55 @@ var dateFormat = {
|
|
|
25
32
|
format: function (date, options) {
|
|
26
33
|
var _a, _b;
|
|
27
34
|
if (options === void 0) { options = {}; }
|
|
35
|
+
var result = '';
|
|
28
36
|
if (date) {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
37
|
+
try {
|
|
38
|
+
var _i18n = general_1.default.getDefault(DEFAULT_I18N_KEY) || i18n;
|
|
39
|
+
var locale = ((_a = options.locale) !== null && _a !== void 0 ? _a : _i18n.t('AlmightyTool.DateFormat.locale').toString()).toLowerCase();
|
|
40
|
+
var template = (_b = options.template) !== null && _b !== void 0 ? _b : dateFormat.getFormatTemplate(options.formatter);
|
|
41
|
+
var day = (0, dayjs_1.default)(date);
|
|
42
|
+
var now = (0, dayjs_1.default)();
|
|
43
|
+
var localeDay = day.locale(locale);
|
|
44
|
+
var i18nPrefix = "AlmightyTool.DateFormat.".concat(options.formatter);
|
|
45
|
+
switch (options.formatter) {
|
|
46
|
+
case 'step':
|
|
47
|
+
case 'shortStep':
|
|
48
|
+
if (now.startOf('day').diff(day) <= 0 && now.add(1, 'day').startOf('day').diff(day) > 0) {
|
|
49
|
+
/** 今天 */
|
|
50
|
+
result = localeDay.format(_i18n.t("".concat(i18nPrefix, ".today"), undefined, locale));
|
|
51
|
+
}
|
|
52
|
+
else if (now.add(1, 'day').startOf('day').diff(day) <= 0 && now.add(2, 'day').startOf('day').diff(day) > 0) {
|
|
53
|
+
/** 明天 */
|
|
54
|
+
result = localeDay.format(_i18n.t("".concat(i18nPrefix, ".tomorrow"), undefined, locale));
|
|
55
|
+
}
|
|
56
|
+
else if (now.subtract(1, 'day').startOf('day').diff(day) <= 0 && now.startOf('day').diff(day) > 0) {
|
|
57
|
+
/** 昨天 */
|
|
58
|
+
result = localeDay.format(_i18n.t("".concat(i18nPrefix, ".yesterday"), undefined, locale));
|
|
59
|
+
}
|
|
60
|
+
else if (now.startOf('year').diff(day) <= 0 && now.add(1, 'year').startOf('year').diff(day) > 0) {
|
|
61
|
+
/** 今年 */
|
|
62
|
+
result = localeDay.format(_i18n.t("".concat(i18nPrefix, ".thisYear"), undefined, locale));
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
result = localeDay.format(_i18n.t("".concat(i18nPrefix, ".longAgo"), undefined, locale));
|
|
66
|
+
}
|
|
67
|
+
break;
|
|
68
|
+
case 'fromNow':
|
|
69
|
+
dayjs_1.default.extend(relativeTime_1.default);
|
|
70
|
+
result = localeDay.fromNow();
|
|
71
|
+
break;
|
|
72
|
+
case 'toNow':
|
|
73
|
+
dayjs_1.default.extend(relativeTime_1.default);
|
|
74
|
+
result = localeDay.toNow();
|
|
75
|
+
break;
|
|
76
|
+
default:
|
|
77
|
+
result = localeDay.format(template);
|
|
78
|
+
break;
|
|
79
|
+
}
|
|
64
80
|
}
|
|
81
|
+
catch (error) { }
|
|
65
82
|
}
|
|
66
|
-
return
|
|
83
|
+
return result;
|
|
67
84
|
},
|
|
68
85
|
/** 获取格式化模板 */
|
|
69
86
|
getFormatTemplate: function (formatter) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.format.js","sourceRoot":"","sources":["../../src/formats/date.format.ts"],"names":[],"mappings":";;;AAAA,6DAA0B;AAC1B,2BAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"date.format.js","sourceRoot":"","sources":["../../src/formats/date.format.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,20 @@ declare const _default: {
|
|
|
13
13
|
time: string;
|
|
14
14
|
shortTime: string;
|
|
15
15
|
};
|
|
16
|
+
step: {
|
|
17
|
+
today: string;
|
|
18
|
+
tomorrow: string;
|
|
19
|
+
yesterday: string;
|
|
20
|
+
thisYear: string;
|
|
21
|
+
longAgo: string;
|
|
22
|
+
};
|
|
23
|
+
shortStep: {
|
|
24
|
+
today: string;
|
|
25
|
+
tomorrow: string;
|
|
26
|
+
yesterday: string;
|
|
27
|
+
thisYear: string;
|
|
28
|
+
longAgo: string;
|
|
29
|
+
};
|
|
16
30
|
};
|
|
17
31
|
};
|
|
18
32
|
};
|
package/lib/locales/en/index.js
CHANGED
|
@@ -15,6 +15,20 @@ exports.default = {
|
|
|
15
15
|
time: 'HH:mm:ss',
|
|
16
16
|
shortTime: 'HH:mm',
|
|
17
17
|
},
|
|
18
|
+
step: {
|
|
19
|
+
today: 'h:mm A',
|
|
20
|
+
tomorrow: '[Tomorrow] h:mm A',
|
|
21
|
+
yesterday: '[Yesterday] h:mm A',
|
|
22
|
+
thisYear: 'MMM D h:mm A',
|
|
23
|
+
longAgo: 'MMM D, YYYY h:mm A',
|
|
24
|
+
},
|
|
25
|
+
shortStep: {
|
|
26
|
+
today: 'HH:mm',
|
|
27
|
+
tomorrow: '[Tomorrow] HH:mm',
|
|
28
|
+
yesterday: '[Yesterday] HH:mm',
|
|
29
|
+
thisYear: 'MMM D HH:mm',
|
|
30
|
+
longAgo: 'MMM D, YYYY HH:mm',
|
|
31
|
+
},
|
|
18
32
|
},
|
|
19
33
|
},
|
|
20
34
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/locales/en/index.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,YAAY,EAAE;QACZ,UAAU,EAAE;YACV,MAAM,EAAE,IAAI;YACZ,EAAE,EAAE,IAAI;YACR,EAAE,EAAE,IAAI;YACR,OAAO,EAAE;gBACP,OAAO,EAAE,yBAAyB;gBAClC,IAAI,EAAE,yBAAyB;gBAC/B,IAAI,EAAE,qBAAqB;gBAC3B,KAAK,EAAE,kBAAkB;gBACzB,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,UAAU;gBAChB,SAAS,EAAE,OAAO;aACnB;SACF;KACF;CACF,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/locales/en/index.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,YAAY,EAAE;QACZ,UAAU,EAAE;YACV,MAAM,EAAE,IAAI;YACZ,EAAE,EAAE,IAAI;YACR,EAAE,EAAE,IAAI;YACR,OAAO,EAAE;gBACP,OAAO,EAAE,yBAAyB;gBAClC,IAAI,EAAE,yBAAyB;gBAC/B,IAAI,EAAE,qBAAqB;gBAC3B,KAAK,EAAE,kBAAkB;gBACzB,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,UAAU;gBAChB,SAAS,EAAE,OAAO;aACnB;YACD,IAAI,EAAE;gBACJ,KAAK,EAAE,QAAQ;gBACf,QAAQ,EAAE,mBAAmB;gBAC7B,SAAS,EAAE,oBAAoB;gBAC/B,QAAQ,EAAE,cAAc;gBACxB,OAAO,EAAE,oBAAoB;aAC9B;YACD,SAAS,EAAE;gBACT,KAAK,EAAE,OAAO;gBACd,QAAQ,EAAE,kBAAkB;gBAC5B,SAAS,EAAE,mBAAmB;gBAC9B,QAAQ,EAAE,aAAa;gBACvB,OAAO,EAAE,mBAAmB;aAC7B;SACF;KACF;CACF,CAAC"}
|
|
@@ -16,18 +16,18 @@ exports.default = {
|
|
|
16
16
|
shortTime: 'HH:mm',
|
|
17
17
|
},
|
|
18
18
|
step: {
|
|
19
|
-
today: '
|
|
20
|
-
tomorrow: '明天
|
|
21
|
-
yesterday: '昨天
|
|
22
|
-
thisYear: '
|
|
23
|
-
longAgo: 'YYYY
|
|
19
|
+
today: 'Ah:mm',
|
|
20
|
+
tomorrow: '明天 Ah:mm',
|
|
21
|
+
yesterday: '昨天 Ah:mm',
|
|
22
|
+
thisYear: 'M月D日 Ah:mm',
|
|
23
|
+
longAgo: 'YYYY年M月D日 Ah:mm',
|
|
24
24
|
},
|
|
25
25
|
shortStep: {
|
|
26
26
|
today: 'HH:mm',
|
|
27
27
|
tomorrow: '明天 HH:mm',
|
|
28
28
|
yesterday: '昨天 HH:mm',
|
|
29
|
-
thisYear: '
|
|
30
|
-
longAgo: 'YYYY
|
|
29
|
+
thisYear: 'M月D日 HH:mm',
|
|
30
|
+
longAgo: 'YYYY年M月D日 HH:mm',
|
|
31
31
|
},
|
|
32
32
|
},
|
|
33
33
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/locales/zh-cn/index.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,YAAY,EAAE;QACZ,UAAU,EAAE;YACV,MAAM,EAAE,OAAO;YACf,EAAE,EAAE,IAAI;YACR,EAAE,EAAE,IAAI;YACR,OAAO,EAAE;gBACP,OAAO,EAAE,yBAAyB;gBAClC,IAAI,EAAE,yBAAyB;gBAC/B,IAAI,EAAE,qBAAqB;gBAC3B,KAAK,EAAE,kBAAkB;gBACzB,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,UAAU;gBAChB,SAAS,EAAE,OAAO;aACnB;YACD,IAAI,EAAE;gBACJ,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/locales/zh-cn/index.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,YAAY,EAAE;QACZ,UAAU,EAAE;YACV,MAAM,EAAE,OAAO;YACf,EAAE,EAAE,IAAI;YACR,EAAE,EAAE,IAAI;YACR,OAAO,EAAE;gBACP,OAAO,EAAE,yBAAyB;gBAClC,IAAI,EAAE,yBAAyB;gBAC/B,IAAI,EAAE,qBAAqB;gBAC3B,KAAK,EAAE,kBAAkB;gBACzB,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,UAAU;gBAChB,SAAS,EAAE,OAAO;aACnB;YACD,IAAI,EAAE;gBACJ,KAAK,EAAE,OAAO;gBACd,QAAQ,EAAE,UAAU;gBACpB,SAAS,EAAE,UAAU;gBACrB,QAAQ,EAAE,YAAY;gBACtB,OAAO,EAAE,iBAAiB;aAC3B;YACD,SAAS,EAAE;gBACT,KAAK,EAAE,OAAO;gBACd,QAAQ,EAAE,UAAU;gBACpB,SAAS,EAAE,UAAU;gBACrB,QAAQ,EAAE,YAAY;gBACtB,OAAO,EAAE,iBAAiB;aAC3B;SACF;KACF;CACF,CAAC"}
|