tools-min-ns 1.15.0 → 1.17.0

package/README.md

@@ -1,10 +1,37 @@
 # use tools-min-ns
 
 ```
-cnpm i tools-min-ns --save
+pnpm i tools-min-ns --save
 ```
 
 # updates
+## v1.17.0
+>StorageUtil
+加解密
+
+## v1.16.3
+>FunctionUti
+防抖节流兼容小程序
+## v1.16.2
+> PasswordUtil
+新增minEncryptData/minDecryptData
+
+## v1.16.1
+> MapTransferUtil
+4326/3857转换
+
+## v1.16.0
+> PasswordUtil
+新增xor加解密
+
+## v1.15.3
+> DateUtil.formatDateToFriendly3
+
+## v1.15.2
+> NumberUtil.number2percentage 加入参数m
+
+## v1.15.1
+> DateUtil formatDate 修复星期w和季度q
 
 ## v1.14.4
 > ArrayUtil repeatArray 创建一个数组，其中包含原数组的元素，重复一定次数

package/esm/array/TreeUtil.js

@@ -91,17 +91,17 @@ var TreeUtil;
       children = 'children';
     }
     var list = [];
-    var fn = function fn(a, c, d) {
+    var _fn = function fn(a, c, d) {
       for (var index = 0; index < ((a === null || a === void 0 ? void 0 : a.length) || 0); index++) {
         var item = a[index];
         var back = c(item, d);
         if (back) {
           list.push(item);
         }
-        fn(item[children], c, item);
+        _fn(item[children], c, item);
       }
     };
-    fn(tree, callback, defaultParent);
+    _fn(tree, callback, defaultParent);
     return list;
   }
   TreeUtil.filterTreeData = filterTreeData;
@@ -206,19 +206,19 @@ var TreeUtil;
       return t[value] === id;
     });
     var list = getListByTree(tree, children);
-    var getList = function getList(importOid) {
+    var _getList = function getList(importOid) {
       forEachTree(tree, function (info, _parent) {
         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(_parent);
-            getList(info === null || info === void 0 ? void 0 : info[parent]);
+            _getList(info === null || info === void 0 ? void 0 : info[parent]);
           }
         }
       }, children);
     };
-    getList(id);
+    _getList(id);
     if (!BaseUtil.isEmpty(rootPid)) {
       var idx = idList.findIndex(function (item) {
         return String(item) === String(rootPid);
@@ -410,19 +410,19 @@ function treeData2List(element, children) {
     children = 'children';
   }
   var array = [];
-  var getList = function getList(item) {
+  var _getList2 = function getList(item) {
     var _a;
     var newItem = JSON.parse(JSON.stringify(item || '{}')); //序列化
     delete newItem[children];
     if ((_a = item[children]) === null || _a === void 0 ? void 0 : _a.length) {
       if (!isEmpty(newItem)) array.push(newItem);
       item[children].forEach(function (el) {
-        return getList(el);
+        return _getList2(el);
       });
     } else if (!isEmpty(newItem)) {
       array.push(newItem);
     }
   };
-  getList(element);
+  _getList2(element);
   return array;
 }

package/esm/browser/fingerprint.js

@@ -462,11 +462,11 @@ function J(e, r, i) {
             };
             var a = l.style;
             a.setProperty("display", "block", "important"), a.position = "absolute", a.top = "0", a.left = "0", a.visibility = "hidden", r && "srcdoc" in l ? l.srcdoc = r : l.src = "about:blank", n.body.appendChild(l);
-            var c = function c() {
+            var _c = function c() {
               var e, n;
-              o || ("complete" === (null === (n = null === (e = l.contentWindow) || void 0 === e ? void 0 : e.document) || void 0 === n ? void 0 : n.readyState) ? i() : setTimeout(c, 10));
+              o || ("complete" === (null === (n = null === (e = l.contentWindow) || void 0 === e ? void 0 : e.document) || void 0 === n ? void 0 : n.readyState) ? i() : setTimeout(_c, 10));
             };
-            c();
+            _c();
           })];
         case 5:
           t.sent(), t.label = 6;
@@ -539,10 +539,10 @@ function _() {
           return r = new Promise(function (e) {
             var n = document,
               t = "visibilitychange",
-              r = function r() {
-                n.hidden || (n.removeEventListener(t, r), e());
+              _r = function r() {
+                n.hidden || (n.removeEventListener(t, _r), e());
               };
-            n.addEventListener(t, r), r();
+            n.addEventListener(t, _r), _r();
           }).then(function () {
             return o(500);
           }), i = function () {
@@ -610,15 +610,15 @@ function O(e) {
     e.oncomplete = function (e) {
       return n(e.renderedBuffer);
     };
-    var o = function o() {
+    var _o = function o() {
       try {
         var i = e.startRendering();
-        a(i) && l(i), "suspended" === e.state && (document.hidden || r--, r > 0 ? setTimeout(o, 200) : n(null));
+        a(i) && l(i), "suspended" === e.state && (document.hidden || r--, r > 0 ? setTimeout(_o, 200) : n(null));
       } catch (c) {
         t(c);
       }
     };
-    o();
+    _o();
   });
 }
 var U = ["monospace", "sans-serif", "serif"],
@@ -698,11 +698,11 @@ function re() {
   var e = this;
   return function () {
     if (void 0 === te) {
-      var e = function e() {
+      var _e2 = function e() {
         var n = oe();
-        ie(n) ? te = setTimeout(e, 2500) : (ne = n, te = void 0);
+        ie(n) ? te = setTimeout(_e2, 2500) : (ne = n, te = void 0);
       };
-      e();
+      _e2();
     }
   }(), function () {
     return n(e, void 0, void 0, function () {

package/esm/date/DateUtil.d.ts

@@ -66,6 +66,14 @@ declare namespace DateUtil {
      * formatDateToFriendly2() => 2017年11月11日
      */
     function formatDateToFriendly2(date?: Date | number | string): string;
+    /**
+     * 将一个日期格式化成友好格式，比如，当天返回几秒前、几分钟前、几小时前、几天前、几个月前还是几年前
+     * @param {Date | number | string} date 如: new Date('2017-11-11')
+     * @returns {string} 解析后的友好化日期格式
+     * @example
+     * formatDateToFriendly2() => 2017年11月11日
+     */
+    function formatDateToFriendly3(date?: Date | number | string): string;
     /**
      * 判断是否为本周
      * @param date

package/esm/date/DateUtil.js

@@ -117,7 +117,10 @@ var DateUtil;
       dd: ('0' + d.getDate()).slice(-2),
       HH: ('0' + d.getHours()).slice(-2),
       mm: ('0' + d.getMinutes()).slice(-2),
-      ss: ('0' + d.getSeconds()).slice(-2)
+      ss: ('0' + d.getSeconds()).slice(-2),
+      w: ['日', '一', '二', '三', '四', '五', '六'][d.getDay()],
+      q: "".concat(Math.floor((d.getMonth() + 3) / 3)),
+      SSS: "".concat(d.getMilliseconds())
     };
     var formattedDate = format;
     for (var char in formatChars) {
@@ -192,6 +195,44 @@ var DateUtil;
     }
   }
   DateUtil.formatDateToFriendly2 = formatDateToFriendly2;
+  /**
+   * 将一个日期格式化成友好格式，比如，当天返回几秒前、几分钟前、几小时前、几天前、几个月前还是几年前
+   * @param {Date | number | string} date 如: new Date('2017-11-11')
+   * @returns {string} 解析后的友好化日期格式
+   * @example
+   * formatDateToFriendly2() => 2017年11月11日
+   */
+  function formatDateToFriendly3(date) {
+    if (date === void 0) {
+      date = new Date();
+    }
+    if (BaseUtil.isString(date)) {
+      date = DateUtil.parseDate(date, 'yyyy-MM-dd HH:mm:ss');
+    } else {
+      date = BaseUtil.isNumber(date) ? new Date(date) : date;
+    }
+    var currentTime = new Date().getTime(); // 当前时间
+    var timeDiff = currentTime - date.getTime(); // 计算时间差
+    var seconds = Math.floor(timeDiff / 1000);
+    var minutes = Math.floor(seconds / 60);
+    var hours = Math.floor(minutes / 60);
+    var days = Math.floor(hours / 24);
+    var months = Math.floor(days / 30.4375); // 平均每月的天数
+    var years = Math.floor(days / 365.25); // 平均每年的天数
+    if (seconds < 60) {
+      return "".concat(seconds, "\u79D2\u524D");
+    } else if (minutes < 60) {
+      return "".concat(minutes, "\u5206\u949F\u524D");
+    } else if (hours < 24) {
+      return "".concat(hours, "\u5C0F\u65F6\u524D");
+    } else if (days < 30.4375) {
+      return "".concat(days, "\u5929\u524D");
+    } else if (months < 12) {
+      return "".concat(months, "\u4E2A\u6708\u524D");
+    }
+    return "".concat(years, "\u5E74\u524D");
+  }
+  DateUtil.formatDateToFriendly3 = formatDateToFriendly3;
   /**
    * 判断是否为本周
    * @param date

package/esm/func/FunctionUtil.d.ts

@@ -1,23 +1,23 @@
 declare namespace FunctionUtil {
     /**
-   * 函数柯里化
-   * @param { Function } fn 方法
-   * @param { Any } agrs 参数，可选
-   * @example
-   * // 实现一个判断数据类型的方法
-      const checktype = function(type, content) {
-          return Object.prototype.toString.call(content) === `[object ${type}]`;
-      }
-      checktype('Number',2); => true
-      // 这种方法总是要把type参数传过去，如果写错了就会影响到正确的结果了，可以考虑下如何做到把“Number“做到复用
-      
-      const checktype = function(type, content) {
-          return Object.prototype.toString.call(content) === `[object ${type}]`;
-      }
-      const curry = curryFn(checktype)
-      const isNumber = curry('Number')
-      isNumber(2) => true
-      */
+ * 函数柯里化
+ * @param { Function } fn 方法
+ * @param { Any } agrs 参数，可选
+ * @example
+ * // 实现一个判断数据类型的方法
+    const checktype = function(type, content) {
+        return Object.prototype.toString.call(content) === `[object ${type}]`;
+    }
+    checktype('Number',2); => true
+    // 这种方法总是要把type参数传过去，如果写错了就会影响到正确的结果了，可以考虑下如何做到把“Number“做到复用
+    
+    const checktype = function(type, content) {
+        return Object.prototype.toString.call(content) === `[object ${type}]`;
+    }
+    const curry = curryFn(checktype)
+    const isNumber = curry('Number')
+    isNumber(2) => true
+    */
     function curryFn(fn: any, ...arg: any): () => any;
     /**
      * 函数防抖
@@ -34,7 +34,7 @@ declare namespace FunctionUtil {
      * query()
      * query() => 3
      */
-    function debounceFn<T extends Function>(fn: T, t?: number, immediate?: boolean): T;
+    function debounceFn<T extends (...args: any[]) => any>(fn: T, t?: number, immediate?: boolean): T;
     /**
      * 函数节流
      * @param fn 需要节流的函数
@@ -45,7 +45,7 @@ declare namespace FunctionUtil {
      * query()
      * query()
      */
-    function throttleFn<T extends Function>(fn: T, t?: number): T;
+    function throttleFn<T extends (...args: any[]) => any>(fn: T, t?: number): T;
     /**
      * 函数只能调用一次
      * @param { Function } fn  需要被处理的函数

package/esm/func/FunctionUtil.js

@@ -35,7 +35,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
  * @author nanshen
  * @creat 2021-09-15 14:22:55
  */
-import BaseUtil from "../base/BaseUtil";
+import BaseUtil from '../base/BaseUtil';
 var FunctionUtil;
 (function (FunctionUtil) {
   /**
@@ -44,25 +44,25 @@ var FunctionUtil;
   * @param { Any } agrs 参数，可选
   * @example
   * // 实现一个判断数据类型的方法
-    const checktype = function(type, content) {
-        return Object.prototype.toString.call(content) === `[object ${type}]`;
-    }
-    checktype('Number',2); => true
-    // 这种方法总是要把type参数传过去，如果写错了就会影响到正确的结果了，可以考虑下如何做到把“Number“做到复用
-    
-    const checktype = function(type, content) {
-        return Object.prototype.toString.call(content) === `[object ${type}]`;
-    }
-    const curry = curryFn(checktype)
-    const isNumber = curry('Number')
-    isNumber(2) => true
-    */
+  const checktype = function(type, content) {
+      return Object.prototype.toString.call(content) === `[object ${type}]`;
+  }
+  checktype('Number',2); => true
+  // 这种方法总是要把type参数传过去，如果写错了就会影响到正确的结果了，可以考虑下如何做到把“Number“做到复用
+  
+  const checktype = function(type, content) {
+      return Object.prototype.toString.call(content) === `[object ${type}]`;
+  }
+  const curry = curryFn(checktype)
+  const isNumber = curry('Number')
+  isNumber(2) => true
+  */
   function curryFn(fn) {
     var arg = [];
     for (var _i = 1; _i < arguments.length; _i++) {
       arg[_i - 1] = arguments[_i];
     }
-    if (!BaseUtil.isFunction(fn)) throw new Error("第一个参数必须是方法");
+    if (!BaseUtil.isFunction(fn)) throw new Error('第一个参数必须是方法');
     var _this = this;
     var args = Array.from(arguments).slice(1);
     // fn.length 属性指明函数的形参个数。
@@ -99,33 +99,23 @@ var FunctionUtil;
     if (immediate === void 0) {
       immediate = true;
     }
-    if (!BaseUtil.isFunction(fn)) throw new Error("第一个参数必须是方法");
-    var time;
-    //  立刻执行第一次该方法
-    if (immediate) {
-      return function () {
-        clearTimeout(time);
-        if (!time) {
-          fn.apply(this, arguments);
-        }
-        time = setTimeout(function () {
-          setTimeout(time);
-          time = null;
-        }, t);
-      };
-    } else {
-      // 满足 time 时间结束之后自动执行一次该方法
-      return function () {
-        clearTimeout(time);
-        var that = this;
-        var arg = arguments;
-        time = setTimeout(function () {
-          setTimeout(time);
-          fn.apply(that, arg);
-          time = null;
-        }, t);
-      };
-    }
+    if (!BaseUtil.isFunction(fn)) throw new Error('第一个参数必须是方法');
+    var time = null;
+    var debounceFunction = function debounceFunction() {
+      var args = [];
+      for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+      }
+      clearTimeout(time);
+      if (immediate && !time) {
+        fn.apply(void 0, __spreadArray([], __read(args), false));
+      }
+      time = setTimeout(function () {
+        time = null;
+        fn.apply(void 0, __spreadArray([], __read(args), false));
+      }, t);
+    };
+    return debounceFunction;
   }
   FunctionUtil.debounceFn = debounceFn;
   /**
@@ -142,25 +132,26 @@ var FunctionUtil;
     if (t === void 0) {
       t = 2000;
     }
-    if (!BaseUtil.isFunction(fn)) throw new Error("第一个参数必须是方法");
-    var _fn = fn;
+    if (!BaseUtil.isFunction(fn)) throw new Error('第一个参数必须是方法');
     var time = null;
     var first = true;
-    return function () {
-      var arg = arguments;
-      var _this = this;
+    var throttleFunction = function throttleFunction() {
+      var args = [];
+      for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+      }
       if (first) {
-        _fn.apply(_this, arg);
+        fn.apply(void 0, __spreadArray([], __read(args), false));
         first = false;
         return;
       }
       if (time) return;
       time = setTimeout(function () {
-        setTimeout(time);
         time = null;
-        _fn.apply(_this, arg);
+        fn.apply(void 0, __spreadArray([], __read(args), false));
       }, t);
     };
+    return throttleFunction;
   }
   FunctionUtil.throttleFn = throttleFn;
   /**
@@ -174,7 +165,7 @@ var FunctionUtil;
    *  // 1
    */
   function once(fn) {
-    if (!BaseUtil.isFunction(fn)) throw new Error("参数必须是方法");
+    if (!BaseUtil.isFunction(fn)) throw new Error('参数必须是方法');
     var result;
     return function () {
       if (fn) {

package/esm/number/NumberUtil.d.ts

@@ -89,8 +89,9 @@ declare namespace NumberUtil {
      * n在count中的占比%
      * @param n
      * @param count
+     * @param m 小数位数 默认为2
      * @returns
      */
-    const number2percentage: (n: number, count: number) => string;
+    const number2percentage: (n: number, count: number, m?: number) => string;
 }
 export default NumberUtil;

package/esm/number/NumberUtil.js

@@ -241,10 +241,14 @@ var NumberUtil;
    * n在count中的占比%
    * @param n
    * @param count
+   * @param m 小数位数 默认为2
    * @returns
    */
-  NumberUtil.number2percentage = function (n, count) {
-    return "".concat(count ? correctNumberInput((n || 0) * 100 / count, 2) : 0, "%");
+  NumberUtil.number2percentage = function (n, count, m) {
+    if (m === void 0) {
+      m = 2;
+    }
+    return "".concat(count ? correctNumberInput((n || 0) * 100 / count, m) : 0, "%");
   };
 })(NumberUtil || (NumberUtil = {}));
 export default NumberUtil;

package/esm/pwd/PasswordUtil.d.ts

@@ -29,5 +29,33 @@ declare namespace PasswordUtil {
      * str2MD5('1111') => ea69274f6555a750bec9985a07f80455
      */
     const str2MD5: (str: string, pwd?: string) => any;
+    /**
+     * 加密函数
+     * @param {Object} data - 要加密的 JSON 对象
+     * @param {string} key - 密钥
+     * @returns {string} 加密并编码后的字符串
+     */
+    function xorEncryptData(data: any, pwd?: string): string;
+    /**
+     * 解密函数
+     * @param {string} encodedData - 加密并编码后的字符串
+     * @param {string} pwd - 密钥
+     * @returns {Object} 解密后的 JSON 对象
+     */
+    function xorDecryptData(encodedData: string, pwd?: string): any;
+    /**
+     * 加密函数
+     * @param {Object} data - 要加密的 JSON 对象
+     * @param {string} key - 密钥
+     * @returns {string} 加密并编码后的字符串
+     */
+    function minEncryptData(data: any, pwd?: string): string;
+    /**
+     * 解密函数
+     * @param {string} encodedData - 加密并编码后的字符串
+     * @param {string} pwd - 密钥
+     * @returns {Object} 解密后的 JSON 对象
+     */
+    function minDecryptData(encodedData: string, pwd?: string): any;
 }
 export default PasswordUtil;

package/esm/pwd/PasswordUtil.js

@@ -1,6 +1,6 @@
 import config from '../config';
-import crypto from './crypto';
-var CryptoJS = crypto();
+import CryptoJS from './crypto';
+import LZString from './lz-string';
 /**
  * 加密工具
  * @description
@@ -64,5 +64,92 @@ var PasswordUtil;
     if (!str) return '';
     return CryptoJS.MD5(pwd + str).toString();
   };
+  /**
+   * 加密函数
+   * @param {Object} data - 要加密的 JSON 对象
+   * @param {string} key - 密钥
+   * @returns {string} 加密并编码后的字符串
+   */
+  function xorEncryptData(data, pwd) {
+    if (pwd === void 0) {
+      pwd = defaultMD5Key;
+    }
+    var jsonString = JSON.stringify(data); // 将对象转为字符串
+    var compressed = LZString.compressToUTF16(jsonString); // 压缩数据
+    var encrypted = xorEncryptDecrypt(compressed, pwd); // XOR 加密
+    var encoded = LZString.compressToEncodedURIComponent(encrypted); // URL 安全编码
+    return encoded;
+  }
+  PasswordUtil.xorEncryptData = xorEncryptData;
+  /**
+   * 解密函数
+   * @param {string} encodedData - 加密并编码后的字符串
+   * @param {string} pwd - 密钥
+   * @returns {Object} 解密后的 JSON 对象
+   */
+  function xorDecryptData(encodedData, pwd) {
+    if (pwd === void 0) {
+      pwd = defaultMD5Key;
+    }
+    try {
+      var decryptedEncoded = LZString.decompressFromEncodedURIComponent(encodedData); // 解码
+      if (!decryptedEncoded) {
+        throw new Error('Failed to decompress encoded data.');
+      }
+      var decrypted = xorEncryptDecrypt(decryptedEncoded, pwd); // XOR 解密
+      var decompressed = LZString.decompressFromUTF16(decrypted); // 解压
+      if (!decompressed) {
+        throw new Error('Failed to decompress decrypted data.');
+      }
+      return JSON.parse(decompressed); // 解析 JSON
+    } catch (error) {
+      return '';
+    }
+  }
+  PasswordUtil.xorDecryptData = xorDecryptData;
+  /**
+   * 加密函数
+   * @param {Object} data - 要加密的 JSON 对象
+   * @param {string} key - 密钥
+   * @returns {string} 加密并编码后的字符串
+   */
+  function minEncryptData(data, pwd) {
+    if (pwd === void 0) {
+      pwd = defaultMD5Key;
+    }
+    return encodeURIComponent(xorEncryptDecrypt(JSON.stringify(data), pwd));
+  }
+  PasswordUtil.minEncryptData = minEncryptData;
+  /**
+   * 解密函数
+   * @param {string} encodedData - 加密并编码后的字符串
+   * @param {string} pwd - 密钥
+   * @returns {Object} 解密后的 JSON 对象
+   */
+  function minDecryptData(encodedData, pwd) {
+    if (pwd === void 0) {
+      pwd = defaultMD5Key;
+    }
+    try {
+      return JSON.parse(xorEncryptDecrypt(decodeURIComponent(encodedData), pwd)); // 解析 JSON
+    } catch (error) {
+      return undefined;
+    }
+  }
+  PasswordUtil.minDecryptData = minDecryptData;
 })(PasswordUtil || (PasswordUtil = {}));
-export default PasswordUtil;
+export default PasswordUtil;
+/**
+ * XOR 加密与解密函数
+ * @param {string} data - 要加密或解密的字符串
+ * @param {string} pwd - 密钥
+ * @returns {string} 加密或解密后的字符串
+ */
+function xorEncryptDecrypt(data, pwd) {
+  var keyLength = pwd.length;
+  var result = '';
+  for (var i = 0; i < data.length; i++) {
+    result += String.fromCharCode(data.charCodeAt(i) ^ pwd.charCodeAt(i % keyLength));
+  }
+  return result;
+}

package/esm/pwd/crypto.d.ts

@@ -1,6 +1,6 @@
-export default cryptoFn;
-declare function cryptoFn(): {
-    lib: {};
-    enc: {};
-    algo: {};
-};
+export default CryptoJS;
+declare namespace CryptoJS {
+    const lib: {};
+    const enc: {};
+    const algo: {};
+}

package/esm/pwd/crypto.js

@@ -1,4 +1,4 @@
-function cryptoFn() {
+var CryptoJS = function () {
   var n,
     o,
     s,
@@ -1820,5 +1820,5 @@ function cryptoFn() {
     blockSize: 4,
     ivSize: 2
   }), M.RabbitLegacy = F._createHelper(P), U;
-}
-export default cryptoFn;
+}();
+export default CryptoJS;

package/esm/pwd/lz-string.d.ts

@@ -0,0 +1,15 @@
+export default LZString;
+declare namespace LZString {
+    function compressToBase64(input: any): string;
+    function decompressFromBase64(input: any): string | null;
+    function compressToUTF16(input: any): string;
+    function decompressFromUTF16(compressed: any): string | null;
+    function compressToUint8Array(uncompressed: any): Uint8Array;
+    function decompressFromUint8Array(compressed: any): string | null;
+    function compressToEncodedURIComponent(input: any): string;
+    function decompressFromEncodedURIComponent(input: any): string | null;
+    function compress(uncompressed: any): string;
+    function _compress(uncompressed: any, bitsPerChar: any, getCharFromInt: any): string;
+    function decompress(compressed: any): string | null;
+    function _decompress(length: any, resetValue: any, getNextValue: any): string | null;
+}