util-helpers 5.1.0 → 5.1.2

package/dist/util-helpers.js

@@ -34,6 +34,7 @@
     var symbolTag = '[object Symbol]';
     var functionTags = ['Function', 'AsyncFunction', 'GeneratorFunction', 'Proxy'].map(function (item) { return '[object ' + item + ']'; });
     var blobTag = '[object Blob]';
+    var fileTag = '[object File]';
     var objectTag = '[object Object]';
 
     function isArray(value) {
@@ -215,6 +216,14 @@
         return typeof Ctor === 'function' && Ctor instanceof Ctor && functionProtoToString.call(Ctor) === objectCtorString;
     }
 
+    var fileExisted = typeof File !== stringUndefined;
+    function isFile(value) {
+        if (fileExisted && value instanceof File) {
+            return true;
+        }
+        return getTag(value) === fileTag;
+    }
+
     var freeGlobalThis = globalThisExisted && globalThis.Object === Object && globalThis;
     var freeGlobal = globalExisted && global.Object === Object && global;
     var freeSelf = selfExisted && self.Object === Object && self;
@@ -893,10 +902,9 @@
         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)) {
@@ -912,7 +920,7 @@
         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);
     };
 
@@ -1471,8 +1479,15 @@
     function testExt(name, ext) {
         return !!name && name.slice(-ext.length) === ext;
     }
+    function isUploadFile(fileObj) {
+        if (isObjectLike(fileObj) && isString(fileObj.uid) && isString(fileObj.name)) {
+            return true;
+        }
+        return false;
+    }
+
     function checkFileType(file, accept) {
-        if (!isBlob(file)) {
+        if (!isFile(file) && !isUploadFile(file)) {
             return false;
         }
         if (!isString(accept)) {
@@ -1485,9 +1500,10 @@
         var ret = false;
         var types = accept.toLowerCase().split(/,(?:\s+)?/);
         var fileName = file.name.toLowerCase();
-        var fileType = file.type;
+        var fileType = file.type || '';
+        var fileUrl = file.url || '';
         types.some(function (type) {
-            if (fileType === type || (type.indexOf('.') === 0 && testExt(fileName, type))) {
+            if (type === '*' || fileType === type || (type.indexOf('.') === 0 && (testExt(fileName, type) || testExt(fileUrl, type)))) {
                 ret = true;
             }
             else if (type.includes('/*') && fileType.includes('/')) {
@@ -1717,7 +1733,7 @@
     };
     function getFileType(file) {
         var type;
-        if (isBlob(file)) {
+        if (isBlob(file) || isUploadFile(file)) {
             forEach(config, function (accept, fileType) {
                 if (checkFileType(file, accept)) {
                     type = fileType;
@@ -2060,7 +2076,7 @@
         return internalFindTreeSelect(tree, predicate, childrenField);
     }
 
-    var VERSION = "5.1.0";
+    var VERSION = "5.1.2";
 
     var EmitterPro = /** @class */ (function () {
         function EmitterPro() {