util-helpers 4.13.0 → 4.14.0

package/lib/formatMobile.js

@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _normalizeString = _interopRequireDefault(require("./normalizeString"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 /**
  * 格式化手机号码
  *
@@ -17,16 +14,16 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
  * @since 4.5.0
  * @param {string} mobileNo 手机号码
  * @param {object} [options] 配置项
- * @param {string} [options.char=' '] 间隔字符
+ * @param {string} [options.spaceMark=' '] 间隔字符
  * @returns {string} 格式化后的手机号码
  * @example
  * 
  * formatMobile('13345678900'); // 133 4567 8900
- * formatMobile('13345678900', { char: '-' }); // 133-4567-8900
+ * formatMobile('13345678900', { spaceMark: '-' }); // 133-4567-8900
  *
  * // 脱敏手机号码
  * formatMobile('133****1234'); // 133 **** 1234
- * formatMobile('133****1234', { char: '-' }); // 133-****-1234
+ * formatMobile('133****1234', { spaceMark: '-' }); // 133-****-1234
  *
  * // 手机号码位数不够
  * formatMobile('133'); // 133
@@ -36,23 +33,20 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
  */
 function formatMobile(mobileNo) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
+  // @ts-ignore
+  // TODO 下个版本废弃 char
   var _options$char = options["char"],
-      _char = _options$char === void 0 ? ' ' : _options$char;
-
-  var regChar = new RegExp(_char, 'g');
+    _char = _options$char === void 0 ? ' ' : _options$char;
+  var realSpaceMark = 'spaceMark' in options ? options.spaceMark : _char;
+  var regChar = new RegExp(realSpaceMark, 'g');
   var realValue = (0, _normalizeString["default"])(mobileNo).replace(regChar, '').substring(0, 11);
-
   if (realValue.length > 7) {
-    return realValue.replace(/^(...)(....)/g, "$1".concat(_char, "$2").concat(_char));
+    return realValue.replace(/^(...)(....)/g, "$1".concat(realSpaceMark, "$2").concat(realSpaceMark));
   }
-
   if (realValue.length > 3) {
-    return realValue.replace(/^(...)/g, "$1".concat(_char));
+    return realValue.replace(/^(...)/g, "$1".concat(realSpaceMark));
   }
-
   return realValue;
 }
-
 var _default = formatMobile;
 exports["default"] = _default;

package/lib/formatMoney.js

@@ -4,28 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _math = require("./utils/math.util");
-
 var _isNaN = _interopRequireDefault(require("./utils/type/isNaN"));
-
 var _devWarn = _interopRequireDefault(require("./utils/devWarn"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr && (typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]); if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 var reg = /^[+-]?\d*\.?\d*$/;
+
 /**
  * 检查数字或数字字符串
  *
@@ -33,21 +23,20 @@ var reg = /^[+-]?\d*\.?\d*$/;
  * @param {string} num
  * @returns 是否为数字
  */
-
 function checkNumber(num) {
   if (!(reg.test(num) || (0, _math.isScientificNumber)(num)) || (0, _isNaN["default"])(num) || typeof num !== 'number' && typeof num !== 'string' || num === '') {
     (0, _devWarn["default"])("".concat(num, " invalid parameter."));
     return false;
-  } // 数字超限如果不是是字符串，可能有异常
-  // 如 1111111111111111111111 // => 1.1111111111111111e+21
-
+  }
 
+  // 数字超限如果不是是字符串，可能有异常
+  // 如 1111111111111111111111 // => 1.1111111111111111e+21
   if (typeof num === 'number') {
     (0, _math.checkBoundary)(num);
   }
-
   return true;
 }
+
 /**
  * 格式化整数部分
  *
@@ -56,22 +45,18 @@ function checkNumber(num) {
  * @param {string} thousand 千分位符号
  * @returns 格式化后的值
  */
-
-
 function formatInt(intStr, thousand) {
   var txt = '';
   intStr = (0, _math.trimLeftZero)(intStr);
   intStr = intStr[0] === '+' ? intStr.substring(1) : intStr; // 去掉+符号
-
   var negativeSymbol = Number(intStr) < 0 ? '-' : '';
   var reArr = negativeSymbol ? intStr.substring(1).split('').reverse() : intStr.split('').reverse();
-
   for (var i = 0; i < reArr.length; i++) {
     txt += reArr[i] + ((i + 1) % 3 === 0 && i + 1 !== reArr.length ? thousand : '');
   }
-
   return negativeSymbol + txt.split('').reverse().join('');
 }
+
 /**
  * 格式化小数部分，如果使用 toFixed，超大额数字会自动被截断
  *
@@ -81,25 +66,21 @@ function formatInt(intStr, thousand) {
  * @param {string} decimal 小数点符号
  * @returns 格式化后的值
  */
-
-
 function formatDec(decStr, precision, decimal) {
   if (precision === 0) {
     return '';
   }
-
   var zero = 0;
   var ret = '';
-
   if (decStr && Number(decStr) > 0) {
     var tmpNum = parseFloat('0.' + decStr);
     ret = tmpNum.toFixed(precision).substring(2);
   } else {
     ret = zero.toFixed(precision).substring(2);
   }
-
   return decimal + ret;
 }
+
 /**
  * 格式化金额
  *
@@ -137,43 +118,40 @@ function formatDec(decStr, precision, decimal) {
  * formatMoney(1000.00, { decimal: '&' }); // 1,000&00
  * 
  */
-
-
 var formatMoney = function formatMoney(num) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var _options$precision = options.precision,
-      precision = _options$precision === void 0 ? 2 : _options$precision,
-      symbol = options.symbol,
-      _options$thousand = options.thousand,
-      thousand = _options$thousand === void 0 ? ',' : _options$thousand,
-      _options$decimal = options.decimal,
-      decimal = _options$decimal === void 0 ? '.' : _options$decimal; // 数字参数不正确，返回空字符串
+    precision = _options$precision === void 0 ? 2 : _options$precision,
+    symbol = options.symbol,
+    _options$thousand = options.thousand,
+    thousand = _options$thousand === void 0 ? ',' : _options$thousand,
+    _options$decimal = options.decimal,
+    decimal = _options$decimal === void 0 ? '.' : _options$decimal;
+
+  // 数字参数不正确，返回空字符串
   // @ts-ignore
-
   if (!checkNumber(num)) {
     return '';
-  } // 参数规整化
-
+  }
 
+  // 参数规整化
   if (typeof precision !== 'number' || (0, _isNaN["default"])(precision) || precision < 0) {
     precision = 2;
   } else if (precision > 10) {
     precision = 10;
   }
-
   symbol = typeof symbol === 'string' ? symbol : '';
   thousand = typeof thousand === 'string' ? thousand : ',';
-  decimal = typeof decimal === 'string' ? decimal : '.'; // 转换数字字符串，支持科学记数法
-
-  var strNum = (0, _math.scientificToNumber)(num) + ''; // 整数和小数部分
+  decimal = typeof decimal === 'string' ? decimal : '.';
 
+  // 转换数字字符串，支持科学记数法
+  var strNum = (0, _math.scientificToNumber)(num) + '';
+  // 整数和小数部分
   var _strNum$split = strNum.split('.'),
-      _strNum$split2 = _slicedToArray(_strNum$split, 2),
-      intStr = _strNum$split2[0],
-      decStr = _strNum$split2[1];
-
+    _strNum$split2 = _slicedToArray(_strNum$split, 2),
+    intStr = _strNum$split2[0],
+    decStr = _strNum$split2[1];
   return symbol + formatInt(intStr, thousand) + formatDec(decStr, precision, decimal);
 };
-
 var _default = formatMoney;
 exports["default"] = _default;