tools-min-ns 1.6.0 → 1.8.0

package/README.md

@@ -5,6 +5,25 @@ cnpm i tools-min-ns --save
 ```
 
 # updates
+## v1.8.0
+
+> TreeUtil 新增getItemPathByTree
+
+## v1.7.2
+
+> TreeUtil 修复getIdPathByTree
+
+## v1.7.1
+
+> DateUtil 新增getDatesOfMonth
+
+## v1.7.0
+
+> 新增FileUtil
+> ObjectUtil 新增getHash
+> StringUtil 新增getHash
+> BrowserUtil 新增getIdSync
+
 ## v1.6.0
 
 > CheckUtil

package/esm/array/TreeUtil.d.ts

@@ -49,6 +49,13 @@ declare namespace TreeUtil {
      * @param fieldNames 映射对象
      */
     function getIdPathByTree<T>(tree: T[], id: ValueType, fieldNames?: FieldNames): ValueType[];
+    /**
+     * @name 获取树中路径对象数组
+     * @param tree 树
+     * @param id 主键
+     * @param fieldNames 映射对象
+     */
+    function getItemPathByTree<T>(tree: T[], id: ValueType, fieldNames?: FieldNames): T[];
     /**
      * @name 字符串分割转为树结构
      * @param str string

package/esm/array/TreeUtil.js

@@ -178,6 +178,20 @@ var TreeUtil;
    * @param fieldNames 映射对象
    */
   function getIdPathByTree(tree, id, fieldNames) {
+    var _a = (fieldNames !== null && fieldNames !== void 0 ? fieldNames : {}).value,
+      value = _a === void 0 ? 'id' : _a;
+    return getItemPathByTree(tree, id, fieldNames).map(function (item) {
+      return item[value];
+    });
+  }
+  TreeUtil.getIdPathByTree = getIdPathByTree;
+  /**
+   * @name 获取树中路径对象数组
+   * @param tree 树
+   * @param id 主键
+   * @param fieldNames 映射对象
+   */
+  function getItemPathByTree(tree, id, fieldNames) {
     var _a = fieldNames !== null && fieldNames !== void 0 ? fieldNames : {},
       _b = _a.value,
       value = _b === void 0 ? 'id' : _b,
@@ -188,15 +202,17 @@ var TreeUtil;
       _e = _a.rootPid,
       rootPid = _e === void 0 ? undefined : _e;
     if (BaseUtil.isEmpty(id)) return [];
-    var idList = [id];
-    var list = getListByTree(tree);
+    var idList = filterTreeData(tree, function (t) {
+      return t[value] === id;
+    });
+    var list = getListByTree(tree, children);
     var getList = function getList(importOid) {
       forEachTree(tree, function (info) {
         if (String(info[value]) === String(importOid)) {
           if (parent in info && info[parent] && list.some(function (e) {
             return String(e[value]) === String(info[parent]);
           })) {
-            idList.unshift(info === null || info === void 0 ? void 0 : info[parent]);
+            idList.unshift(info);
             getList(info === null || info === void 0 ? void 0 : info[parent]);
           }
         }
@@ -211,7 +227,7 @@ var TreeUtil;
     }
     return idList;
   }
-  TreeUtil.getIdPathByTree = getIdPathByTree;
+  TreeUtil.getItemPathByTree = getItemPathByTree;
   /**
    * @name 字符串分割转为树结构
    * @param str string

package/esm/browser/BrowserUtil.d.ts

@@ -11,6 +11,7 @@ declare namespace BrowserUtil {
      * 获取浏览器id
      */
     const getId: () => Promise<any>;
+    function getIdSync(): string;
     /**
      * 获取浏览器类型
      * @returns Opera | IE | Edge | Firefox | Safari | Chrome | OverIE10 | ""

package/esm/browser/BrowserUtil.js

@@ -142,6 +142,27 @@ var BrowserUtil;
       });
     });
   };
+  function getIdSync() {
+    var fingerprint;
+    var canvas = document.createElement('canvas');
+    var ctx = canvas.getContext('2d');
+    var txt = window.location.host;
+    ctx.textBaseline = 'top';
+    ctx.font = "14px 'Arial'";
+    ctx.textBaseline = 'tencent';
+    ctx.fillStyle = '#f60';
+    ctx.fillRect(125, 1, 62, 20);
+    ctx.fillStyle = '#069';
+    ctx.fillText(txt, 2, 15);
+    ctx.fillStyle = 'rgba(102, 204, 0, 0.7)';
+    ctx.fillText(txt, 4, 17);
+    var b64 = canvas.toDataURL().replace('data:image/png;base64,', '');
+    var bin = atob(b64);
+    var crc = bin2hex(bin.slice(-16, -12));
+    fingerprint = crc;
+    return fingerprint;
+  }
+  BrowserUtil.getIdSync = getIdSync;
   /**
    * 获取浏览器类型
    * @returns Opera | IE | Edge | Firefox | Safari | Chrome | OverIE10 | ""
@@ -334,4 +355,16 @@ var BrowserUtil;
   }
   BrowserUtil.removeMark = removeMark;
 })(BrowserUtil || (BrowserUtil = {}));
-export default BrowserUtil;
+export default BrowserUtil;
+function bin2hex(s) {
+  var i,
+    l,
+    n,
+    o = '';
+  s += '';
+  for (i = 0, l = s.length; i < l; i++) {
+    n = s.charCodeAt(i).toString(16);
+    o += n.length < 2 ? '0' + n : n;
+  }
+  return o;
+}

package/esm/date/DateUtil.d.ts

@@ -257,5 +257,12 @@ declare namespace DateUtil {
      * @returns
      */
     const timeFix: (t?: string) => string | undefined;
+    /**
+     * 格式为“年-月”，然后输出该月所有日期的数组
+     * @param yearMonth 2024-01
+     * @param format 'yyyy-MM-dd'
+     * @returns ['2024-01-01',...]
+     */
+    function getDatesOfMonth(yearMonth: string, format?: string): string[];
 }
 export default DateUtil;

package/esm/date/DateUtil.js

@@ -731,6 +731,32 @@ var DateUtil;
     var _a;
     return (_a = t === null || t === void 0 ? void 0 : t.split('.')) === null || _a === void 0 ? void 0 : _a[0];
   };
+  /**
+   * 格式为“年-月”，然后输出该月所有日期的数组
+   * @param yearMonth 2024-01
+   * @param format 'yyyy-MM-dd'
+   * @returns ['2024-01-01',...]
+   */
+  function getDatesOfMonth(yearMonth, format) {
+    if (format === void 0) {
+      format = 'yyyy-MM-dd';
+    }
+    var _a = __read(yearMonth.split('-').map(Number), 2),
+      year = _a[0],
+      month = _a[1]; // 分割字符串并转换为数字
+    var dates = []; // 初始化存储日期的数组
+    // 获取该月的第一天
+    var date = new Date(year, month - 1, 1);
+    // 循环直到月份改变
+    while (date.getMonth() === month - 1) {
+      // 将日期格式化为字符串并添加到数组中
+      dates.push(DateUtil.formatDate(date, format));
+      // 日期加一天
+      date.setDate(date.getDate() + 2);
+    }
+    return dates;
+  }
+  DateUtil.getDatesOfMonth = getDatesOfMonth;
 })(DateUtil || (DateUtil = {}));
 export default DateUtil;
 var dateFormatRules = [{

package/esm/file/FileUtil.d.ts

@@ -0,0 +1,10 @@
+declare namespace FileUtil {
+    /**
+     * 多个文件压缩成zip
+     * @param fileList
+     * @param onProgress
+     * @returns
+     */
+    function getZipByFiles(fileList: File[], onProgress?: (file: string, percent: number) => void): Promise<File>;
+}
+export default FileUtil;

package/esm/file/FileUtil.js

@@ -0,0 +1,182 @@
+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 sent() {
+        if (t[0] & 1) throw t[1];
+        return t[1];
+      },
+      trys: [],
+      ops: []
+    },
+    f,
+    y,
+    t,
+    g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "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
+    };
+  }
+};
+var __values = this && this.__values || function (o) {
+  var s = typeof Symbol === "function" && Symbol.iterator,
+    m = s && o[s],
+    i = 0;
+  if (m) return m.call(o);
+  if (o && typeof o.length === "number") return {
+    next: function next() {
+      if (o && i >= o.length) o = void 0;
+      return {
+        value: o && o[i++],
+        done: !o
+      };
+    }
+  };
+  throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+import JSZip from 'jszip';
+var FileUtil;
+(function (FileUtil) {
+  /**
+   * 多个文件压缩成zip
+   * @param fileList
+   * @param onProgress
+   * @returns
+   */
+  function getZipByFiles(fileList, onProgress) {
+    return __awaiter(this, void 0, void 0, function () {
+      var zip, fileList_1, fileList_1_1, file_1, blob, file;
+      var e_1, _a;
+      return __generator(this, function (_b) {
+        switch (_b.label) {
+          case 0:
+            zip = new JSZip();
+            try {
+              for (fileList_1 = __values(fileList), fileList_1_1 = fileList_1.next(); !fileList_1_1.done; fileList_1_1 = fileList_1.next()) {
+                file_1 = fileList_1_1.value;
+                zip.file(file_1.name, file_1);
+              }
+            } catch (e_1_1) {
+              e_1 = {
+                error: e_1_1
+              };
+            } finally {
+              try {
+                if (fileList_1_1 && !fileList_1_1.done && (_a = fileList_1.return)) _a.call(fileList_1);
+              } finally {
+                if (e_1) throw e_1.error;
+              }
+            }
+            return [4 /*yield*/, zip.generateAsync({
+              type: 'blob'
+            }, function (item) {
+              onProgress === null || onProgress === void 0 ? void 0 : onProgress(item.currentFile, item.percent);
+            })];
+          case 1:
+            blob = _b.sent();
+            file = new File([blob], "\u201C".concat(fileList[0].name, "\u201D\u7B49").concat(fileList.length, "\u4E2A\u6587\u4EF6.zip"), {
+              type: blob.type
+            });
+            return [2 /*return*/, file];
+        }
+      });
+    });
+  }
+  FileUtil.getZipByFiles = getZipByFiles;
+})(FileUtil || (FileUtil = {}));
+export default FileUtil;

package/esm/object/ObjectUtil.d.ts

@@ -37,5 +37,10 @@ declare namespace ObjectUtil {
      * @returns
      */
     function mergeParams<A, B>(paramsA: A, paramsB: B): A & Required<B>;
+    /**
+     * 获取对象的唯一hash
+     * @param obj
+     */
+    function getHash(obj: any): number;
 }
 export default ObjectUtil;

package/esm/object/ObjectUtil.js

@@ -26,9 +26,8 @@ var __read = this && this.__read || function (o, n) {
  * @author nanshen
  * @creat 2021-09-15 14:23:23
  */
-import BaseUtil from "../base/BaseUtil";
-var isObject = BaseUtil.isObject,
-  isArray = BaseUtil.isArray;
+import StringUtil from '../string/StringUtil';
+import BaseUtil from '../base/BaseUtil';
 var ObjectUtil;
 (function (ObjectUtil) {
   /**
@@ -40,12 +39,12 @@ var ObjectUtil;
    */
   function deepClone(source) {
     var target;
-    if (isObject(source)) {
+    if (BaseUtil.isObject(source)) {
       target = {};
       for (var key in source) {
         target[key] = deepClone(source[key]);
       }
-    } else if (isArray(source)) {
+    } else if (BaseUtil.isArray(source)) {
       target = [];
       for (var i = 0, len = source.length; i < len; i++) {
         target.push(deepClone(source[i]));
@@ -66,7 +65,7 @@ var ObjectUtil;
     // 判断 object 是否是数组或者对象，否则直接返回默认值 defaultValue
     if (!BaseUtil.isObject(object)) return defaultValue;
     // 沿着路径寻找到对应的值，未找到则返回默认值 defaultValue
-    return path.split(".").reduce(function (o, k) {
+    return path.split('.').reduce(function (o, k) {
       return (o || {})[k];
     }, object) || defaultValue;
   }
@@ -81,7 +80,7 @@ var ObjectUtil;
   function setObjValue(object, path, value, isChangeOriginObj) {
     if (!BaseUtil.isObject(object)) return object;
     var newObj = isChangeOriginObj ? object : deepClone(object);
-    path.split(".").reduce(function (o, k, i, _) {
+    path.split('.').reduce(function (o, k, i, _) {
       if (i === _.length - 1) {
         // 若遍历结束直接赋值
         o[k] = value;
@@ -154,5 +153,14 @@ var ObjectUtil;
     return newData;
   }
   ObjectUtil.mergeParams = mergeParams;
+  /**
+   * 获取对象的唯一hash
+   * @param obj
+   */
+  function getHash(obj) {
+    var str = JSON.stringify(obj);
+    return StringUtil.getHash(str);
+  }
+  ObjectUtil.getHash = getHash;
 })(ObjectUtil || (ObjectUtil = {}));
 export default ObjectUtil;

package/esm/request/RequestUtil.d.ts

@@ -48,5 +48,19 @@ declare namespace RequestUtil {
       }).then(response => {}).catch(error => {});
    */
     const jsonpRquest: typeof jsonpRquestFn;
+    /**
+     * 异步请求并发处理
+     * @param requests 请求列表
+     * @param options limit同时处理几个请求默认6个，onUploadProgress进度条
+     * @returns
+     */
+    function handleRequests<T = any>(requests: (() => Promise<any>)[], options?: {
+        limit?: number;
+        onUploadProgress?: (opt: {
+            total: number;
+            loaded: number;
+            progress: number;
+        }) => void;
+    }): Promise<T[]>;
 }
 export default RequestUtil;

package/esm/request/RequestUtil.js

@@ -1,3 +1,118 @@
+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 sent() {
+        if (t[0] & 1) throw t[1];
+        return t[1];
+      },
+      trys: [],
+      ops: []
+    },
+    f,
+    y,
+    t,
+    g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "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
+    };
+  }
+};
 /**
  * 请求工具
  * @description
@@ -49,5 +164,74 @@ var RequestUtil;
     }).then(response => {}).catch(error => {});
   */
   RequestUtil.jsonpRquest = jsonpRquestFn;
+  /**
+   * 异步请求并发处理
+   * @param requests 请求列表
+   * @param options limit同时处理几个请求默认6个，onUploadProgress进度条
+   * @returns
+   */
+  function handleRequests(requests, options) {
+    return __awaiter(this, void 0, void 0, function () {
+      // 存储所有请求的结果
+      // 定义一个递归函数，用于处理请求并控制并发数量
+      function processRequest() {
+        return __awaiter(this, void 0, void 0, function () {
+          var res, result;
+          return __generator(this, function (_a) {
+            switch (_a.label) {
+              case 0:
+                if (!(requests.length > 0)) return [3 /*break*/, 3];
+                res = requests.shift();
+                if (!res) return [2 /*return*/];
+                return [4 /*yield*/, res()];
+              case 1:
+                result = _a.sent();
+                // 执行请求并等待其完成
+                results.push(result);
+                // 将结果存储
+                // 递归调用，确保有新的请求补充进去
+                return [4 /*yield*/, processRequest()];
+              case 2:
+                // 将结果存储
+                // 递归调用，确保有新的请求补充进去
+                _a.sent();
+                loaded += 1;
+                onUploadProgress === null || onUploadProgress === void 0 ? void 0 : onUploadProgress({
+                  total: resLength,
+                  loaded: loaded,
+                  progress: loaded / resLength
+                });
+                _a.label = 3;
+              case 3:
+                return [2 /*return*/];
+            }
+          });
+        });
+      }
+      var _a, _b, limit, onUploadProgress, resLength, results, loaded, concurrent;
+      return __generator(this, function (_c) {
+        switch (_c.label) {
+          case 0:
+            _a = options !== null && options !== void 0 ? options : {}, _b = _a.limit, limit = _b === void 0 ? 6 : _b, onUploadProgress = _a.onUploadProgress;
+            resLength = requests.length;
+            results = [];
+            loaded = 0;
+            concurrent = Array.from({
+              length: Math.min(limit, resLength)
+            }, function () {
+              return processRequest();
+            });
+            // 等待所有并发的请求完成
+            return [4 /*yield*/, Promise.all(concurrent)];
+          case 1:
+            // 等待所有并发的请求完成
+            _c.sent();
+            return [2 /*return*/, results];
+          // 返回所有请求的结果
+        }
+      });
+    });
+  }
+  RequestUtil.handleRequests = handleRequests;
 })(RequestUtil || (RequestUtil = {}));
 export default RequestUtil;

package/esm/string/StringUtil.d.ts

@@ -388,5 +388,11 @@ declare namespace StringUtil {
      * @param index 默认随机
      */
     const getColor: (index?: number) => string;
+    /**
+     * fnv1a算法获取字符串hash
+     * @param str
+     * @returns
+     */
+    function getHash(str: string): number;
 }
 export default StringUtil;