qmwts 1.1.68 → 1.1.69

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

@@ -3,7 +3,7 @@ export default class LocalDate {
     constructor();
     constructor(date: Date);
     static now(): LocalDate;
-    static parse(date: string | number): LocalDate;
+    static parse(date: string | number | Date | null | undefined): LocalDate | null;
     static of(year: number, month: number, date: number): LocalDate;
     getYear(): number;
     getMonth(): number;

package/dist/class/local-date.js

@@ -12,7 +12,12 @@ class LocalDate {
         return new LocalDate();
     }
     static parse(date) {
-        return new LocalDate(new Date(date));
+        if (date == null)
+            return null;
+        const d = date instanceof Date ? date : new Date(date);
+        if (Number.isNaN(d.getTime())) // 无效日期返回null
+            return null;
+        return new LocalDate(d);
     }
     static of(year, month, date) {
         return new LocalDate(new Date(year, month - 1, date));

package/dist/index.d.ts

@@ -9,7 +9,7 @@ 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 ParamBuilder } from './utils/param-builder';
 export { default as FileUtils } from './utils/file-utils';
 export { default as StringUtils } from './utils/string-utils';
 export { default as LocalDate } from './class/local-date';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.YearMonth = exports.LocalDateTime = exports.LocalDate = exports.StringUtils = exports.FileUtils = exports.RequestDataGenerator = exports.PrototypeUtils = exports.ObjectUtils = exports.JsonUtils = exports.NumberUtils = exports.Encryptor = exports.Downloader = exports.AxiosInstance = exports.FinanceUtils = exports.ArrayUtils = void 0;
+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");
@@ -19,8 +19,8 @@ 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 param_builder_1 = require("./utils/param-builder");
+Object.defineProperty(exports, "ParamBuilder", { enumerable: true, get: function () { return param_builder_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");

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

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

package/dist/utils/axios-builder.js

@@ -0,0 +1,18 @@
+"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;

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

@@ -1,2 +1,2 @@
-import axios from 'axios';
-export default axios;
+declare const instance: import("axios").AxiosInstance;
+export default instance;

package/dist/utils/axios-instance.js

@@ -1,21 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = require("axios");
-const index_1 = require("../index");
+const param_builder_1 = require("./param-builder");
 // post 默认application/json
 // post 使用URLSearchParams自动变为application/x-www-form-urlencoded;charset=UTF-8
 // post 使用FormData自动变为multipart/form-data
 // get 默认无
 // get 使用URLSearchParams默认无
 // get 无法使用FormData
-axios_1.default.interceptors.request.use(request => {
-    request.data = index_1.RequestDataGenerator.generate(request.data, new FormData());
-    request.params = index_1.RequestDataGenerator.generate(request.params, new URLSearchParams());
+const instance = axios_1.default.create({});
+instance.interceptors.request.use(request => {
+    request.data = param_builder_1.default.buildData(request.data);
+    request.params = param_builder_1.default.buildParams(request.params);
     return request;
 }, error => {
     return Promise.reject(error);
 });
-axios_1.default.interceptors.response.use(async (response) => {
+instance.interceptors.response.use(async (response) => {
     if (response.config.responseType === 'blob') {
         const { data } = response;
         if (data.type === 'application/x-download') { // 不是json说明下载成功
@@ -37,4 +38,4 @@ axios_1.default.interceptors.response.use(async (response) => {
 }, error => {
     return Promise.reject(error);
 });
-exports.default = axios_1.default;
+exports.default = instance;

package/dist/utils/encryptor.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     encrypt(s, type) {
-        if (type === "base64")
+        if (type === 'base64')
             return btoa(s);
         throw '请指定加密类型';
     },
     decrypt(s, type) {
-        if (type === "base64")
+        if (type === 'base64')
             try {
                 return atob(s);
             }

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

@@ -0,0 +1,6 @@
+declare const _default: {
+    build(data: any | undefined, params: FormData | URLSearchParams): FormData | URLSearchParams;
+    buildParams(data?: any): FormData | URLSearchParams;
+    buildData(data?: any): FormData | URLSearchParams;
+};
+export default _default;

package/dist/utils/param-builder.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    build(data = {}, params) {
+        for (const key in data) {
+            if (Object.prototype.hasOwnProperty.call(data, key)) { // 只遍历自有属性，不要原型链上的属性
+                const value = data[key];
+                if (Array.isArray(value)) { // 数组循环append
+                    const len = value.length;
+                    for (let i = 0; i < len; i++) {
+                        params.append(key, value[i]);
+                    }
+                }
+                else if (value != null) {
+                    params.append(key, value);
+                }
+            }
+        }
+        return params;
+    },
+    buildParams(data = {}) {
+        return this.build(data, new URLSearchParams());
+    },
+    buildData(data = {}) {
+        return this.build(data, new FormData());
+    },
+};

package/dist/utils/request-data-generator.js

@@ -6,9 +6,12 @@ exports.default = {
             if (Array.isArray(value))
                 for (const i of value)
                     params.append(key, i);
-            else if (value != null)
+            else if (isValidValue(value))
                 params.append(key, value);
         }
         return params;
     }
 };
+function isValidValue(value) {
+    return value !== null && value !== void 0;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qmwts",
-  "version": "1.1.68",
+  "version": "1.1.69",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,6 +22,6 @@
     "jszip": "^3.10.1"
   },
   "peerDependencies": {
-    "axios": "^1.11.0"
+    "axios": "^1.12.2"
   }
 }

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

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

package/dist/utils/uuid-utils.js

@@ -1,11 +0,0 @@
-"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);
-        });
-    }
-};