tools-min-ns 1.9.3 → 1.9.5

package/README.md

@@ -5,6 +5,15 @@ cnpm i tools-min-ns --save
 ```
 
 # updates
+## v1.9.5
+
+> 优化代码
+
+
+## v1.9.4
+
+> UrlUtil 优化setUrlParamsNotRefresh在web，h5中的路由为hash的兼容性
+
 ## v1.9.3
 
 > DateUtil 优化并新增isDateInYearAndMonth方法

package/esm/array/ArrayUtil.d.ts

@@ -22,7 +22,7 @@ declare namespace ArrayUtil {
      * @example
      * unique([1,3,1]) =>[1,3]
      */
-    const unique: (arr: (number | string)[]) => (number | string)[];
+    function unique<T extends string | number>(arr: T[]): T[];
     /**
      * 求两个集合的并集
      * @param { (number | string)[]} a 集合a
@@ -30,7 +30,7 @@ declare namespace ArrayUtil {
      * @example
      * union([1,3,4],[1,2]) => [1,2,3,4]
      */
-    const union: (a: (number | string)[], b: (number | string)[]) => (number | string)[];
+    function union<T extends string | number>(a: T[], b: T[]): T[];
     /**
      * 求两个集合的交集
      * @param { (number | string)[]} a 集合a
@@ -38,7 +38,7 @@ declare namespace ArrayUtil {
      * @example
      * intersect([1,3,4],[1,2]) => [1]
      */
-    const intersect: (a: (number | string)[], b: (number | string)[]) => (number | string)[];
+    function intersect<T extends string | number>(a: T[], b: T[]): T[];
     /**
      * 求两个集合的差集
      * @param { (number | string)[]} a 集合a
@@ -46,7 +46,7 @@ declare namespace ArrayUtil {
      * @example
      * difference([1,2,3],[1]) => [2,3]
      */
-    const difference: (a: (number | string)[], b: (number | string)[]) => (number | string)[];
+    function difference<T extends string | number>(a: T[], b: T[]): T[];
     /**
      * 最大值
      * @param {number[]} arr 数组
@@ -86,7 +86,7 @@ declare namespace ArrayUtil {
      * @example
      * remove([1,2,3],3) => [1,2]
      */
-    const remove: (arr: (number | string)[], ele: number | string) => (number | string)[];
+    function remove<T extends string | number>(arr: T[], ele: T): T[];
     /**
      * 数组排序
      * @param  {number[]} arr 数组

package/esm/array/ArrayUtil.js

@@ -81,11 +81,12 @@ var ArrayUtil;
    * @example
    * unique([1,3,1]) =>[1,3]
    */
-  ArrayUtil.unique = function (arr) {
+  function unique(arr) {
     if (!(arr === null || arr === void 0 ? void 0 : arr.length)) return [];
     var list = __spreadArray([], __read(new Set(arr)), false);
     return list;
-  };
+  }
+  ArrayUtil.unique = unique;
   /**
    * 求两个集合的并集
    * @param { (number | string)[]} a 集合a
@@ -93,14 +94,15 @@ var ArrayUtil;
    * @example
    * union([1,3,4],[1,2]) => [1,2,3,4]
    */
-  ArrayUtil.union = function (a, b) {
+  function union(a, b) {
     if (!(a === null || a === void 0 ? void 0 : a.length)) return [];
     if (!(b === null || b === void 0 ? void 0 : b.length)) return [];
     var aArr = new Set(a);
     var bArr = new Set(b);
     var list = __spreadArray([], __read(new Set(__spreadArray(__spreadArray([], __read(aArr), false), __read(bArr), false))), false);
     return list;
-  };
+  }
+  ArrayUtil.union = union;
   /**
    * 求两个集合的交集
    * @param { (number | string)[]} a 集合a
@@ -108,7 +110,7 @@ var ArrayUtil;
    * @example
    * intersect([1,3,4],[1,2]) => [1]
    */
-  ArrayUtil.intersect = function (a, b) {
+  function intersect(a, b) {
     if (!(a === null || a === void 0 ? void 0 : a.length)) return [];
     if (!(b === null || b === void 0 ? void 0 : b.length)) return [];
     var aArr = new Set(a);
@@ -117,7 +119,8 @@ var ArrayUtil;
       return bArr.has(x);
     }))), false);
     return list;
-  };
+  }
+  ArrayUtil.intersect = intersect;
   /**
    * 求两个集合的差集
    * @param { (number | string)[]} a 集合a
@@ -125,14 +128,15 @@ var ArrayUtil;
    * @example
    * difference([1,2,3],[1]) => [2,3]
    */
-  ArrayUtil.difference = function (a, b) {
+  function difference(a, b) {
     var aArr = new Set(a);
     var bArr = new Set(b);
     var list = __spreadArray([], __read(new Set(__spreadArray([], __read(aArr), false).filter(function (x) {
       return !bArr.has(x);
     }))), false);
     return list;
-  };
+  }
+  ArrayUtil.difference = difference;
   /**
    * 最大值
    * @param {number[]} arr 数组
@@ -185,14 +189,15 @@ var ArrayUtil;
    * @example
    * remove([1,2,3],3) => [1,2]
    */
-  ArrayUtil.remove = function (arr, ele) {
+  function remove(arr, ele) {
     if (!(arr === null || arr === void 0 ? void 0 : arr.length)) return [];
     var index = arr.indexOf(ele);
     if (index > -1) {
       arr.splice(index, 1);
     }
     return arr;
-  };
+  }
+  ArrayUtil.remove = remove;
   /**
    * 数组排序
    * @param  {number[]} arr 数组

package/esm/base/BaseUtil.d.ts

@@ -86,6 +86,14 @@ declare namespace BaseUtil {
      * isEmpty(12) => false
      * isEmpty(null) => true
      */
-    const isEmpty: (obj: any) => obj is "" | null | undefined;
+    const isEmpty: (obj: any) => boolean;
+    /**
+     * 判断是否不为空，包括空对象，空数组，空字符串，null，undefined等
+     * @param obj 任意对象
+     * @example
+     * isNotEmpty(12) => true
+     * isNotEmpty(null) => false
+     */
+    const isNotEmpty: (obj: any) => boolean;
 }
 export default BaseUtil;

package/esm/base/BaseUtil.js

@@ -21,67 +21,67 @@ var BaseUtil;
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isUndefined = _createTypeOf("Undefined");
+  BaseUtil.isUndefined = _createTypeOf('Undefined');
   /**
    * 判断是否为 null
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isNull = _createTypeOf("Null");
+  BaseUtil.isNull = _createTypeOf('Null');
   /**
    * 判断是否为 Array 类型
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isArray = Array.isArray || _createTypeOf("Array");
+  BaseUtil.isArray = Array.isArray || _createTypeOf('Array');
   /**
    * 判断是否为 Function 类型
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isFunction = _createTypeOf("Function");
+  BaseUtil.isFunction = _createTypeOf('Function');
   /**
    * 判断是否为 Boolean 类型
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isBoolean = _createTypeOf("Boolean");
+  BaseUtil.isBoolean = _createTypeOf('Boolean');
   /**
    * 判断是否为 String 类型
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isString = _createTypeOf("String");
+  BaseUtil.isString = _createTypeOf('String');
   /**
    * 判断是否为 Number 类型
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isNumber = _createTypeOf("Number");
+  BaseUtil.isNumber = _createTypeOf('Number');
   /**
    * 判断是否为 RegExp 类型
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isRegExp = _createTypeOf("RegExp");
+  BaseUtil.isRegExp = _createTypeOf('RegExp');
   /**
    * 判断是否为 Object 类型
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isObject = _createTypeOf("Object");
+  BaseUtil.isObject = _createTypeOf('Object');
   /**
    * 判断是否为 Date 类型
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isDate = _createTypeOf("Date");
+  BaseUtil.isDate = _createTypeOf('Date');
   /**
    * 判断是否为 Error 类型
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isError = _createTypeOf("Error");
+  BaseUtil.isError = _createTypeOf('Error');
   /**
    * 获取对象的类型
    * @param obj 任意对象
@@ -91,37 +91,37 @@ var BaseUtil;
    */
   BaseUtil.getType = function (obj) {
     if (BaseUtil.isUndefined(obj)) {
-      return "undefined";
+      return 'undefined';
     }
     if (BaseUtil.isNull(obj)) {
-      return "null";
+      return 'null';
     }
     if (BaseUtil.isArray(obj)) {
-      return "array";
+      return 'array';
     }
     if (BaseUtil.isFunction(obj)) {
-      return "function";
+      return 'function';
     }
     if (BaseUtil.isBoolean(obj)) {
-      return "boolean";
+      return 'boolean';
     }
     if (BaseUtil.isString(obj)) {
-      return "string";
+      return 'string';
     }
     if (BaseUtil.isNumber(obj)) {
-      return "number";
+      return 'number';
     }
     if (BaseUtil.isRegExp(obj)) {
-      return "regexp";
+      return 'regexp';
     }
     if (BaseUtil.isObject(obj)) {
-      return "object";
+      return 'object';
     }
     if (BaseUtil.isDate(obj)) {
-      return "date";
+      return 'date';
     }
     if (BaseUtil.isError(obj)) {
-      return "error";
+      return 'error';
     }
     return typeof obj;
   };
@@ -144,5 +144,15 @@ var BaseUtil;
     }
     return true;
   };
+  /**
+   * 判断是否不为空，包括空对象，空数组，空字符串，null，undefined等
+   * @param obj 任意对象
+   * @example
+   * isNotEmpty(12) => true
+   * isNotEmpty(null) => false
+   */
+  BaseUtil.isNotEmpty = function (obj) {
+    return !BaseUtil.isEmpty(obj);
+  };
 })(BaseUtil || (BaseUtil = {}));
 export default BaseUtil;

package/esm/browser/fingerprint.d.ts

@@ -65,7 +65,7 @@ declare namespace Me {
     function invertedColors(): boolean | undefined;
     function forcedColors(): boolean | undefined;
     function monochrome(): number | undefined;
-    function contrast(): 0 | 10 | 1 | -1 | undefined;
+    function contrast(): 0 | 1 | 10 | -1 | undefined;
     function reducedMotion(): boolean | undefined;
     function reducedTransparency(): boolean | undefined;
     function hdr(): boolean | undefined;

package/esm/check/CheckUtil.js

@@ -166,7 +166,7 @@ var CheckUtil;
     if (!BaseUtil.isString(phone) || phone.length !== 11) {
       return false;
     }
-    return /^1[2-9]\d{9}$/.test(phone);
+    return CheckUtil.getRegExp('MOBILE').test(phone);
   };
   /**
    * 检查身份证是否合法
@@ -246,10 +246,10 @@ var CheckUtil;
    */
   CheckUtil.maskIDCard = function (idcard, start, len) {
     if (start === void 0) {
-      start = 6;
+      start = 1;
     }
     if (len === void 0) {
-      len = 8;
+      len = 16;
     }
     if (!CheckUtil.idcardIsValid(idcard)) {
       return idcard;

package/esm/number/NumberUtil.d.ts

@@ -53,10 +53,10 @@ declare namespace NumberUtil {
     /**
      * 保留n位小数
      * @param val 任意类型
-     * @param n 小数位数
+     * @param n 小数位数 默认为2
      * @returns 不是string｜number 返回0
      */
-    function correctNumberInput(val: any, n?: number, type?: "number" | "string"): string | number;
+    function correctNumberInput(val: any, n?: number): number;
     /**
      * 解决两个数相加精度丢失问题
      * @param a 任意类型

package/esm/number/NumberUtil.js

@@ -4,7 +4,7 @@
  * @author nanshen
  * @creat 2021-09-15 14:23:13
  */
-import BaseUtil from "../base/BaseUtil";
+import BaseUtil from '../base/BaseUtil';
 var NumberUtil;
 (function (NumberUtil) {
   /**
@@ -120,7 +120,7 @@ var NumberUtil;
     var rand = Math.random();
     if (floating || lower % 1 || upper % 1) {
       // 浮点数
-      var t = lower + rand * (upper - lower + parseFloat("1e-" + ((rand + "").length - 1)));
+      var t = lower + rand * (upper - lower + parseFloat('1e-' + ((rand + '').length - 1)));
       return toNumber(Math.min(t, upper).toFixed(floating));
     } else {
       // 整数
@@ -130,22 +130,19 @@ var NumberUtil;
   /**
    * 保留n位小数
    * @param val 任意类型
-   * @param n 小数位数
+   * @param n 小数位数 默认为2
    * @returns 不是string｜number 返回0
    */
-  function correctNumberInput(val, n, type) {
+  function correctNumberInput(val, n) {
     if (n === void 0) {
       n = 2;
     }
-    if (type === void 0) {
-      type = "number";
-    }
-    if (undefined == val || null == val || "" == val || isNaN(val)) {
+    if (undefined == val || null == val || '' == val || isNaN(val)) {
       return 0;
     }
-    var lastChar = val[val.length - 1] === "." ? "." : "";
-    var str = (isNaN(parseFloat(val)) ? "" : parseInt("".concat(Math.round(parseFloat(val) * Math.pow(10, n)))) / Math.pow(10, n)) + lastChar;
-    return type === "number" ? Number(str) : str;
+    var lastChar = val[val.length - 1] === '.' ? '.' : '';
+    var str = (isNaN(parseFloat(val)) ? '' : parseInt("".concat(Math.round(parseFloat(val) * Math.pow(10, n)))) / Math.pow(10, n)) + lastChar;
+    return Number(str);
   }
   NumberUtil.correctNumberInput = correctNumberInput;
   /**
@@ -156,19 +153,19 @@ var NumberUtil;
    */
   function floatAdd(a, b) {
     var c, d, e;
-    if (undefined == a || null == a || "" == a || isNaN(a)) {
+    if (undefined == a || null == a || '' == a || isNaN(a)) {
       a = 0;
     }
-    if (undefined == b || null == b || "" == b || isNaN(b)) {
+    if (undefined == b || null == b || '' == b || isNaN(b)) {
       b = 0;
     }
     try {
-      c = a.toString().split(".")[1].length;
+      c = a.toString().split('.')[1].length;
     } catch (f) {
       c = 0;
     }
     try {
-      d = b.toString().split(".")[1].length;
+      d = b.toString().split('.')[1].length;
     } catch (f) {
       d = 0;
     }
@@ -184,19 +181,19 @@ var NumberUtil;
    */
   function floatSub(a, b) {
     var c, d, e;
-    if (undefined == a || null == a || "" == a || isNaN(a)) {
+    if (undefined == a || null == a || '' == a || isNaN(a)) {
       a = 0;
     }
-    if (undefined == b || null == b || "" == b || isNaN(b)) {
+    if (undefined == b || null == b || '' == b || isNaN(b)) {
       b = 0;
     }
     try {
-      c = a.toString().split(".")[1].length;
+      c = a.toString().split('.')[1].length;
     } catch (f) {
       c = 0;
     }
     try {
-      d = b.toString().split(".")[1].length;
+      d = b.toString().split('.')[1].length;
     } catch (f) {
       d = 0;
     }
@@ -215,12 +212,12 @@ var NumberUtil;
       d = a.toString(),
       e = b.toString();
     try {
-      c += d.split(".")[1].length;
+      c += d.split('.')[1].length;
     } catch (f) {}
     try {
-      c += e.split(".")[1].length;
+      c += e.split('.')[1].length;
     } catch (f) {}
-    return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
+    return Number(d.replace('.', '')) * Number(e.replace('.', '')) / Math.pow(10, c);
   }
   NumberUtil.floatMul = floatMul;
   /**
@@ -235,12 +232,12 @@ var NumberUtil;
       e = 0,
       f = 0;
     try {
-      e = a.toString().split(".")[1].length;
+      e = a.toString().split('.')[1].length;
     } catch (g) {}
     try {
-      f = b.toString().split(".")[1].length;
+      f = b.toString().split('.')[1].length;
     } catch (g) {}
-    return c = Number(a.toString().replace(".", "")), d = Number(b.toString().replace(".", "")), floatMul(c / d, Math.pow(10, f - e));
+    return c = Number(a.toString().replace('.', '')), d = Number(b.toString().replace('.', '')), floatMul(c / d, Math.pow(10, f - e));
   }
   NumberUtil.floatDiv = floatDiv;
   /**
@@ -250,7 +247,7 @@ var NumberUtil;
    * @returns
    */
   NumberUtil.number2percentage = function (n, count) {
-    return "".concat(count ? correctNumberInput((n || 0) * 100 / count, 2, "string") : 0, "%");
+    return "".concat(count ? correctNumberInput((n || 0) * 100 / count, 2) : 0, "%");
   };
 })(NumberUtil || (NumberUtil = {}));
 export default NumberUtil;

package/esm/string/StringUtil.d.ts

@@ -343,16 +343,16 @@ declare namespace StringUtil {
      * 将下划线分隔形式的字符串转换为驼峰式的字符串
      * @param {string}  input  输入字符串
      * @example
-     *  camelize('last_index_of'); => 'lastIndexOf'
-     *  camelize('escape_metacharacter_of_str'); => 'escapeMetacharacterOfStr'
+     *  uncamelize('last_index_of'); => 'lastIndexOf'
+     *  uncamelize('escape_metacharacter_of_str'); => 'escapeMetacharacterOfStr'
      */
     const uncamelize: (input: string) => string;
     /**
      * 将驼峰式的字符串转换为下划线分隔形式的字符串
      * @param {string}  input  输入字符串
      * @example
-     *  hyphenate('lastIndexOf'); => 'last_index_of'
-     *  hyphenate('escapeMetacharacterOfStr'); => 'escape_metacharacter_of_str'
+     *  unhyphenate('lastIndexOf'); => 'last_index_of'
+     *  unhyphenate('escapeMetacharacterOfStr'); => 'escape_metacharacter_of_str'
      */
     const unhyphenate: (input: string) => string;
     /**

package/esm/string/StringUtil.js

@@ -463,8 +463,8 @@ var StringUtil;
    * 将下划线分隔形式的字符串转换为驼峰式的字符串
    * @param {string}  input  输入字符串
    * @example
-   *  camelize('last_index_of'); => 'lastIndexOf'
-   *  camelize('escape_metacharacter_of_str'); => 'escapeMetacharacterOfStr'
+   *  uncamelize('last_index_of'); => 'lastIndexOf'
+   *  uncamelize('escape_metacharacter_of_str'); => 'escapeMetacharacterOfStr'
    */
   StringUtil.uncamelize = function (input) {
     return (input + '').replace(/_\D/g, function (match) {
@@ -475,8 +475,8 @@ var StringUtil;
    * 将驼峰式的字符串转换为下划线分隔形式的字符串
    * @param {string}  input  输入字符串
    * @example
-   *  hyphenate('lastIndexOf'); => 'last_index_of'
-   *  hyphenate('escapeMetacharacterOfStr'); => 'escape_metacharacter_of_str'
+   *  unhyphenate('lastIndexOf'); => 'last_index_of'
+   *  unhyphenate('escapeMetacharacterOfStr'); => 'escape_metacharacter_of_str'
    */
   StringUtil.unhyphenate = function (input) {
     return (input + '').replace(/[A-Z]/g, function (match) {

package/esm/url/UrlUtil.js

@@ -76,19 +76,22 @@ var UrlUtil;
    * getUrlRequest('https://ss.cn?sdf=213&bdl=231111'); => {sdf: "213", bdl: "231111"}
    */
   function getUrlRequest(href) {
-    var _a;
     if (href === void 0) {
       href = window.location.href;
     }
-    href = href.replaceAll('#/', '');
+    href = "".concat(href === null || href === void 0 ? void 0 : href.slice(-1)) === '/' ? href === null || href === void 0 ? void 0 : href.slice(0, href.length - 1) : href;
     var theRequest = {};
-    if (href.includes('?')) {
-      var strs = (_a = "".concat(href === null || href === void 0 ? void 0 : href.slice(-1)) === '/' ? href === null || href === void 0 ? void 0 : href.slice(0, href.length - 1) : href) === null || _a === void 0 ? void 0 : _a.split('?').slice(-1).toString().split('&');
+    if (href.includes('#/')) {
+      //hash
+      href = "".concat(href.split('/').slice(-1));
+    }
+    if (href === null || href === void 0 ? void 0 : href.includes('?')) {
+      var strs = href === null || href === void 0 ? void 0 : href.split('?').slice(-1).toString().split('&');
       for (var i = 0; i < strs.length; i++) {
-        var _b = __read(strs[i].split('='), 2),
-          key = _b[0],
-          value = _b[1];
-        if (key) theRequest[key] = decodeURI(value);
+        var _a = __read(strs[i].split('='), 2),
+          key = _a[0],
+          value = _a[1];
+        if (key) theRequest[key] = decodeURIComponent(value);
       }
     }
     return theRequest;
@@ -101,6 +104,14 @@ var UrlUtil;
   function setUrlParamsNotRefresh(obj) {
     var urlParams = getUrlRequest();
     var str = objToUrlParam(ObjectUtil.mergeParams(obj, urlParams));
+    var href = window.location.href;
+    if (href.includes('#/') && !"".concat(href.split('/').slice(-1)).includes('?')) {
+      var url_1 = "".concat(href).concat(str ? "?".concat(str) : '');
+      window.history.replaceState({
+        url: url_1
+      }, '', url_1);
+      return;
+    }
     var _arr = window.location.href.split('?');
     var url = "".concat(_arr.slice(0, _arr.length - 1).join('?')).concat(str ? "?".concat(str) : '');
     window.history.replaceState({

package/lib/array/ArrayUtil.d.ts

@@ -22,7 +22,7 @@ declare namespace ArrayUtil {
      * @example
      * unique([1,3,1]) =>[1,3]
      */
-    const unique: (arr: (number | string)[]) => (number | string)[];
+    function unique<T extends string | number>(arr: T[]): T[];
     /**
      * 求两个集合的并集
      * @param { (number | string)[]} a 集合a
@@ -30,7 +30,7 @@ declare namespace ArrayUtil {
      * @example
      * union([1,3,4],[1,2]) => [1,2,3,4]
      */
-    const union: (a: (number | string)[], b: (number | string)[]) => (number | string)[];
+    function union<T extends string | number>(a: T[], b: T[]): T[];
     /**
      * 求两个集合的交集
      * @param { (number | string)[]} a 集合a
@@ -38,7 +38,7 @@ declare namespace ArrayUtil {
      * @example
      * intersect([1,3,4],[1,2]) => [1]
      */
-    const intersect: (a: (number | string)[], b: (number | string)[]) => (number | string)[];
+    function intersect<T extends string | number>(a: T[], b: T[]): T[];
     /**
      * 求两个集合的差集
      * @param { (number | string)[]} a 集合a
@@ -46,7 +46,7 @@ declare namespace ArrayUtil {
      * @example
      * difference([1,2,3],[1]) => [2,3]
      */
-    const difference: (a: (number | string)[], b: (number | string)[]) => (number | string)[];
+    function difference<T extends string | number>(a: T[], b: T[]): T[];
     /**
      * 最大值
      * @param {number[]} arr 数组
@@ -86,7 +86,7 @@ declare namespace ArrayUtil {
      * @example
      * remove([1,2,3],3) => [1,2]
      */
-    const remove: (arr: (number | string)[], ele: number | string) => (number | string)[];
+    function remove<T extends string | number>(arr: T[], ele: T): T[];
     /**
      * 数组排序
      * @param  {number[]} arr 数组

package/lib/array/ArrayUtil.js

@@ -91,11 +91,12 @@ var ArrayUtil;
    * @example
    * unique([1,3,1]) =>[1,3]
    */
-  ArrayUtil.unique = function (arr) {
+  function unique(arr) {
     if (!(arr === null || arr === void 0 ? void 0 : arr.length)) return [];
     var list = __spreadArray([], __read(new Set(arr)), false);
     return list;
-  };
+  }
+  ArrayUtil.unique = unique;
   /**
    * 求两个集合的并集
    * @param { (number | string)[]} a 集合a
@@ -103,14 +104,15 @@ var ArrayUtil;
    * @example
    * union([1,3,4],[1,2]) => [1,2,3,4]
    */
-  ArrayUtil.union = function (a, b) {
+  function union(a, b) {
     if (!(a === null || a === void 0 ? void 0 : a.length)) return [];
     if (!(b === null || b === void 0 ? void 0 : b.length)) return [];
     var aArr = new Set(a);
     var bArr = new Set(b);
     var list = __spreadArray([], __read(new Set(__spreadArray(__spreadArray([], __read(aArr), false), __read(bArr), false))), false);
     return list;
-  };
+  }
+  ArrayUtil.union = union;
   /**
    * 求两个集合的交集
    * @param { (number | string)[]} a 集合a
@@ -118,7 +120,7 @@ var ArrayUtil;
    * @example
    * intersect([1,3,4],[1,2]) => [1]
    */
-  ArrayUtil.intersect = function (a, b) {
+  function intersect(a, b) {
     if (!(a === null || a === void 0 ? void 0 : a.length)) return [];
     if (!(b === null || b === void 0 ? void 0 : b.length)) return [];
     var aArr = new Set(a);
@@ -127,7 +129,8 @@ var ArrayUtil;
       return bArr.has(x);
     }))), false);
     return list;
-  };
+  }
+  ArrayUtil.intersect = intersect;
   /**
    * 求两个集合的差集
    * @param { (number | string)[]} a 集合a
@@ -135,14 +138,15 @@ var ArrayUtil;
    * @example
    * difference([1,2,3],[1]) => [2,3]
    */
-  ArrayUtil.difference = function (a, b) {
+  function difference(a, b) {
     var aArr = new Set(a);
     var bArr = new Set(b);
     var list = __spreadArray([], __read(new Set(__spreadArray([], __read(aArr), false).filter(function (x) {
       return !bArr.has(x);
     }))), false);
     return list;
-  };
+  }
+  ArrayUtil.difference = difference;
   /**
    * 最大值
    * @param {number[]} arr 数组
@@ -195,14 +199,15 @@ var ArrayUtil;
    * @example
    * remove([1,2,3],3) => [1,2]
    */
-  ArrayUtil.remove = function (arr, ele) {
+  function remove(arr, ele) {
     if (!(arr === null || arr === void 0 ? void 0 : arr.length)) return [];
     var index = arr.indexOf(ele);
     if (index > -1) {
       arr.splice(index, 1);
     }
     return arr;
-  };
+  }
+  ArrayUtil.remove = remove;
   /**
    * 数组排序
    * @param  {number[]} arr 数组

package/lib/base/BaseUtil.d.ts

@@ -86,6 +86,14 @@ declare namespace BaseUtil {
      * isEmpty(12) => false
      * isEmpty(null) => true
      */
-    const isEmpty: (obj: any) => obj is "" | null | undefined;
+    const isEmpty: (obj: any) => boolean;
+    /**
+     * 判断是否不为空，包括空对象，空数组，空字符串，null，undefined等
+     * @param obj 任意对象
+     * @example
+     * isNotEmpty(12) => true
+     * isNotEmpty(null) => false
+     */
+    const isNotEmpty: (obj: any) => boolean;
 }
 export default BaseUtil;

package/lib/base/BaseUtil.js

@@ -26,67 +26,67 @@ var BaseUtil;
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isUndefined = _createTypeOf("Undefined");
+  BaseUtil.isUndefined = _createTypeOf('Undefined');
   /**
    * 判断是否为 null
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isNull = _createTypeOf("Null");
+  BaseUtil.isNull = _createTypeOf('Null');
   /**
    * 判断是否为 Array 类型
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isArray = Array.isArray || _createTypeOf("Array");
+  BaseUtil.isArray = Array.isArray || _createTypeOf('Array');
   /**
    * 判断是否为 Function 类型
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isFunction = _createTypeOf("Function");
+  BaseUtil.isFunction = _createTypeOf('Function');
   /**
    * 判断是否为 Boolean 类型
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isBoolean = _createTypeOf("Boolean");
+  BaseUtil.isBoolean = _createTypeOf('Boolean');
   /**
    * 判断是否为 String 类型
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isString = _createTypeOf("String");
+  BaseUtil.isString = _createTypeOf('String');
   /**
    * 判断是否为 Number 类型
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isNumber = _createTypeOf("Number");
+  BaseUtil.isNumber = _createTypeOf('Number');
   /**
    * 判断是否为 RegExp 类型
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isRegExp = _createTypeOf("RegExp");
+  BaseUtil.isRegExp = _createTypeOf('RegExp');
   /**
    * 判断是否为 Object 类型
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isObject = _createTypeOf("Object");
+  BaseUtil.isObject = _createTypeOf('Object');
   /**
    * 判断是否为 Date 类型
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isDate = _createTypeOf("Date");
+  BaseUtil.isDate = _createTypeOf('Date');
   /**
    * 判断是否为 Error 类型
    * @param obj 任意对象
    * @returns 是/否
    */
-  BaseUtil.isError = _createTypeOf("Error");
+  BaseUtil.isError = _createTypeOf('Error');
   /**
    * 获取对象的类型
    * @param obj 任意对象
@@ -96,37 +96,37 @@ var BaseUtil;
    */
   BaseUtil.getType = function (obj) {
     if (BaseUtil.isUndefined(obj)) {
-      return "undefined";
+      return 'undefined';
     }
     if (BaseUtil.isNull(obj)) {
-      return "null";
+      return 'null';
     }
     if (BaseUtil.isArray(obj)) {
-      return "array";
+      return 'array';
     }
     if (BaseUtil.isFunction(obj)) {
-      return "function";
+      return 'function';
     }
     if (BaseUtil.isBoolean(obj)) {
-      return "boolean";
+      return 'boolean';
     }
     if (BaseUtil.isString(obj)) {
-      return "string";
+      return 'string';
     }
     if (BaseUtil.isNumber(obj)) {
-      return "number";
+      return 'number';
     }
     if (BaseUtil.isRegExp(obj)) {
-      return "regexp";
+      return 'regexp';
     }
     if (BaseUtil.isObject(obj)) {
-      return "object";
+      return 'object';
     }
     if (BaseUtil.isDate(obj)) {
-      return "date";
+      return 'date';
     }
     if (BaseUtil.isError(obj)) {
-      return "error";
+      return 'error';
     }
     return typeof obj;
   };
@@ -149,5 +149,15 @@ var BaseUtil;
     }
     return true;
   };
+  /**
+   * 判断是否不为空，包括空对象，空数组，空字符串，null，undefined等
+   * @param obj 任意对象
+   * @example
+   * isNotEmpty(12) => true
+   * isNotEmpty(null) => false
+   */
+  BaseUtil.isNotEmpty = function (obj) {
+    return !BaseUtil.isEmpty(obj);
+  };
 })(BaseUtil || (BaseUtil = {}));
 exports.default = BaseUtil;

package/lib/browser/fingerprint.d.ts

@@ -65,7 +65,7 @@ declare namespace Me {
     function invertedColors(): boolean | undefined;
     function forcedColors(): boolean | undefined;
     function monochrome(): number | undefined;
-    function contrast(): 0 | 10 | 1 | -1 | undefined;
+    function contrast(): 0 | 1 | 10 | -1 | undefined;
     function reducedMotion(): boolean | undefined;
     function reducedTransparency(): boolean | undefined;
     function hdr(): boolean | undefined;

package/lib/check/CheckUtil.js

@@ -176,7 +176,7 @@ var CheckUtil;
     if (!BaseUtil_1.default.isString(phone) || phone.length !== 11) {
       return false;
     }
-    return /^1[2-9]\d{9}$/.test(phone);
+    return CheckUtil.getRegExp('MOBILE').test(phone);
   };
   /**
    * 检查身份证是否合法
@@ -256,10 +256,10 @@ var CheckUtil;
    */
   CheckUtil.maskIDCard = function (idcard, start, len) {
     if (start === void 0) {
-      start = 6;
+      start = 1;
     }
     if (len === void 0) {
-      len = 8;
+      len = 16;
     }
     if (!CheckUtil.idcardIsValid(idcard)) {
       return idcard;

package/lib/number/NumberUtil.d.ts

@@ -53,10 +53,10 @@ declare namespace NumberUtil {
     /**
      * 保留n位小数
      * @param val 任意类型
-     * @param n 小数位数
+     * @param n 小数位数 默认为2
      * @returns 不是string｜number 返回0
      */
-    function correctNumberInput(val: any, n?: number, type?: "number" | "string"): string | number;
+    function correctNumberInput(val: any, n?: number): number;
     /**
      * 解决两个数相加精度丢失问题
      * @param a 任意类型

package/lib/number/NumberUtil.js

@@ -130,7 +130,7 @@ var NumberUtil;
     var rand = Math.random();
     if (floating || lower % 1 || upper % 1) {
       // 浮点数
-      var t = lower + rand * (upper - lower + parseFloat("1e-" + ((rand + "").length - 1)));
+      var t = lower + rand * (upper - lower + parseFloat('1e-' + ((rand + '').length - 1)));
       return toNumber(Math.min(t, upper).toFixed(floating));
     } else {
       // 整数
@@ -140,22 +140,19 @@ var NumberUtil;
   /**
    * 保留n位小数
    * @param val 任意类型
-   * @param n 小数位数
+   * @param n 小数位数 默认为2
    * @returns 不是string｜number 返回0
    */
-  function correctNumberInput(val, n, type) {
+  function correctNumberInput(val, n) {
     if (n === void 0) {
       n = 2;
     }
-    if (type === void 0) {
-      type = "number";
-    }
-    if (undefined == val || null == val || "" == val || isNaN(val)) {
+    if (undefined == val || null == val || '' == val || isNaN(val)) {
       return 0;
     }
-    var lastChar = val[val.length - 1] === "." ? "." : "";
-    var str = (isNaN(parseFloat(val)) ? "" : parseInt("".concat(Math.round(parseFloat(val) * Math.pow(10, n)))) / Math.pow(10, n)) + lastChar;
-    return type === "number" ? Number(str) : str;
+    var lastChar = val[val.length - 1] === '.' ? '.' : '';
+    var str = (isNaN(parseFloat(val)) ? '' : parseInt("".concat(Math.round(parseFloat(val) * Math.pow(10, n)))) / Math.pow(10, n)) + lastChar;
+    return Number(str);
   }
   NumberUtil.correctNumberInput = correctNumberInput;
   /**
@@ -166,19 +163,19 @@ var NumberUtil;
    */
   function floatAdd(a, b) {
     var c, d, e;
-    if (undefined == a || null == a || "" == a || isNaN(a)) {
+    if (undefined == a || null == a || '' == a || isNaN(a)) {
       a = 0;
     }
-    if (undefined == b || null == b || "" == b || isNaN(b)) {
+    if (undefined == b || null == b || '' == b || isNaN(b)) {
       b = 0;
     }
     try {
-      c = a.toString().split(".")[1].length;
+      c = a.toString().split('.')[1].length;
     } catch (f) {
       c = 0;
     }
     try {
-      d = b.toString().split(".")[1].length;
+      d = b.toString().split('.')[1].length;
     } catch (f) {
       d = 0;
     }
@@ -194,19 +191,19 @@ var NumberUtil;
    */
   function floatSub(a, b) {
     var c, d, e;
-    if (undefined == a || null == a || "" == a || isNaN(a)) {
+    if (undefined == a || null == a || '' == a || isNaN(a)) {
       a = 0;
     }
-    if (undefined == b || null == b || "" == b || isNaN(b)) {
+    if (undefined == b || null == b || '' == b || isNaN(b)) {
       b = 0;
     }
     try {
-      c = a.toString().split(".")[1].length;
+      c = a.toString().split('.')[1].length;
     } catch (f) {
       c = 0;
     }
     try {
-      d = b.toString().split(".")[1].length;
+      d = b.toString().split('.')[1].length;
     } catch (f) {
       d = 0;
     }
@@ -225,12 +222,12 @@ var NumberUtil;
       d = a.toString(),
       e = b.toString();
     try {
-      c += d.split(".")[1].length;
+      c += d.split('.')[1].length;
     } catch (f) {}
     try {
-      c += e.split(".")[1].length;
+      c += e.split('.')[1].length;
     } catch (f) {}
-    return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
+    return Number(d.replace('.', '')) * Number(e.replace('.', '')) / Math.pow(10, c);
   }
   NumberUtil.floatMul = floatMul;
   /**
@@ -245,12 +242,12 @@ var NumberUtil;
       e = 0,
       f = 0;
     try {
-      e = a.toString().split(".")[1].length;
+      e = a.toString().split('.')[1].length;
     } catch (g) {}
     try {
-      f = b.toString().split(".")[1].length;
+      f = b.toString().split('.')[1].length;
     } catch (g) {}
-    return c = Number(a.toString().replace(".", "")), d = Number(b.toString().replace(".", "")), floatMul(c / d, Math.pow(10, f - e));
+    return c = Number(a.toString().replace('.', '')), d = Number(b.toString().replace('.', '')), floatMul(c / d, Math.pow(10, f - e));
   }
   NumberUtil.floatDiv = floatDiv;
   /**
@@ -260,7 +257,7 @@ var NumberUtil;
    * @returns
    */
   NumberUtil.number2percentage = function (n, count) {
-    return "".concat(count ? correctNumberInput((n || 0) * 100 / count, 2, "string") : 0, "%");
+    return "".concat(count ? correctNumberInput((n || 0) * 100 / count, 2) : 0, "%");
   };
 })(NumberUtil || (NumberUtil = {}));
 exports.default = NumberUtil;

package/lib/string/StringUtil.d.ts

@@ -343,16 +343,16 @@ declare namespace StringUtil {
      * 将下划线分隔形式的字符串转换为驼峰式的字符串
      * @param {string}  input  输入字符串
      * @example
-     *  camelize('last_index_of'); => 'lastIndexOf'
-     *  camelize('escape_metacharacter_of_str'); => 'escapeMetacharacterOfStr'
+     *  uncamelize('last_index_of'); => 'lastIndexOf'
+     *  uncamelize('escape_metacharacter_of_str'); => 'escapeMetacharacterOfStr'
      */
     const uncamelize: (input: string) => string;
     /**
      * 将驼峰式的字符串转换为下划线分隔形式的字符串
      * @param {string}  input  输入字符串
      * @example
-     *  hyphenate('lastIndexOf'); => 'last_index_of'
-     *  hyphenate('escapeMetacharacterOfStr'); => 'escape_metacharacter_of_str'
+     *  unhyphenate('lastIndexOf'); => 'last_index_of'
+     *  unhyphenate('escapeMetacharacterOfStr'); => 'escape_metacharacter_of_str'
      */
     const unhyphenate: (input: string) => string;
     /**

package/lib/string/StringUtil.js

@@ -473,8 +473,8 @@ var StringUtil;
    * 将下划线分隔形式的字符串转换为驼峰式的字符串
    * @param {string}  input  输入字符串
    * @example
-   *  camelize('last_index_of'); => 'lastIndexOf'
-   *  camelize('escape_metacharacter_of_str'); => 'escapeMetacharacterOfStr'
+   *  uncamelize('last_index_of'); => 'lastIndexOf'
+   *  uncamelize('escape_metacharacter_of_str'); => 'escapeMetacharacterOfStr'
    */
   StringUtil.uncamelize = function (input) {
     return (input + '').replace(/_\D/g, function (match) {
@@ -485,8 +485,8 @@ var StringUtil;
    * 将驼峰式的字符串转换为下划线分隔形式的字符串
    * @param {string}  input  输入字符串
    * @example
-   *  hyphenate('lastIndexOf'); => 'last_index_of'
-   *  hyphenate('escapeMetacharacterOfStr'); => 'escape_metacharacter_of_str'
+   *  unhyphenate('lastIndexOf'); => 'last_index_of'
+   *  unhyphenate('escapeMetacharacterOfStr'); => 'escape_metacharacter_of_str'
    */
   StringUtil.unhyphenate = function (input) {
     return (input + '').replace(/[A-Z]/g, function (match) {

package/lib/url/UrlUtil.js

@@ -86,19 +86,22 @@ var UrlUtil;
    * getUrlRequest('https://ss.cn?sdf=213&bdl=231111'); => {sdf: "213", bdl: "231111"}
    */
   function getUrlRequest(href) {
-    var _a;
     if (href === void 0) {
       href = window.location.href;
     }
-    href = href.replaceAll('#/', '');
+    href = "".concat(href === null || href === void 0 ? void 0 : href.slice(-1)) === '/' ? href === null || href === void 0 ? void 0 : href.slice(0, href.length - 1) : href;
     var theRequest = {};
-    if (href.includes('?')) {
-      var strs = (_a = "".concat(href === null || href === void 0 ? void 0 : href.slice(-1)) === '/' ? href === null || href === void 0 ? void 0 : href.slice(0, href.length - 1) : href) === null || _a === void 0 ? void 0 : _a.split('?').slice(-1).toString().split('&');
+    if (href.includes('#/')) {
+      //hash
+      href = "".concat(href.split('/').slice(-1));
+    }
+    if (href === null || href === void 0 ? void 0 : href.includes('?')) {
+      var strs = href === null || href === void 0 ? void 0 : href.split('?').slice(-1).toString().split('&');
       for (var i = 0; i < strs.length; i++) {
-        var _b = __read(strs[i].split('='), 2),
-          key = _b[0],
-          value = _b[1];
-        if (key) theRequest[key] = decodeURI(value);
+        var _a = __read(strs[i].split('='), 2),
+          key = _a[0],
+          value = _a[1];
+        if (key) theRequest[key] = decodeURIComponent(value);
       }
     }
     return theRequest;
@@ -111,6 +114,14 @@ var UrlUtil;
   function setUrlParamsNotRefresh(obj) {
     var urlParams = getUrlRequest();
     var str = objToUrlParam(ObjectUtil_1.default.mergeParams(obj, urlParams));
+    var href = window.location.href;
+    if (href.includes('#/') && !"".concat(href.split('/').slice(-1)).includes('?')) {
+      var url_1 = "".concat(href).concat(str ? "?".concat(str) : '');
+      window.history.replaceState({
+        url: url_1
+      }, '', url_1);
+      return;
+    }
     var _arr = window.location.href.split('?');
     var url = "".concat(_arr.slice(0, _arr.length - 1).join('?')).concat(str ? "?".concat(str) : '');
     window.history.replaceState({

package/package.json

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