tools-min-ns 1.9.12 → 1.10.1

package/README.md

@@ -5,6 +5,12 @@ cnpm i tools-min-ns --save
 ```
 
 # updates
+## v1.10.1
+> TransferUtil
+getFileSizeByBytes修复参数n
+## v1.10.0
+> ExtractUtil
+提取工具，文本中提取手机号、身份证
 ## v1.9.12
 > RequestUtil
 mgopRequest 请求失败后端回调不显示

package/esm/extract/ExtractUtil.d.ts

@@ -0,0 +1,5 @@
+declare namespace ExtractUtil {
+    const mobile: (text: string) => string[] | undefined;
+    const idCard: (text: string) => string[] | undefined;
+}
+export default ExtractUtil;

package/esm/extract/ExtractUtil.js

@@ -0,0 +1,23 @@
+import CheckUtil from '../check/CheckUtil';
+var ExtractUtil;
+(function (ExtractUtil) {
+  ExtractUtil.mobile = function (text) {
+    // 定义一个匹配手机号的正则表达式
+    var regex = /\b\d{11}\b/g;
+    // 使用正则表达式查找所有匹配的手机号
+    var matches = text.match(regex);
+    return matches === null || matches === void 0 ? void 0 : matches.filter(function (e) {
+      return CheckUtil.phoneIsValid(e);
+    });
+  };
+  ExtractUtil.idCard = function (text) {
+    // 定义一个匹配手机号的正则表达式
+    var regex = /\b\d{18}\b/g;
+    // 使用正则表达式查找所有匹配的手机号
+    var matches = text.match(regex);
+    return matches === null || matches === void 0 ? void 0 : matches.filter(function (e) {
+      return CheckUtil.idcardIsValid(e);
+    });
+  };
+})(ExtractUtil || (ExtractUtil = {}));
+export default ExtractUtil;

package/esm/index.d.ts

@@ -17,3 +17,4 @@ export { default as SystemUtil } from './system/SystemUtil';
 export { default as MapTransferUtil } from './transfer/MapTransferUtil';
 export { default as TransferUtil } from './transfer/TransferUtil';
 export { default as UrlUtil } from './url/UrlUtil';
+export { default as ExtractUtil } from './extract/ExtractUtil';

package/esm/index.js

@@ -16,4 +16,5 @@ export { default as StringUtil } from './string/StringUtil';
 export { default as SystemUtil } from './system/SystemUtil';
 export { default as MapTransferUtil } from './transfer/MapTransferUtil';
 export { default as TransferUtil } from './transfer/TransferUtil';
-export { default as UrlUtil } from './url/UrlUtil';
+export { default as UrlUtil } from './url/UrlUtil';
+export { default as ExtractUtil } from './extract/ExtractUtil';

package/esm/transfer/TransferUtil.d.ts

@@ -92,7 +92,8 @@ declare namespace TransferUtil {
     /**
      * 字节转单位
      * @param bytes - 字节
+     * @param n - 保留小数默认2
      */
-    const getFileSizeByBytes: (bytes: number) => string;
+    const getFileSizeByBytes: (bytes: number, n: number) => string;
 }
 export default TransferUtil;

package/esm/transfer/TransferUtil.js

@@ -4,6 +4,7 @@
  * @author nanshen
  * @creat 2021-09-15 14:40:07
  */
+import NumberUtil from 'src/number/NumberUtil';
 import BaseUtil from '../base/BaseUtil';
 var TransferUtil;
 (function (TransferUtil) {
@@ -307,8 +308,9 @@ var TransferUtil;
   /**
    * 字节转单位
    * @param bytes - 字节
+   * @param n - 保留小数默认2
    */
-  TransferUtil.getFileSizeByBytes = function (bytes) {
+  TransferUtil.getFileSizeByBytes = function (bytes, n) {
     var sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
     if (bytes === 0) {
       return '0B';
@@ -317,7 +319,7 @@ var TransferUtil;
     if (i === 0) {
       return bytes + sizes[i];
     }
-    return (bytes / Math.pow(1024, i)).toFixed(2) + sizes[i];
+    return NumberUtil.correctNumberInput(bytes / Math.pow(1024, i), n) + sizes[i];
   };
 })(TransferUtil || (TransferUtil = {}));
 export default TransferUtil;

package/lib/extract/ExtractUtil.d.ts

@@ -0,0 +1,5 @@
+declare namespace ExtractUtil {
+    const mobile: (text: string) => string[] | undefined;
+    const idCard: (text: string) => string[] | undefined;
+}
+export default ExtractUtil;

package/lib/extract/ExtractUtil.js

@@ -0,0 +1,33 @@
+"use strict";
+
+var __importDefault = this && this.__importDefault || function (mod) {
+  return mod && mod.__esModule ? mod : {
+    "default": mod
+  };
+};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var CheckUtil_1 = __importDefault(require("../check/CheckUtil"));
+var ExtractUtil;
+(function (ExtractUtil) {
+  ExtractUtil.mobile = function (text) {
+    // 定义一个匹配手机号的正则表达式
+    var regex = /\b\d{11}\b/g;
+    // 使用正则表达式查找所有匹配的手机号
+    var matches = text.match(regex);
+    return matches === null || matches === void 0 ? void 0 : matches.filter(function (e) {
+      return CheckUtil_1.default.phoneIsValid(e);
+    });
+  };
+  ExtractUtil.idCard = function (text) {
+    // 定义一个匹配手机号的正则表达式
+    var regex = /\b\d{18}\b/g;
+    // 使用正则表达式查找所有匹配的手机号
+    var matches = text.match(regex);
+    return matches === null || matches === void 0 ? void 0 : matches.filter(function (e) {
+      return CheckUtil_1.default.idcardIsValid(e);
+    });
+  };
+})(ExtractUtil || (ExtractUtil = {}));
+exports.default = ExtractUtil;

package/lib/index.d.ts

@@ -17,3 +17,4 @@ export { default as SystemUtil } from './system/SystemUtil';
 export { default as MapTransferUtil } from './transfer/MapTransferUtil';
 export { default as TransferUtil } from './transfer/TransferUtil';
 export { default as UrlUtil } from './url/UrlUtil';
+export { default as ExtractUtil } from './extract/ExtractUtil';

package/lib/index.js

@@ -8,7 +8,7 @@ var __importDefault = this && this.__importDefault || function (mod) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.UrlUtil = exports.TransferUtil = exports.MapTransferUtil = exports.SystemUtil = exports.StringUtil = exports.StorageUtil = exports.RequestUtil = exports.PasswordUtil = exports.ObjectUtil = exports.NumberUtil = exports.FunctionUtil = exports.EnvUtil = exports.DateUtil = exports.CookieUtil = exports.CheckUtil = exports.BrowserUtil = exports.BaseUtil = exports.TreeUtil = exports.ArrayUtil = void 0;
+exports.ExtractUtil = exports.UrlUtil = exports.TransferUtil = exports.MapTransferUtil = exports.SystemUtil = exports.StringUtil = exports.StorageUtil = exports.RequestUtil = exports.PasswordUtil = exports.ObjectUtil = exports.NumberUtil = exports.FunctionUtil = exports.EnvUtil = exports.DateUtil = exports.CookieUtil = exports.CheckUtil = exports.BrowserUtil = exports.BaseUtil = exports.TreeUtil = exports.ArrayUtil = void 0;
 var ArrayUtil_1 = require("./array/ArrayUtil");
 Object.defineProperty(exports, "ArrayUtil", {
   enumerable: true,
@@ -141,4 +141,11 @@ Object.defineProperty(exports, "UrlUtil", {
   get: function get() {
     return __importDefault(UrlUtil_1).default;
   }
+});
+var ExtractUtil_1 = require("./extract/ExtractUtil");
+Object.defineProperty(exports, "ExtractUtil", {
+  enumerable: true,
+  get: function get() {
+    return __importDefault(ExtractUtil_1).default;
+  }
 });

package/lib/transfer/TransferUtil.d.ts

@@ -92,7 +92,8 @@ declare namespace TransferUtil {
     /**
      * 字节转单位
      * @param bytes - 字节
+     * @param n - 保留小数默认2
      */
-    const getFileSizeByBytes: (bytes: number) => string;
+    const getFileSizeByBytes: (bytes: number, n: number) => string;
 }
 export default TransferUtil;

package/lib/transfer/TransferUtil.js

@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", {
  * @author nanshen
  * @creat 2021-09-15 14:40:07
  */
+var NumberUtil_1 = __importDefault(require("src/number/NumberUtil"));
 var BaseUtil_1 = __importDefault(require("../base/BaseUtil"));
 var TransferUtil;
 (function (TransferUtil) {
@@ -317,8 +318,9 @@ var TransferUtil;
   /**
    * 字节转单位
    * @param bytes - 字节
+   * @param n - 保留小数默认2
    */
-  TransferUtil.getFileSizeByBytes = function (bytes) {
+  TransferUtil.getFileSizeByBytes = function (bytes, n) {
     var sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
     if (bytes === 0) {
       return '0B';
@@ -327,7 +329,7 @@ var TransferUtil;
     if (i === 0) {
       return bytes + sizes[i];
     }
-    return (bytes / Math.pow(1024, i)).toFixed(2) + sizes[i];
+    return NumberUtil_1.default.correctNumberInput(bytes / Math.pow(1024, i), n) + sizes[i];
   };
 })(TransferUtil || (TransferUtil = {}));
 exports.default = TransferUtil;

package/package.json

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