qmwts 1.2.7 → 1.2.9

package/dist/class/local-date.js

@@ -1,6 +1,6 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 // https://juejin.cn/post/7098891689955164168
+Object.defineProperty(exports, "__esModule", { value: true });
 class LocalDate {
     constructor(date) {
         if (date instanceof Date)

package/dist/index.d.ts

@@ -21,3 +21,4 @@ export { findTreeNodes } from './utils/array-utils2';
 export { prototype } from './utils/prototype-utils2';
 export { fileType } from './utils/file-utils2';
 export { clearValues } from './utils/object-utils2';
+export { formatDateDiff, formatDateTime, parseDate } from './utils/date-utils';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearValues = exports.fileType = exports.prototype = exports.findTreeNodes = exports.summation = exports.thousandths = exports.isNumber = exports.sha256Hex = exports.YearMonth = exports.LocalDateTime = exports.LocalDate = exports.StringUtils = exports.FileUtils = exports.ParamBuilder = exports.PrototypeUtils = exports.ObjectUtils = exports.JsonUtils = exports.NumberUtils = exports.Encryptor = exports.Downloader = exports.AxiosInstance = exports.FinanceUtils = exports.ArrayUtils = void 0;
+exports.parseDate = exports.formatDateTime = exports.formatDateDiff = exports.clearValues = exports.fileType = exports.prototype = exports.findTreeNodes = exports.summation = exports.thousandths = exports.isNumber = exports.sha256Hex = exports.YearMonth = exports.LocalDateTime = exports.LocalDate = exports.StringUtils = exports.FileUtils = exports.ParamBuilder = exports.PrototypeUtils = exports.ObjectUtils = exports.JsonUtils = exports.NumberUtils = exports.Encryptor = exports.Downloader = exports.AxiosInstance = exports.FinanceUtils = exports.ArrayUtils = void 0;
 var array_utils_1 = require("./utils/array-utils");
 Object.defineProperty(exports, "ArrayUtils", { enumerable: true, get: function () { return array_utils_1.default; } });
 var finance_utils_1 = require("./utils/finance-utils");
@@ -45,3 +45,7 @@ var file_utils2_1 = require("./utils/file-utils2");
 Object.defineProperty(exports, "fileType", { enumerable: true, get: function () { return file_utils2_1.fileType; } });
 var object_utils2_1 = require("./utils/object-utils2");
 Object.defineProperty(exports, "clearValues", { enumerable: true, get: function () { return object_utils2_1.clearValues; } });
+var date_utils_1 = require("./utils/date-utils");
+Object.defineProperty(exports, "formatDateDiff", { enumerable: true, get: function () { return date_utils_1.formatDateDiff; } });
+Object.defineProperty(exports, "formatDateTime", { enumerable: true, get: function () { return date_utils_1.formatDateTime; } });
+Object.defineProperty(exports, "parseDate", { enumerable: true, get: function () { return date_utils_1.parseDate; } });

package/dist/utils/date-utils.d.ts

@@ -0,0 +1,5 @@
+import { DateTime } from 'luxon';
+export declare const formatDateDiff: (date1: any, date2?: any) => string;
+export declare const formatDateTime: (date: any) => string;
+export declare const formatDate: (date: any) => string;
+export declare const parseDate: (date: any) => DateTime | null;

package/dist/utils/date-utils.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseDate = exports.formatDate = exports.formatDateTime = exports.formatDateDiff = void 0;
+const luxon_1 = require("luxon");
+const prototype_utils2_1 = require("./prototype-utils2");
+const formatDateDiff = (date1, date2) => {
+    if (!date2)
+        date2 = luxon_1.DateTime.now().startOf('day');
+    date1 = (0, exports.parseDate)(date1);
+    if (!date1)
+        return '';
+    if (date1.diff(date2).as('days') > 0) // date1应该比date2小，如果不是则交换参数
+        [date1, date2] = [date2, date1]; // 交换参数
+    const { years, months, days } = date2.diff(date1, ['years', 'months', 'days']).toObject();
+    // 只收集不为 0 的部分
+    const parts = [];
+    if (years > 0)
+        parts.push(`${years}年`);
+    if (months > 0)
+        parts.push(`${months}个月`);
+    if (days > 0)
+        parts.push(`${days}天`);
+    // 拼接成最终字符串
+    return parts.join('');
+};
+exports.formatDateDiff = formatDateDiff;
+const formatDateTime = (date) => {
+    date = (0, exports.parseDate)(date);
+    return date ? date.toFormat('yyyy-MM-dd HH:mm') : '';
+};
+exports.formatDateTime = formatDateTime;
+const formatDate = (date) => {
+    date = (0, exports.parseDate)(date);
+    return date ? date.toFormat('yyyy-MM-dd') : '';
+};
+exports.formatDate = formatDate;
+const parseDate = (date) => {
+    let luxonDate = void 0;
+    if (date instanceof luxon_1.DateTime)
+        luxonDate = date;
+    else if ((0, prototype_utils2_1.prototype)(date) === 'Number')
+        luxonDate = luxon_1.DateTime.fromMillis(date);
+    else if ((0, prototype_utils2_1.prototype)(date) === 'Date')
+        luxonDate = luxon_1.DateTime.fromJSDate(date);
+    else if ((0, prototype_utils2_1.prototype)(date) === 'String')
+        luxonDate = luxon_1.DateTime.fromISO(date);
+    if (luxonDate === null || luxonDate === void 0 ? void 0 : luxonDate.isValid)
+        return luxonDate;
+    return null;
+};
+exports.parseDate = parseDate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qmwts",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,6 +12,7 @@
   "license": "ISC",
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
+    "@types/luxon": "^3.7.1",
     "axios": "*",
     "typescript": "^5.9.2",
     "vitest": "^3.2.4"
@@ -21,7 +22,8 @@
   ],
   "dependencies": {
     "jszip": "^3.10.1",
-    "lodash-es": "^4.17.22"
+    "lodash-es": "^4.17.22",
+    "luxon": "^3.7.2"
   },
   "peerDependencies": {
     "axios": "^1.12.2"