util-helpers 4.20.8 → 4.21.1

package/README.md

@@ -100,6 +100,7 @@ formatBankCard('6228480402564890018', { spaceMark: '-' }); // 6228-4804-0256-489
   - [calculateCursorPosition](https://doly-dev.github.io/util-helpers/module-Other.html#.calculateCursorPosition) - 计算光标位置
   - [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
   - [getImageInfo](https://doly-dev.github.io/util-helpers/module-Other.html#.getImageInfo) - 获取图片信息
   - [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 对象

package/dist/util-helpers.js

@@ -26,11 +26,15 @@
 
     function isObject(value) {
         var type = typeof value;
-        return value != null && (type === 'object' || type === 'function');
+        return type === 'function' || (type === 'object' && !!value);
+    }
+
+    function getTag(value) {
+        return objectProtoToString.call(value);
     }
 
     function isSymbol(value) {
-        return typeof value === 'symbol' || objectProtoToString.call(value) === symbolTag;
+        return typeof value === 'symbol' || getTag(value) === symbolTag;
     }
 
     var reIsBinary = /^0b[01]+$/i;
@@ -67,22 +71,26 @@
         return remainder ? result - remainder : result;
     }
 
+    function isNil(value) {
+        return value == null;
+    }
+
     var symbolToString = symbolProto ? symbolProto.toString : undefined;
     function baseToString(value) {
         if (typeof value === 'string') {
             return value;
         }
         if (isArray(value)) {
-            return "".concat(value.map(baseToString));
+            return '' + value.map(baseToString);
         }
         if (isSymbol(value)) {
             return symbolToString ? symbolToString.call(value) : '';
         }
         var result = '' + value;
-        return result == '0' && 1 / value === -Infinity ? '-0' : result;
+        return result === '0' && 1 / value === -Infinity ? '-0' : result;
     }
     function toString(value) {
-        return value == null ? '' : baseToString(value);
+        return isNil(value) ? '' : baseToString(value);
     }
 
     var blobExisted = typeof Blob !== 'undefined';
@@ -90,7 +98,7 @@
         if (blobExisted && value instanceof Blob) {
             return true;
         }
-        return objectProtoToString.call(value) === blobTag;
+        return getTag(value) === blobTag;
     }
 
     var freeGlobalThis = globalThisExisted && globalThis.Object === Object && globalThis;
@@ -104,7 +112,7 @@
     }
 
     function isNumber(value) {
-        return typeof value === 'number' || objectProtoToString.call(value) === numberTag;
+        return typeof value === 'number' || getTag(value) === numberTag;
     }
 
     function isNaN(value) {
@@ -116,7 +124,7 @@
     }
 
     function isString(value) {
-        return typeof value === 'string' || objectProtoToString.call(value) === stringTag;
+        return typeof value === 'string' || getTag(value) === stringTag;
     }
 
     function decimalAdjust(type, value, precision) {
@@ -1385,31 +1393,32 @@
     }
 
     var SuccessResponseStatus = [200, 304];
-    function getBlob(img, ajaxOptions) {
+    function getFileBlob(file, ajaxOptions) {
         return new Promise(function (resolve, reject) {
-            if (isBlob(img)) {
-                resolve(img);
+            if (isBlob(file)) {
+                resolve(file);
             }
             else {
-                ajax(img, __assign({ responseType: 'blob' }, ajaxOptions))
+                ajax(file, __assign({ responseType: 'blob' }, ajaxOptions))
                     .then(function (ev) {
                     var responseStatus = ev.target.status;
                     if (SuccessResponseStatus.indexOf(responseStatus) !== -1) {
                         resolve(ev.target.response);
                     }
                     else {
-                        var err = new Error("[loadImageWithBlob] The image does not support get requests, responseStatus ".concat(responseStatus, ", '").concat(img, "'."));
+                        var err = new Error("The file does not support get requests, responseStatus ".concat(responseStatus, ", '").concat(file, "'."));
                         console.error(err);
                         reject(err);
                     }
                 })
                     .catch(function (err) {
-                    console.error(new Error("[loadImageWithBlob] Failed to request image. ".concat(err)));
+                    console.error(new Error("Failed to request file. ".concat(err)));
                     reject(err);
                 });
             }
         });
     }
+
     var cacheImage$2;
     var cacheResult$2;
     function loadImageWithBlob(img, useCache, ajaxOptions) {
@@ -1419,12 +1428,11 @@
                 resolve(cacheResult$2);
             }
             else {
-                getBlob(img, ajaxOptions)
+                getFileBlob(img, ajaxOptions)
                     .then(function (blob) {
                     var url = createObjectURL(blob);
                     var image = new Image();
                     image.onload = function () {
-                        revokeObjectURL(url);
                         var result = { blob: blob, image: image };
                         if (useCache) {
                             cacheImage$2 = img;
@@ -1487,7 +1495,13 @@
                 }
                 var outOffset = typeof offset === 'function' ? offset(info, options) : offset;
                 beforeDraw === null || beforeDraw === void 0 ? void 0 : beforeDraw(info, options);
-                ctx.drawImage(image, internalOffset[0] + toNumber(outOffset[0]), internalOffset[1] + toNumber(outOffset[1]), image.width, image.height);
+                var dx = internalOffset[0] + toNumber(outOffset[0]);
+                var dy = internalOffset[1] + toNumber(outOffset[1]);
+                ctx.drawImage(image, dx, dy, image.width, image.height);
+                if (type === 'image/png') {
+                    ctx.globalCompositeOperation = 'destination-in';
+                    ctx.drawImage(image, dx, dy, image.width, image.height);
+                }
                 afterDraw === null || afterDraw === void 0 ? void 0 : afterDraw(info, options);
                 if (format === 'blob') {
                     canvasToBlob(canvas, type, numQuality).then(resolve).catch(reject);
@@ -1636,9 +1650,6 @@
                     image_1.crossOrigin = 'anonymous';
                 }
                 image_1.onload = function () {
-                    if (imgIsBlob_1) {
-                        revokeObjectURL(url_1);
-                    }
                     if (useCache) {
                         cacheImage = img;
                         cacheResult = image_1;
@@ -1990,9 +2001,9 @@
         return internalFindTreeSelect(tree, predicate, childrenField);
     }
 
-    var VERSION = "4.20.8";
+    var VERSION = "4.21.1";
 
-    var version = "4.20.8";
+    var version = "4.21.1";
 
     exports.VERSION = VERSION;
     exports.ajax = ajax;
@@ -2012,6 +2023,7 @@
     exports.formatMobile = formatMobile;
     exports.formatMoney = formatMoney;
     exports.gcd = gcd;
+    exports.getFileBlob = getFileBlob;
     exports.getImageInfo = getImageInfo;
     exports.isBankCard = isBankCard;
     exports.isBusinessLicense = isBusinessLicense;