tools-min-ns 1.18.12 → 1.18.14

package/README.md

@@ -5,6 +5,11 @@ pnpm i tools-min-ns --save
 ```
 
 # updates
+## v1.18.14
+fix: TransferUtil.getFileSizeByBytes
+
+## v1.18.13
+fix: 修改RequestUtil.getAuthorization 对应后端1.8.9+
 ## v1.18.12
 fix: 修改RequestUtil.getAuthorization array参数处理
 ## v1.18.11

package/esm/request/RequestUtil.js

@@ -157,7 +157,6 @@ import nsPromiseFn from './nsPromiseFn';
 import StringUtil from '../string/StringUtil';
 import PasswordUtil from '../pwd/PasswordUtil';
 import DateUtil from '../date/DateUtil';
-import BaseUtil from '../base/BaseUtil';
 var RequestUtil;
 (function (RequestUtil) {
   /** @name 浙里办请求工具设置默认请求头 */
@@ -382,22 +381,17 @@ var RequestUtil;
     try {
       var uuid = StringUtil.getUuiD(16);
       var ts = new Date().getTime();
-      var paramStr = '{}';
+      var paramStr = JSON.stringify(data);
       if (responseType === 'json') {
-        if (['json', 'form'].includes(requestType)) {
-          if (BaseUtil.isObject(data)) {
-            var _data_1 = {};
-            var sortedKeys = Object.keys(data).sort(function (a, b) {
-              return a.localeCompare(b);
-            }); // 对键进行排序
-            sortedKeys.forEach(function (k) {
-              if (!['null', 'undefined'].includes(String(data[k]))) _data_1[k] = requestType === 'json' ? data[k] : String(data[k]);
-            });
-            paramStr = JSON.stringify(_data_1);
-          } else {
-            paramStr = JSON.stringify(data);
-          }
+        if (requestType === 'form') {
+          var _data_1 = {};
+          var sortedKeys = Object.keys(data); // 对键进行排序
+          sortedKeys.forEach(function (k) {
+            if (!['null', 'undefined'].includes(String(data[k]))) _data_1[k] = String(data[k]);
+          });
+          paramStr = JSON.stringify(_data_1);
         }
+        paramStr = paramStr.split('').sort().join('');
       }
       var str = url + paramStr + ts + uuid;
       if (isLog) console.info("[".concat(DateUtil.formatDate(), "]"), 'url + paramStr + ts + uuid  ', {

package/esm/transfer/TransferUtil.d.ts

@@ -94,6 +94,6 @@ declare namespace TransferUtil {
      * @param bytes - 字节
      * @param n - 保留小数默认2
      */
-    const getFileSizeByBytes: (bytes: number, n?: number) => string;
+    const getFileSizeByBytes: (bytes: number, n?: number, render?: ((num: number, unit: string) => any) | undefined) => any;
 }
 export default TransferUtil;

package/esm/transfer/TransferUtil.js

@@ -310,7 +310,8 @@ var TransferUtil;
    * @param bytes - 字节
    * @param n - 保留小数默认2
    */
-  TransferUtil.getFileSizeByBytes = function (bytes, n) {
+  TransferUtil.getFileSizeByBytes = function (bytes, n, render) {
+    var _a;
     var sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
     if (bytes === 0) {
       return '0B';
@@ -319,7 +320,9 @@ var TransferUtil;
     if (i === 0) {
       return bytes + sizes[i];
     }
-    return NumberUtil.correctNumberInput(bytes / Math.pow(1024, i), n) + sizes[i];
+    var num = NumberUtil.correctNumberInput(bytes / Math.pow(1024, i), n);
+    var unit = sizes[i];
+    return (_a = render === null || render === void 0 ? void 0 : render(num, unit)) !== null && _a !== void 0 ? _a : num + unit;
   };
 })(TransferUtil || (TransferUtil = {}));
 export default TransferUtil;

package/lib/request/RequestUtil.js

@@ -198,7 +198,6 @@ var nsPromiseFn_1 = __importDefault(require("./nsPromiseFn"));
 var StringUtil_1 = __importDefault(require("../string/StringUtil"));
 var PasswordUtil_1 = __importDefault(require("../pwd/PasswordUtil"));
 var DateUtil_1 = __importDefault(require("../date/DateUtil"));
-var BaseUtil_1 = __importDefault(require("../base/BaseUtil"));
 var RequestUtil;
 (function (RequestUtil) {
   /** @name 浙里办请求工具设置默认请求头 */
@@ -423,22 +422,17 @@ var RequestUtil;
     try {
       var uuid = StringUtil_1.default.getUuiD(16);
       var ts = new Date().getTime();
-      var paramStr = '{}';
+      var paramStr = JSON.stringify(data);
       if (responseType === 'json') {
-        if (['json', 'form'].includes(requestType)) {
-          if (BaseUtil_1.default.isObject(data)) {
-            var _data_1 = {};
-            var sortedKeys = Object.keys(data).sort(function (a, b) {
-              return a.localeCompare(b);
-            }); // 对键进行排序
-            sortedKeys.forEach(function (k) {
-              if (!['null', 'undefined'].includes(String(data[k]))) _data_1[k] = requestType === 'json' ? data[k] : String(data[k]);
-            });
-            paramStr = JSON.stringify(_data_1);
-          } else {
-            paramStr = JSON.stringify(data);
-          }
+        if (requestType === 'form') {
+          var _data_1 = {};
+          var sortedKeys = Object.keys(data); // 对键进行排序
+          sortedKeys.forEach(function (k) {
+            if (!['null', 'undefined'].includes(String(data[k]))) _data_1[k] = String(data[k]);
+          });
+          paramStr = JSON.stringify(_data_1);
         }
+        paramStr = paramStr.split('').sort().join('');
       }
       var str = url + paramStr + ts + uuid;
       if (isLog) console.info("[".concat(DateUtil_1.default.formatDate(), "]"), 'url + paramStr + ts + uuid  ', {

package/lib/transfer/TransferUtil.d.ts

@@ -94,6 +94,6 @@ declare namespace TransferUtil {
      * @param bytes - 字节
      * @param n - 保留小数默认2
      */
-    const getFileSizeByBytes: (bytes: number, n?: number) => string;
+    const getFileSizeByBytes: (bytes: number, n?: number, render?: ((num: number, unit: string) => any) | undefined) => any;
 }
 export default TransferUtil;

package/lib/transfer/TransferUtil.js

@@ -320,7 +320,8 @@ var TransferUtil;
    * @param bytes - 字节
    * @param n - 保留小数默认2
    */
-  TransferUtil.getFileSizeByBytes = function (bytes, n) {
+  TransferUtil.getFileSizeByBytes = function (bytes, n, render) {
+    var _a;
     var sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
     if (bytes === 0) {
       return '0B';
@@ -329,7 +330,9 @@ var TransferUtil;
     if (i === 0) {
       return bytes + sizes[i];
     }
-    return NumberUtil_1.default.correctNumberInput(bytes / Math.pow(1024, i), n) + sizes[i];
+    var num = NumberUtil_1.default.correctNumberInput(bytes / Math.pow(1024, i), n);
+    var unit = sizes[i];
+    return (_a = render === null || render === void 0 ? void 0 : render(num, unit)) !== null && _a !== void 0 ? _a : num + unit;
   };
 })(TransferUtil || (TransferUtil = {}));
 exports.default = TransferUtil;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tools-min-ns",
   "description": "工具包适用于前端以及node",
-  "version": "1.18.12",
+  "version": "1.18.14",
   "main": "lib/index.js",
   "license": "MIT",
   "author": "nanshen",