util-helpers 4.23.5 → 4.23.7

package/esm/VERSION.js

@@ -1,4 +1,4 @@
-var VERSION = "4.23.5";
+var VERSION = "4.23.7";
 var VERSION$1 = VERSION;
 
 export { VERSION$1 as default };

package/esm/formatMoney.js

@@ -1,5 +1,5 @@
 import { __read } from 'tslib';
-import { isNaN } from 'ut2';
+import { isString, isNumber, isNaN } from 'ut2';
 import { transformEffectiveNumber, checkBoundary, trimLeftZero } from './utils/math.util.js';
 import devWarn from './utils/devWarn.js';
 import isValidNumber from './isValidNumber.js';
@@ -41,10 +41,9 @@ function formatDec(decStr, precision, decimal) {
     return decimal + ret;
 }
 var formatMoney = function (num, options) {
-    if (num === void 0) { num = ''; }
     if (options === void 0) { options = {}; }
-    var _a = options.precision, precision = _a === void 0 ? 2 : _a, symbol = options.symbol, _b = options.thousand, thousand = _b === void 0 ? ',' : _b, _c = options.decimal, decimal = _c === void 0 ? '.' : _c;
-    if (!checkNumber(num)) {
+    var _a = options.precision, precision = _a === void 0 ? 2 : _a, symbol = options.symbol, _b = options.thousand, thousand = _b === void 0 ? ',' : _b, _c = options.decimal, decimal = _c === void 0 ? '.' : _c, _d = options.strict, strict = _d === void 0 ? true : _d;
+    if (!checkNumber(num) || (strict && (!isString(num) || num === '') && !isNumber(num))) {
         return '';
     }
     if (typeof num === 'number' && !isFinite(num)) {
@@ -60,7 +59,7 @@ var formatMoney = function (num, options) {
     thousand = typeof thousand === 'string' ? thousand : ',';
     decimal = typeof decimal === 'string' ? decimal : '.';
     var strNum = transformEffectiveNumber(num) + '';
-    var _d = __read(strNum.split('.'), 2), intStr = _d[0], decStr = _d[1];
+    var _e = __read(strNum.split('.'), 2), intStr = _e[0], decStr = _e[1];
     return symbol + formatInt(intStr, thousand) + formatDec(decStr, precision, decimal);
 };
 var formatMoney$1 = formatMoney;

package/esm/index.js

@@ -66,6 +66,6 @@ export { setDisableWarning } from './utils/config.js';
 export { default as VERSION } from './VERSION.js';
 export { default as AsyncMemo } from './AsyncMemo.js';
 
-var version = "4.23.5";
+var version = "4.23.7";
 
 export { version };

package/esm/parseIdCard.js

@@ -1,4 +1,4 @@
-var regIdCard = /^(?<province>\d{2})(?<city>\d{2})(?<area>\d{2})(?<year>(?:\d{2})?\d{2})(?<month>\d{2})(?<day>\d{2})\d{2}(?<gender>\d)(?:\d|X)?$/i;
+var regIdCard = /^(\d{2})(\d{2})(\d{2})((?:\d{2})?\d{2})(\d{2})(\d{2})\d{2}(\d)(?:\d|X)?$/i;
 var Provinces = [
     ['11', '北京市'],
     ['12', '天津市'],
@@ -41,7 +41,7 @@ function parseIdCard(id) {
     if (!match) {
         return null;
     }
-    var origin = match.groups || {
+    var origin = {
         province: match[1],
         city: match[2],
         area: match[3],

package/lib/VERSION.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var VERSION = "4.23.5";
+var VERSION = "4.23.7";
 var VERSION$1 = VERSION;
 
 module.exports = VERSION$1;

package/lib/formatMoney.js

@@ -43,10 +43,9 @@ function formatDec(decStr, precision, decimal) {
     return decimal + ret;
 }
 var formatMoney = function (num, options) {
-    if (num === void 0) { num = ''; }
     if (options === void 0) { options = {}; }
-    var _a = options.precision, precision = _a === void 0 ? 2 : _a, symbol = options.symbol, _b = options.thousand, thousand = _b === void 0 ? ',' : _b, _c = options.decimal, decimal = _c === void 0 ? '.' : _c;
-    if (!checkNumber(num)) {
+    var _a = options.precision, precision = _a === void 0 ? 2 : _a, symbol = options.symbol, _b = options.thousand, thousand = _b === void 0 ? ',' : _b, _c = options.decimal, decimal = _c === void 0 ? '.' : _c, _d = options.strict, strict = _d === void 0 ? true : _d;
+    if (!checkNumber(num) || (strict && (!ut2.isString(num) || num === '') && !ut2.isNumber(num))) {
         return '';
     }
     if (typeof num === 'number' && !isFinite(num)) {
@@ -62,7 +61,7 @@ var formatMoney = function (num, options) {
     thousand = typeof thousand === 'string' ? thousand : ',';
     decimal = typeof decimal === 'string' ? decimal : '.';
     var strNum = math_util.transformEffectiveNumber(num) + '';
-    var _d = tslib.__read(strNum.split('.'), 2), intStr = _d[0], decStr = _d[1];
+    var _e = tslib.__read(strNum.split('.'), 2), intStr = _e[0], decStr = _e[1];
     return symbol + formatInt(intStr, thousand) + formatDec(decStr, precision, decimal);
 };
 var formatMoney$1 = formatMoney;

package/lib/index.js

@@ -68,7 +68,7 @@ var config = require('./utils/config.js');
 var VERSION = require('./VERSION.js');
 var AsyncMemo = require('./AsyncMemo.js');
 
-exports.version = "4.23.5";
+exports.version = "4.23.7";
 
 exports.isMobile = isMobile;
 exports.isTelephone = isTelephone;

package/lib/parseIdCard.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var regIdCard = /^(?<province>\d{2})(?<city>\d{2})(?<area>\d{2})(?<year>(?:\d{2})?\d{2})(?<month>\d{2})(?<day>\d{2})\d{2}(?<gender>\d)(?:\d|X)?$/i;
+var regIdCard = /^(\d{2})(\d{2})(\d{2})((?:\d{2})?\d{2})(\d{2})(\d{2})\d{2}(\d)(?:\d|X)?$/i;
 var Provinces = [
     ['11', '北京市'],
     ['12', '天津市'],
@@ -43,7 +43,7 @@ function parseIdCard(id) {
     if (!match) {
         return null;
     }
-    var origin = match.groups || {
+    var origin = {
         province: match[1],
         city: match[2],
         area: match[3],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "4.23.5",
+  "version": "4.23.7",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",

package/types/formatMoney.d.ts

@@ -3,6 +3,7 @@ type Options = {
     symbol?: string;
     thousand?: string;
     decimal?: string;
+    strict?: boolean;
 };
 /**
  * 格式化金额
@@ -16,6 +17,7 @@ type Options = {
  * @param {string} [options.symbol] 货币符号
  * @param {string} [options.thousand=","] 千分位符号
  * @param {string} [options.decimal="."] 小数位符号
+ * @param {boolean} [options.strict=ture] 严格模式。开启后，只支持非空字符串和数字格式化，其他类型值如`null` `undefined` `true` `false`等将返回空字符串。
  * @returns {string} 格式化的金额
  * @example
  *