qmwts 1.1.64 → 1.1.66

package/dist/class/local-date.d.ts

@@ -9,7 +9,11 @@ export default class LocalDate {
     getDayOfMonth(): number;
     getDayOfWeek(): number;
     plusDays(days: number): LocalDate;
+    plusMonths(months: number): LocalDate;
+    plusYears(years: number): LocalDate;
     minusDays(days: number): LocalDate;
+    minusMonths(months: number): LocalDate;
+    minusYears(years: number): LocalDate;
     format(): string;
     toString(): string;
 }

package/dist/class/local-date.js

@@ -29,18 +29,29 @@ class LocalDate {
     plusDays(days) {
         return LocalDate.of(this.getYear(), this.getMonth(), this.getDayOfMonth() + days);
     }
+    plusMonths(months) {
+        return LocalDate.of(this.getYear(), this.getMonth() + months, this.getDayOfMonth());
+    }
+    plusYears(years) {
+        return LocalDate.of(this.getYear() + years, this.getMonth(), this.getDayOfMonth());
+    }
     minusDays(days) {
         return this.plusDays(-days);
     }
+    minusMonths(months) {
+        return this.plusMonths(-months);
+    }
+    minusYears(years) {
+        return this.plusYears(-years);
+    }
     format() {
         return this.toString();
     }
     toString() {
-        return [
-            this.date.getFullYear().toString(),
-            (this.date.getMonth() + 1).toString().padStart(2, '0'),
-            this.date.getDate().toString().padStart(2, '0')
-        ].join('-');
+        const year = this.date.getFullYear();
+        const month = String(this.date.getMonth() + 1).padStart(2, '0');
+        const day = String(this.date.getDate()).padStart(2, '0');
+        return `${year}-${month}-${day}`;
     }
 }
 exports.default = LocalDate;

package/dist/index.d.ts

@@ -3,16 +3,15 @@ export type { PageVo } from './types/page-vo';
 export { default as ArrayUtils } from './utils/array-utils';
 export { default as FinanceUtils } from './utils/finance-utils';
 export { default as AxiosInstance } from './utils/axios-instance';
-import Downloader from './utils/downloader';
-import Encryptor from './utils/encryptor';
-import NumberUtils from './utils/number-utils';
-import JsonUtils from './utils/json-utils';
-import ObjectUtils from './utils/object-utils';
-import PrototypeUtils from './utils/prototype-utils';
-import RequestDataGenerator from './utils/request-data-generator';
-import FileUtils from './utils/file-utils';
-import StringUtils from './utils/string-utils';
-import LocalDate from './class/local-date';
-import LocalDateTime from './class/local-date-time';
-import YearMonth from './class/year-month';
-export { Downloader, Encryptor, NumberUtils, JsonUtils, ObjectUtils, PrototypeUtils, RequestDataGenerator, FileUtils, StringUtils, LocalDate, LocalDateTime, YearMonth, };
+export { default as Downloader } from './utils/downloader';
+export { default as Encryptor } from './utils/encryptor';
+export { default as NumberUtils } from './utils/number-utils';
+export { default as JsonUtils } from './utils/json-utils';
+export { default as ObjectUtils } from './utils/object-utils';
+export { default as PrototypeUtils } from './utils/prototype-utils';
+export { default as RequestDataGenerator } from './utils/request-data-generator';
+export { default as FileUtils } from './utils/file-utils';
+export { default as StringUtils } from './utils/string-utils';
+export { default as LocalDate } from './class/local-date';
+export { default as LocalDateTime } from './class/local-date-time';
+export { default as YearMonth } from './class/year-month';

package/dist/index.js

@@ -7,27 +7,27 @@ var finance_utils_1 = require("./utils/finance-utils");
 Object.defineProperty(exports, "FinanceUtils", { enumerable: true, get: function () { return finance_utils_1.default; } });
 var axios_instance_1 = require("./utils/axios-instance");
 Object.defineProperty(exports, "AxiosInstance", { enumerable: true, get: function () { return axios_instance_1.default; } });
-const downloader_1 = require("./utils/downloader");
-exports.Downloader = downloader_1.default;
-const encryptor_1 = require("./utils/encryptor");
-exports.Encryptor = encryptor_1.default;
-const number_utils_1 = require("./utils/number-utils");
-exports.NumberUtils = number_utils_1.default;
-const json_utils_1 = require("./utils/json-utils");
-exports.JsonUtils = json_utils_1.default;
-const object_utils_1 = require("./utils/object-utils");
-exports.ObjectUtils = object_utils_1.default;
-const prototype_utils_1 = require("./utils/prototype-utils");
-exports.PrototypeUtils = prototype_utils_1.default;
-const request_data_generator_1 = require("./utils/request-data-generator");
-exports.RequestDataGenerator = request_data_generator_1.default;
-const file_utils_1 = require("./utils/file-utils");
-exports.FileUtils = file_utils_1.default;
-const string_utils_1 = require("./utils/string-utils");
-exports.StringUtils = string_utils_1.default;
-const local_date_1 = require("./class/local-date");
-exports.LocalDate = local_date_1.default;
-const local_date_time_1 = require("./class/local-date-time");
-exports.LocalDateTime = local_date_time_1.default;
-const year_month_1 = require("./class/year-month");
-exports.YearMonth = year_month_1.default;
+var downloader_1 = require("./utils/downloader");
+Object.defineProperty(exports, "Downloader", { enumerable: true, get: function () { return downloader_1.default; } });
+var encryptor_1 = require("./utils/encryptor");
+Object.defineProperty(exports, "Encryptor", { enumerable: true, get: function () { return encryptor_1.default; } });
+var number_utils_1 = require("./utils/number-utils");
+Object.defineProperty(exports, "NumberUtils", { enumerable: true, get: function () { return number_utils_1.default; } });
+var json_utils_1 = require("./utils/json-utils");
+Object.defineProperty(exports, "JsonUtils", { enumerable: true, get: function () { return json_utils_1.default; } });
+var object_utils_1 = require("./utils/object-utils");
+Object.defineProperty(exports, "ObjectUtils", { enumerable: true, get: function () { return object_utils_1.default; } });
+var prototype_utils_1 = require("./utils/prototype-utils");
+Object.defineProperty(exports, "PrototypeUtils", { enumerable: true, get: function () { return prototype_utils_1.default; } });
+var request_data_generator_1 = require("./utils/request-data-generator");
+Object.defineProperty(exports, "RequestDataGenerator", { enumerable: true, get: function () { return request_data_generator_1.default; } });
+var file_utils_1 = require("./utils/file-utils");
+Object.defineProperty(exports, "FileUtils", { enumerable: true, get: function () { return file_utils_1.default; } });
+var string_utils_1 = require("./utils/string-utils");
+Object.defineProperty(exports, "StringUtils", { enumerable: true, get: function () { return string_utils_1.default; } });
+var local_date_1 = require("./class/local-date");
+Object.defineProperty(exports, "LocalDate", { enumerable: true, get: function () { return local_date_1.default; } });
+var local_date_time_1 = require("./class/local-date-time");
+Object.defineProperty(exports, "LocalDateTime", { enumerable: true, get: function () { return local_date_time_1.default; } });
+var year_month_1 = require("./class/year-month");
+Object.defineProperty(exports, "YearMonth", { enumerable: true, get: function () { return year_month_1.default; } });

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

@@ -1,9 +1,10 @@
 declare const _default: {
-    ifNaN(number: any, substitute: any): any;
-    isNumber(...number: any[]): boolean;
-    thousandths(number: any, fixed?: number): string;
-    summation(array?: any[]): number;
-    isBetween(a: number, min: number, max: number): boolean;
-    isInside(a: number, min: number, max: number): boolean;
+    ifNaN(value: any, substitute: any): any;
+    isNumber(...values: any[]): boolean;
+    thousandths(value: any, fixed?: number): string;
+    summation(...values: any[]): number;
+    isBetween(value: number, min: number, max: number): boolean;
+    isInside(value: number, min: number, max: number): boolean;
+    extractNumbers(value: any): string;
 };
 export default _default;

package/dist/utils/number-utils.js

@@ -2,42 +2,62 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     // 判断是否数字
-    ifNaN(number, substitute) {
-        return this.isNumber(number) ? +number : substitute;
+    ifNaN(value, substitute) {
+        return this.isNumber(value) ? +value : substitute;
     },
-    isNumber(...number) {
-        for (let i = number.length - 1; i >= 0; i--) {
-            const e = String(number[i]).trim();
-            if (e === '' || !isFinite(+e) || isNaN(+e))
+    isNumber(...values) {
+        for (let i = values.length - 1; i >= 0; i--) {
+            const e = String(values[i]).trim();
+            if (e === '' || !Number.isFinite(+e) || Number.isNaN(+e))
                 return false;
         }
         return true;
     },
     // 增加千分位分隔符
-    thousandths(number, fixed = 2) {
-        if (!this.isNumber(number))
+    thousandths(value, fixed = 2) {
+        if (!this.isNumber(value))
             return '';
-        number = new Intl.NumberFormat('en-US', {
+        value = new Intl.NumberFormat('en-US', {
             minimumFractionDigits: fixed,
             maximumFractionDigits: fixed,
-        }).format(number);
-        if (+number === 0) // -0转为普通0
+        }).format(value);
+        if (+value === 0) // -0转为0
             return (0).toFixed(fixed);
-        return number;
+        return value;
     },
-    summation(array = []) {
+    summation(...values) {
         let sum = 0;
-        for (let i = array.length - 1; i >= 0; i--) {
-            const e = +array[i];
+        const values0 = values.flat(Infinity);
+        for (let i = values0.length - 1; i >= 0; i--) {
+            const e = +values0[i];
             if (this.isNumber(e))
                 sum += e;
         }
         return sum;
     },
-    isBetween(a, min, max) {
-        return a >= Math.min(min, max) && a <= Math.max(max, min);
+    isBetween(value, min, max) {
+        return value >= Math.min(min, max) && value <= Math.max(max, min);
     },
-    isInside(a, min, max) {
-        return a > Math.min(min, max) && a < Math.max(max, min);
+    isInside(value, min, max) {
+        return value > Math.min(min, max) && value < Math.max(max, min);
+    },
+    extractNumbers(value) {
+        const v = String(value);
+        let result = '';
+        let hasDot = false;
+        for (let i = 0; i < v.length; i++) {
+            const ch = v[i];
+            if (/[0-9]/.test(ch)) {
+                result += ch;
+            }
+            else if (ch === '-' && result === '') { // 负号只能在最前
+                result += ch;
+            }
+            else if (ch === '.' && !hasDot) { // 只能有一个小数点
+                result += ch;
+                hasDot = true;
+            }
+        }
+        return result;
     }
 };

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

@@ -0,0 +1,4 @@
+declare const _default: {
+    uuid(): string;
+};
+export default _default;

package/dist/utils/uuid-utils.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    uuid: function () {
+        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+            var r = (Math.random() * 16) | 0;
+            var v = c === 'x' ? r : (r & 0x3) | 0x8;
+            return v.toString(16);
+        });
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qmwts",
-  "version": "1.1.64",
+  "version": "1.1.66",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/utils/axios-builder.d.ts

@@ -1,2 +0,0 @@
-import axios from 'axios';
-export default axios;

package/dist/utils/axios-builder.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var axios_1 = require("axios");
-axios_1.default.interceptors.request.use(function (request) {
-    console.log('request');
-    return request;
-}, function (error) {
-    console.log('request error');
-    return Promise.reject(error);
-});
-axios_1.default.interceptors.response.use(function (response) {
-    console.log('response');
-    return response;
-}, function (error) {
-    console.log('response error');
-    return Promise.reject(error);
-});
-exports.default = axios_1.default;