qmwts 1.1.58 → 1.1.60

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export { default as ArrayUtils } from './utils/array-utils';
 export { default as FinanceUtils } from './utils/finance-utils';
 export type { XIRREntity } from './utils/finance-utils';
-import AxiosBuilder from './utils/axios-builder';
+import AxiosInstance from './utils/axios-instance';
 import Downloader from './utils/downloader';
 import Encryptor from './utils/encryptor';
 import NumberUtils from './utils/number-utils';
@@ -13,4 +13,4 @@ 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 { AxiosBuilder, Downloader, Encryptor, NumberUtils, JsonUtils, PrototypeUtils, RequestDataGenerator, FileUtils, StringUtils, LocalDate, LocalDateTime, YearMonth, };
+export { AxiosInstance, Downloader, Encryptor, NumberUtils, JsonUtils, PrototypeUtils, RequestDataGenerator, FileUtils, StringUtils, LocalDate, LocalDateTime, YearMonth, };

package/dist/index.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.YearMonth = exports.LocalDateTime = exports.LocalDate = exports.StringUtils = exports.FileUtils = exports.RequestDataGenerator = exports.PrototypeUtils = exports.JsonUtils = exports.NumberUtils = exports.Encryptor = exports.Downloader = exports.AxiosBuilder = exports.FinanceUtils = exports.ArrayUtils = void 0;
+exports.YearMonth = exports.LocalDateTime = exports.LocalDate = exports.StringUtils = exports.FileUtils = exports.RequestDataGenerator = exports.PrototypeUtils = exports.JsonUtils = exports.NumberUtils = exports.Encryptor = exports.Downloader = exports.AxiosInstance = exports.FinanceUtils = exports.ArrayUtils = void 0;
 // https://www.jianshu.com/p/8fa2c50720e4
 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");
 Object.defineProperty(exports, "FinanceUtils", { enumerable: true, get: function () { return finance_utils_1.default; } });
-var axios_builder_1 = require("./utils/axios-builder");
-exports.AxiosBuilder = axios_builder_1.default;
+var axios_instance_1 = require("./utils/axios-instance");
+exports.AxiosInstance = axios_instance_1.default;
 var downloader_1 = require("./utils/downloader");
 exports.Downloader = downloader_1.default;
 var encryptor_1 = require("./utils/encryptor");

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

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

package/dist/utils/axios-instance.js

@@ -0,0 +1,84 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var axios_1 = require("axios");
+var index_1 = require("../index");
+// 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(function (request) {
+    request.data = index_1.RequestDataGenerator.generate(request.data, new FormData());
+    request.params = index_1.RequestDataGenerator.generate(request.params, new URLSearchParams());
+    return request;
+}, function (error) {
+    return Promise.reject(error);
+});
+axios_1.default.interceptors.response.use(function (response) { return __awaiter(void 0, void 0, void 0, function () {
+    var data, file, a, _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                if (!(response.config.responseType === 'blob')) return [3 /*break*/, 3];
+                data = response.data;
+                if (!(data.type === 'application/x-download')) return [3 /*break*/, 1];
+                file = new File([data], decodeURI(response.headers['content-disposition'].split('filename=')[1]));
+                a = document.createElement('a');
+                a.href = URL.createObjectURL(file);
+                a.download = file.name;
+                a.click();
+                // 释放
+                URL.revokeObjectURL(a.href);
+                a.remove();
+                return [2 /*return*/, Promise.resolve(response)];
+            case 1:
+                if (!(data.type === 'application/json')) return [3 /*break*/, 3];
+                _a = response;
+                return [4 /*yield*/, new Response(data).json()];
+            case 2:
+                _a.data = _b.sent();
+                _b.label = 3;
+            case 3: return [2 /*return*/, response];
+        }
+    });
+}); }, function (error) {
+    return Promise.reject(error);
+});
+exports.default = axios_1.default;

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

@@ -3,5 +3,7 @@ declare const _default: {
     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;
 };
 export default _default;

package/dist/utils/number-utils.js

@@ -40,4 +40,10 @@ exports.default = {
         }
         return sum;
     },
+    isBetween: function (a, min, max) {
+        return a >= Math.min(min, max) && a <= Math.max(max, min);
+    },
+    isInside: function (a, min, max) {
+        return a > Math.min(min, max) && a < Math.max(max, min);
+    }
 };

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

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var prototype_utils_1 = require("./prototype-utils");
 exports.default = {
     generate: function (data, params) {
         if (data === void 0) { data = {}; }
         for (var _i = 0, _a = Object.entries(data); _i < _a.length; _i++) {
             var _b = _a[_i], key = _b[0], value = _b[1];
-            if (prototype_utils_1.default.isArray(value))
-                for (var _c = 0, _d = value; _c < _d.length; _c++) {
-                    var i = _d[_c];
+            if (Array.isArray(value))
+                for (var _c = 0, value_1 = value; _c < value_1.length; _c++) {
+                    var i = value_1[_c];
                     params.append(key, i);
                 }
             else if (isValidValue(value))

package/package.json

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