util-helpers 5.2.1 → 5.2.2

package/README.md

@@ -51,25 +51,22 @@ formatBankCard('6228480402564890018', { spaceMark: '-' }); // 6228-4804-0256-489
   - [plus](https://doly-dev.github.io/util-helpers/module-Math.html#.plus) - 加
   - [round](https://doly-dev.github.io/util-helpers/module-Math.html#.round) - 四舍五入
   - [times](https://doly-dev.github.io/util-helpers/module-Math.html#.times) - 乘
-- 其他
-  - [ajax](https://doly-dev.github.io/util-helpers/module-Other.html#.ajax) - 请求
-  - [calculateCursorPosition](https://doly-dev.github.io/util-helpers/module-Other.html#.calculateCursorPosition) - 计算光标位置
-  - [checkFileType](https://doly-dev.github.io/util-helpers/module-Other.html#.checkFileType) - 检查文件类型
-  - [compressImage](https://doly-dev.github.io/util-helpers/module-Other.html#.compressImage) - 压缩图片
-  - [download](https://doly-dev.github.io/util-helpers/module-Other.html#.download) - 下载
-  - [getFileBlob](https://doly-dev.github.io/util-helpers/module-Other.html#.getFileBlob) - 获取文件 Blob
-  - [getFileType](https://doly-dev.github.io/util-helpers/module-Other.html#.getFileType) - 获取文件类型
-  - [getImageInfo](https://doly-dev.github.io/util-helpers/module-Other.html#.getImageInfo) - 获取图片信息
-  - [getMimeType](https://doly-dev.github.io/util-helpers/module-Other.html#.getMimeType) - 获取 MIME 类型
-  - [loadImage](https://doly-dev.github.io/util-helpers/module-Other.html#.loadImage) - 加载图片
-  - [loadImageWithBlob](https://doly-dev.github.io/util-helpers/module-Other.html#.loadImageWithBlob) - 加载图片和 blob 对象
-  - [loadScript](https://doly-dev.github.io/util-helpers/module-Other.html#.loadScript) - 加载 js 文件
-  - [randomString](https://doly-dev.github.io/util-helpers/module-Other.html#.randomString) - 随机字符串
-  - [strlen](https://doly-dev.github.io/util-helpers/module-Other.html#.strlen) - 字符长度
+- 浏览器
+  - [ajax](https://doly-dev.github.io/util-helpers/module-Browser.html#.ajax) - 请求
+  - [checkFileType](https://doly-dev.github.io/util-helpers/module-Browser.html#.checkFileType) - 检查文件类型
+  - [compressImage](https://doly-dev.github.io/util-helpers/module-Browser.html#.compressImage) - 压缩图片
+  - [dataURLToBlob](https://doly-dev.github.io/util-helpers/module-Browser.html#.dataURLToBlob) - 将 DataURL 转为 Blob 对象
+  - [download](https://doly-dev.github.io/util-helpers/module-Browser.html#.download) - 下载
+  - [fileReader](https://doly-dev.github.io/util-helpers/module-Browser.html#.fileReader) - 读取 Blob 或 File 对象，转为 Base64/String/ArrayBuffer
+  - [getFileBlob](https://doly-dev.github.io/util-helpers/module-Browser.html#.getFileBlob) - 获取文件 Blob
+  - [getFileType](https://doly-dev.github.io/util-helpers/module-Browser.html#.getFileType) - 获取文件类型
+  - [getImageInfo](https://doly-dev.github.io/util-helpers/module-Browser.html#.getImageInfo) - 获取图片信息
+  - [getMimeType](https://doly-dev.github.io/util-helpers/module-Browser.html#.getMimeType) - 获取文件 MIME 类型
+  - [loadImage](https://doly-dev.github.io/util-helpers/module-Browser.html#.loadImage) - 加载图片
+  - [loadImageWithBlob](https://doly-dev.github.io/util-helpers/module-Browser.html#.loadImageWithBlob) - 加载图片和 blob 对象
+  - [loadScript](https://doly-dev.github.io/util-helpers/module-Browser.html#.loadScript) - 加载 js 文件
 - 数据处理
   - [bytesToSize](https://doly-dev.github.io/util-helpers/module-Processor.html#.bytesToSize) - 字节转换为存储单位
-  - [dataURLToBlob](https://doly-dev.github.io/util-helpers/module-Processor.html#.dataURLToBlob) - 将 DataURL 转为 Blob 对象
-  - [fileReader](https://doly-dev.github.io/util-helpers/module-Processor.html#.fileReader) - 读取 Blob 或 File 对象，转为 Base64/String/ArrayBuffer
   - [formatBankCard](https://doly-dev.github.io/util-helpers/module-Processor.html#.formatBankCard) - 格式化银行卡
   - [formatMobile](https://doly-dev.github.io/util-helpers/module-Processor.html#.formatMobile) - 格式化手机号码
   - [formatMoney](https://doly-dev.github.io/util-helpers/module-Processor.html#.formatMoney) - 格式化金额
@@ -111,6 +108,10 @@ formatBankCard('6228480402564890018', { spaceMark: '-' }); // 6228-4804-0256-489
   - [isVehicle](https://doly-dev.github.io/util-helpers/module-Validator.html#.isVehicle) - 车牌号
   - [isWX](https://doly-dev.github.io/util-helpers/module-Validator.html#.isWX) - 微信号
   - [validatePassword](https://doly-dev.github.io/util-helpers/module-Validator.html#.validatePassword) - 验证密码
+- 其他
+  - [calculateCursorPosition](https://doly-dev.github.io/util-helpers/module-Other.html#.calculateCursorPosition) - 计算光标位置
+  - [randomString](https://doly-dev.github.io/util-helpers/module-Other.html#.randomString) - 随机字符串
+  - [strlen](https://doly-dev.github.io/util-helpers/module-Other.html#.strlen) - 字符长度
 - Classes
   - [AsyncMemo](https://doly-dev.github.io/util-helpers/AsyncMemo.html) - 异步缓存类
 

package/dist/util-helpers.js

@@ -1159,40 +1159,6 @@
         };
     }
 
-    var FileReaderMethodMap = {
-        arrayBuffer: 'readAsArrayBuffer',
-        binaryString: 'readAsBinaryString',
-        dataURL: 'readAsDataURL',
-        text: 'readAsText'
-    };
-    var fileReader = function (blob, type) {
-        if (type === void 0) { type = 'dataURL'; }
-        var method = FileReaderMethodMap[type];
-        if (!method) {
-            method = FileReaderMethodMap.dataURL;
-        }
-        return new Promise(function (resolve, reject) {
-            var reader = new FileReader();
-            reader[method](blob);
-            reader.onload = function () { return resolve(reader.result); };
-            reader.onerror = function (error) { return reject(error); };
-        });
-    };
-
-    function dataURLToBlob(data) {
-        var parts = data.split(',');
-        var meta = parts[0].substring(5).split(';');
-        var type = meta[0];
-        var decoder = meta.indexOf('base64') !== -1 ? atob : decodeURIComponent;
-        var bstr = decoder(parts[1]);
-        var n = bstr.length;
-        var u8arr = new Uint8Array(n);
-        while (n--) {
-            u8arr[n] = bstr.charCodeAt(n);
-        }
-        return new Blob([u8arr], { type: type });
-    }
-
     function setDataURLPrefix(data, mimeType, base64) {
         if (mimeType === void 0) { mimeType = 'image/png'; }
         if (base64 === void 0) { base64 = true; }
@@ -1455,38 +1421,11 @@
         });
     }
 
-    function calculateCursorPosition(prevPos, prevCtrlValue, rawValue, ctrlValue, options) {
-        if (options === void 0) { options = {}; }
-        var _a = options.placeholderChar, placeholderChar = _a === void 0 ? ' ' : _a, _b = options.maskReg, maskReg = _b === void 0 ? /\D/g : _b, type = options.type;
-        var realCtrlValue = toString(prevCtrlValue);
-        var realRawValue = toString(rawValue);
-        var placeholderChars = isArray(placeholderChar) ? placeholderChar : [placeholderChar];
-        var editLength = realRawValue.length - realCtrlValue.length;
-        var isAddition = editLength > 0;
-        var pos = prevPos;
-        if (isAddition) {
-            var additionStr = realRawValue.substring(pos - editLength, pos);
-            var ctrlCharCount = additionStr.replace(maskReg, '').length;
-            pos -= editLength - ctrlCharCount;
-            var placeholderCharCount = 0;
-            while (ctrlCharCount > 0) {
-                if (placeholderChars.indexOf(ctrlValue.charAt(pos - ctrlCharCount + placeholderCharCount)) !== -1) {
-                    placeholderCharCount++;
-                }
-                else {
-                    ctrlCharCount--;
-                }
-            }
-            pos += placeholderCharCount;
-        }
-        if ((type === 'mobile' && (pos === 4 || pos === 9)) || (type === 'bankCard' && pos > 0 && pos % 5 === 0)) {
-            pos -= 1;
-        }
-        return pos;
+    function getFileNameExt(name) {
+        return isString(name) && name.indexOf('.') > 0 ? '.' + nth(name.split('.'), -1) : '';
     }
-
     function testExt(name, ext) {
-        return !!name && name.slice(-ext.length) === ext;
+        return !!name && getFileNameExt(name) === ext;
     }
     function isUploadFile(fileObj) {
         if (isObjectLike(fileObj) && isString(fileObj.name)) {
@@ -1496,7 +1435,9 @@
     }
 
     function checkFileType(file, accept) {
-        if (!isFile(file) && !isUploadFile(file)) {
+        var _a, _b;
+        var isFileType = isFile(file);
+        if (!isFileType && !isUploadFile(file)) {
             return false;
         }
         if (!isString(accept)) {
@@ -1508,9 +1449,9 @@
         }
         var ret = false;
         var types = accept.toLowerCase().split(/,(?:\s+)?/);
-        var fileName = file.name.toLowerCase();
-        var fileType = file.type || '';
-        var fileUrl = file.url || '';
+        var fileName = (file.name || (!isFileType && (file.fileName || ((_a = file.originFileObj) === null || _a === void 0 ? void 0 : _a.name))) || '').toLowerCase();
+        var fileType = file.type || (!isFileType && ((_b = file.originFileObj) === null || _b === void 0 ? void 0 : _b.type)) || '';
+        var fileUrl = (!isFileType && file.url) || '';
         types.some(function (type) {
             if (type === '*' || fileType === type || (type.indexOf('.') === 0 && (testExt(fileName, type) || testExt(fileUrl, type)))) {
                 ret = true;
@@ -1650,6 +1591,20 @@
         });
     };
 
+    function dataURLToBlob(data) {
+        var parts = data.split(',');
+        var meta = parts[0].substring(5).split(';');
+        var type = meta[0];
+        var decoder = meta.indexOf('base64') !== -1 ? atob : decodeURIComponent;
+        var bstr = decoder(parts[1]);
+        var n = bstr.length;
+        var u8arr = new Uint8Array(n);
+        while (n--) {
+            u8arr[n] = bstr.charCodeAt(n);
+        }
+        return new Blob([u8arr], { type: type });
+    }
+
     function saver(blobUrl, fileName) {
         if (fileName === void 0) { fileName = ''; }
         var anchor = document.createElement('a');
@@ -1732,6 +1687,26 @@
         });
     }
 
+    var FileReaderMethodMap = {
+        arrayBuffer: 'readAsArrayBuffer',
+        binaryString: 'readAsBinaryString',
+        dataURL: 'readAsDataURL',
+        text: 'readAsText'
+    };
+    var fileReader = function (blob, type) {
+        if (type === void 0) { type = 'dataURL'; }
+        var method = FileReaderMethodMap[type];
+        if (!method) {
+            method = FileReaderMethodMap.dataURL;
+        }
+        return new Promise(function (resolve, reject) {
+            var reader = new FileReader();
+            reader[method](blob);
+            reader.onload = function () { return resolve(reader.result); };
+            reader.onerror = function (error) { return reject(error); };
+        });
+    };
+
     var config = {
         image: 'image/*,.jpeg,.jpg,.gif,.bmp,.png,.webp,.svg,.apng,.avif,.ico,.tif,.tiff',
         audio: 'audio/*,.mp3,.wav,.aac,.flac',
@@ -1809,7 +1784,7 @@
     ];
     function getMimeType(fileName) {
         var _a;
-        var ext = isString(fileName) && fileName.indexOf('.') > 0 ? nth(fileName.split('.'), -1) : '';
+        var ext = getFileNameExt(fileName).slice(1);
         return ext ? (_a = mimeTypes.find(function (item) { return item[1].includes(ext); })) === null || _a === void 0 ? void 0 : _a[0] : nativeUndefined;
     }
 
@@ -1849,6 +1824,36 @@
         });
     }
 
+    function calculateCursorPosition(prevPos, prevCtrlValue, rawValue, ctrlValue, options) {
+        if (options === void 0) { options = {}; }
+        var _a = options.placeholderChar, placeholderChar = _a === void 0 ? ' ' : _a, _b = options.maskReg, maskReg = _b === void 0 ? /\D/g : _b, type = options.type;
+        var realCtrlValue = toString(prevCtrlValue);
+        var realRawValue = toString(rawValue);
+        var placeholderChars = isArray(placeholderChar) ? placeholderChar : [placeholderChar];
+        var editLength = realRawValue.length - realCtrlValue.length;
+        var isAddition = editLength > 0;
+        var pos = prevPos;
+        if (isAddition) {
+            var additionStr = realRawValue.substring(pos - editLength, pos);
+            var ctrlCharCount = additionStr.replace(maskReg, '').length;
+            pos -= editLength - ctrlCharCount;
+            var placeholderCharCount = 0;
+            while (ctrlCharCount > 0) {
+                if (placeholderChars.indexOf(ctrlValue.charAt(pos - ctrlCharCount + placeholderCharCount)) !== -1) {
+                    placeholderCharCount++;
+                }
+                else {
+                    ctrlCharCount--;
+                }
+            }
+            pos += placeholderCharCount;
+        }
+        if ((type === 'mobile' && (pos === 4 || pos === 9)) || (type === 'bankCard' && pos > 0 && pos % 5 === 0)) {
+            pos -= 1;
+        }
+        return pos;
+    }
+
     var letter = 'abcdefghijklmnopqrstuvwxyz';
     var chars = {
         number: '0123456789',
@@ -2124,7 +2129,7 @@
         return internalFindTreeSelect(tree, predicate, childrenField);
     }
 
-    var VERSION = "5.2.1";
+    var VERSION = "5.2.2";
 
     /**
      * 事件触发器，支持浏览器端和 node 端。