util-helpers 4.21.5 → 4.21.7

package/esm/VERSION.js

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

package/esm/compressImage.js

@@ -1,5 +1,6 @@
 import { toNumber } from 'ut2';
 import loadImageWithBlob from './loadImageWithBlob.js';
+import { nativeUndefined } from './utils/native.js';
 
 function canvasToBlob(canvas, type, quality) {
     return new Promise(function (resolve) {
@@ -41,7 +42,7 @@ var compressImage = function (img, options) {
                 ctx.fillRect(0, 0, canvas.width, canvas.height);
             }
             var internalOffset = [0, 0];
-            if (rotate !== undefined) {
+            if (rotate !== nativeUndefined) {
                 ctx.translate(image.width / 2, image.height / 2);
                 internalOffset = [-image.width / 2, -image.height / 2];
                 ctx.rotate((rotate * Math.PI) / 180);

package/esm/download.js

@@ -3,7 +3,7 @@ import { isBlob, isPromiseLike } from 'ut2';
 import dataURLToBlob from './dataURLToBlob.js';
 import isUrl from './isUrl.js';
 import ajax from './ajax.js';
-import { createObjectURL, revokeObjectURL } from './utils/native.js';
+import { createObjectURL, revokeObjectURL, nativeUndefined } from './utils/native.js';
 
 function saver(blobUrl, fileName) {
     if (fileName === void 0) { fileName = ''; }
@@ -59,7 +59,7 @@ function download(data, options) {
                 case 5:
                     res = _a.sent();
                     currentFileName = fileName || data.split('?')[0].split('#')[0].split('/').pop();
-                    return [2, download(res, { fileName: currentFileName, type: type || (isBlob(res) ? res.type : undefined) })];
+                    return [2, download(res, { fileName: currentFileName, type: type || (isBlob(res) ? res.type : nativeUndefined) })];
                 case 6:
                     payload = new Blob([data], { type: type || 'text/plain' });
                     _a.label = 7;

package/esm/formatMoney.js

@@ -1,11 +1,11 @@
 import { __read } from 'tslib';
 import { isNaN } from 'ut2';
-import { scientificToNumber, isScientificNumber, checkBoundary, trimLeftZero } from './utils/math.util.js';
+import { transformEffectiveNumber, checkBoundary, trimLeftZero } from './utils/math.util.js';
 import devWarn from './utils/devWarn.js';
+import isValidNumber from './isValidNumber.js';
 
-var reg = /^[+-]?\d*\.?\d*$/;
 function checkNumber(num) {
-    if ((typeof num !== 'number' && typeof num !== 'string') || (typeof num === 'number' && isNaN(num)) || (typeof num === 'string' && (!(reg.test(num) || isScientificNumber(num)) || num === ''))) {
+    if (!isValidNumber(num)) {
         devWarn("".concat(num, " invalid parameter."));
         return false;
     }
@@ -59,7 +59,7 @@ var formatMoney = function (num, options) {
     symbol = typeof symbol === 'string' ? symbol : '';
     thousand = typeof thousand === 'string' ? thousand : ',';
     decimal = typeof decimal === 'string' ? decimal : '.';
-    var strNum = scientificToNumber(num) + '';
+    var strNum = transformEffectiveNumber(num) + '';
     var _d = __read(strNum.split('.'), 2), intStr = _d[0], decStr = _d[1];
     return symbol + formatInt(intStr, thousand) + formatDec(decStr, precision, decimal);
 };

package/esm/index.js

@@ -64,6 +64,6 @@ export { default as findTreeSelect } from './findTreeSelect.js';
 export { setDisableWarning } from './utils/config.js';
 export { default as VERSION } from './VERSION.js';
 
-var version = "4.21.5";
+var version = "4.21.7";
 
 export { version };

package/esm/isChinese.js

@@ -1,5 +1,5 @@
 import { toString } from 'ut2';
-import { objectValues } from './utils/native.js';
+import { objectValues, nativeUndefined } from './utils/native.js';
 
 var chineseDictionary = {
     chineseBasic: '[\u4e00-\u9fa5]',
@@ -29,7 +29,7 @@ function isChinese(value, options) {
     var extendRegExp = loose ? looseChineseExtendRegExp : chineseExtendRegExp;
     var hasExtend = useExtend && supportRegExpUnicode;
     var resultRegExp = hasExtend ? extendRegExp : basicRegExp;
-    var flag = hasExtend ? 'u' : undefined;
+    var flag = hasExtend ? 'u' : nativeUndefined;
     var reg = new RegExp(resultRegExp, flag);
     return reg.test(valueStr);
 }

package/esm/utils/math.util.js

@@ -1,6 +1,8 @@
-import { isString, isNaN, isSymbol, isNumber, MAX_SAFE_INTEGER, MIN_SAFE_INTEGER } from 'ut2';
+import { isString, toNumber, isNaN, isSymbol, isNumber, MAX_SAFE_INTEGER, MIN_SAFE_INTEGER } from 'ut2';
 import devWarn from './devWarn.js';
 
+var radixReg = /^[-+]?0[b|o|x]\d+/i;
+var dotNumberStringReg = /^\.\d+/;
 function transformEffectiveNumber(value) {
     var ret;
     if (isString(value)) {
@@ -8,6 +10,9 @@ function transformEffectiveNumber(value) {
         if (ret === '') {
             ret = Number(ret);
         }
+        else if (radixReg.test(ret) || dotNumberStringReg.test(ret)) {
+            ret = toNumber(ret);
+        }
         else if (isNaN(Number(ret))) {
             ret = Number.NaN;
         }
@@ -61,42 +66,5 @@ function trimLeftZero(num) {
     }
     return num;
 }
-function scientificToNumber(num) {
-    var strNum = String(num);
-    if (!isScientificNumber(strNum)) {
-        return num;
-    }
-    var ret;
-    var zero = '0';
-    var parts = strNum.toLowerCase().split('e');
-    var e = parts.pop();
-    var l = Math.abs(e);
-    var sign = e / l;
-    var coeff_array = parts[0].split('.');
-    if (sign === -1) {
-        var intVal = trimLeftZero(coeff_array[0]);
-        if (intVal.length > l) {
-            var thanLen = intVal.length - l;
-            var dec = coeff_array[1] || '';
-            ret = intVal.slice(0, thanLen);
-            if (intVal.slice(thanLen) !== '0' || dec) {
-                ret += '.' + intVal.slice(thanLen) + dec;
-            }
-        }
-        else {
-            ret = zero + '.' + new Array(l - intVal.length + 1).join(zero) + coeff_array.join('');
-        }
-    }
-    else {
-        var dec = coeff_array[1] || '';
-        if (l - dec.length < 0) {
-            ret = trimLeftZero(coeff_array[0] + dec.substring(0, l)) + '.' + dec.substring(l);
-        }
-        else {
-            ret = coeff_array.join('') + new Array(l - dec.length + 1).join(zero);
-        }
-    }
-    return trimLeftZero(ret);
-}
 
-export { checkBoundary, digitLength, float2Fixed, isScientificNumber, scientificToNumber, strip, transformEffectiveNumber, trimLeftZero };
+export { checkBoundary, digitLength, float2Fixed, isScientificNumber, strip, transformEffectiveNumber, trimLeftZero };

package/esm/utils/native.js

@@ -1,9 +1,10 @@
 import { constant, noop } from 'ut2';
 import { URLExisted } from './setup.js';
 
+var nativeUndefined = void 0;
 var objectKeys = Object.keys;
 var objectValues = Object.values;
 var createObjectURL = URLExisted ? URL.createObjectURL : constant('');
 var revokeObjectURL = URLExisted ? URL.revokeObjectURL : noop;
 
-export { createObjectURL, objectKeys, objectValues, revokeObjectURL };
+export { createObjectURL, nativeUndefined, objectKeys, objectValues, revokeObjectURL };

package/lib/VERSION.js

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

package/lib/compressImage.js

@@ -2,6 +2,7 @@
 
 var ut2 = require('ut2');
 var loadImageWithBlob = require('./loadImageWithBlob.js');
+var native = require('./utils/native.js');
 
 function canvasToBlob(canvas, type, quality) {
     return new Promise(function (resolve) {
@@ -43,7 +44,7 @@ var compressImage = function (img, options) {
                 ctx.fillRect(0, 0, canvas.width, canvas.height);
             }
             var internalOffset = [0, 0];
-            if (rotate !== undefined) {
+            if (rotate !== native.nativeUndefined) {
                 ctx.translate(image.width / 2, image.height / 2);
                 internalOffset = [-image.width / 2, -image.height / 2];
                 ctx.rotate((rotate * Math.PI) / 180);

package/lib/download.js

@@ -61,7 +61,7 @@ function download(data, options) {
                 case 5:
                     res = _a.sent();
                     currentFileName = fileName || data.split('?')[0].split('#')[0].split('/').pop();
-                    return [2, download(res, { fileName: currentFileName, type: type || (ut2.isBlob(res) ? res.type : undefined) })];
+                    return [2, download(res, { fileName: currentFileName, type: type || (ut2.isBlob(res) ? res.type : native.nativeUndefined) })];
                 case 6:
                     payload = new Blob([data], { type: type || 'text/plain' });
                     _a.label = 7;

package/lib/formatMoney.js

@@ -4,10 +4,10 @@ var tslib = require('tslib');
 var ut2 = require('ut2');
 var math_util = require('./utils/math.util.js');
 var devWarn = require('./utils/devWarn.js');
+var isValidNumber = require('./isValidNumber.js');
 
-var reg = /^[+-]?\d*\.?\d*$/;
 function checkNumber(num) {
-    if ((typeof num !== 'number' && typeof num !== 'string') || (typeof num === 'number' && ut2.isNaN(num)) || (typeof num === 'string' && (!(reg.test(num) || math_util.isScientificNumber(num)) || num === ''))) {
+    if (!isValidNumber(num)) {
         devWarn("".concat(num, " invalid parameter."));
         return false;
     }
@@ -61,7 +61,7 @@ var formatMoney = function (num, options) {
     symbol = typeof symbol === 'string' ? symbol : '';
     thousand = typeof thousand === 'string' ? thousand : ',';
     decimal = typeof decimal === 'string' ? decimal : '.';
-    var strNum = math_util.scientificToNumber(num) + '';
+    var strNum = math_util.transformEffectiveNumber(num) + '';
     var _d = tslib.__read(strNum.split('.'), 2), intStr = _d[0], decStr = _d[1];
     return symbol + formatInt(intStr, thousand) + formatDec(decStr, precision, decimal);
 };

package/lib/index.js

@@ -66,7 +66,7 @@ var findTreeSelect = require('./findTreeSelect.js');
 var config = require('./utils/config.js');
 var VERSION = require('./VERSION.js');
 
-exports.version = "4.21.5";
+exports.version = "4.21.7";
 
 exports.isMobile = isMobile;
 exports.isTelephone = isTelephone;

package/lib/isChinese.js

@@ -31,7 +31,7 @@ function isChinese(value, options) {
     var extendRegExp = loose ? looseChineseExtendRegExp : chineseExtendRegExp;
     var hasExtend = useExtend && supportRegExpUnicode;
     var resultRegExp = hasExtend ? extendRegExp : basicRegExp;
-    var flag = hasExtend ? 'u' : undefined;
+    var flag = hasExtend ? 'u' : native.nativeUndefined;
     var reg = new RegExp(resultRegExp, flag);
     return reg.test(valueStr);
 }

package/lib/utils/math.util.js

@@ -3,6 +3,8 @@
 var ut2 = require('ut2');
 var devWarn = require('./devWarn.js');
 
+var radixReg = /^[-+]?0[b|o|x]\d+/i;
+var dotNumberStringReg = /^\.\d+/;
 function transformEffectiveNumber(value) {
     var ret;
     if (ut2.isString(value)) {
@@ -10,6 +12,9 @@ function transformEffectiveNumber(value) {
         if (ret === '') {
             ret = Number(ret);
         }
+        else if (radixReg.test(ret) || dotNumberStringReg.test(ret)) {
+            ret = ut2.toNumber(ret);
+        }
         else if (ut2.isNaN(Number(ret))) {
             ret = Number.NaN;
         }
@@ -63,49 +68,11 @@ function trimLeftZero(num) {
     }
     return num;
 }
-function scientificToNumber(num) {
-    var strNum = String(num);
-    if (!isScientificNumber(strNum)) {
-        return num;
-    }
-    var ret;
-    var zero = '0';
-    var parts = strNum.toLowerCase().split('e');
-    var e = parts.pop();
-    var l = Math.abs(e);
-    var sign = e / l;
-    var coeff_array = parts[0].split('.');
-    if (sign === -1) {
-        var intVal = trimLeftZero(coeff_array[0]);
-        if (intVal.length > l) {
-            var thanLen = intVal.length - l;
-            var dec = coeff_array[1] || '';
-            ret = intVal.slice(0, thanLen);
-            if (intVal.slice(thanLen) !== '0' || dec) {
-                ret += '.' + intVal.slice(thanLen) + dec;
-            }
-        }
-        else {
-            ret = zero + '.' + new Array(l - intVal.length + 1).join(zero) + coeff_array.join('');
-        }
-    }
-    else {
-        var dec = coeff_array[1] || '';
-        if (l - dec.length < 0) {
-            ret = trimLeftZero(coeff_array[0] + dec.substring(0, l)) + '.' + dec.substring(l);
-        }
-        else {
-            ret = coeff_array.join('') + new Array(l - dec.length + 1).join(zero);
-        }
-    }
-    return trimLeftZero(ret);
-}
 
 exports.checkBoundary = checkBoundary;
 exports.digitLength = digitLength;
 exports.float2Fixed = float2Fixed;
 exports.isScientificNumber = isScientificNumber;
-exports.scientificToNumber = scientificToNumber;
 exports.strip = strip;
 exports.transformEffectiveNumber = transformEffectiveNumber;
 exports.trimLeftZero = trimLeftZero;

package/lib/utils/native.js

@@ -3,6 +3,7 @@
 var ut2 = require('ut2');
 var setup = require('./setup.js');
 
+exports.nativeUndefined = void 0;
 exports.objectKeys = Object.keys;
 exports.objectValues = Object.values;
 exports.createObjectURL = setup.URLExisted ? URL.createObjectURL : ut2.constant('');

package/package.json

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

package/types/utils/native.d.ts

@@ -1,3 +1,4 @@
+export declare const nativeUndefined: undefined;
 export declare const objectKeys: {
     (o: object): string[];
     (o: {}): string[];