util-helpers 4.20.2 → 4.20.4

package/esm/VERSION.js

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

package/esm/compressImage.js

@@ -11,8 +11,8 @@ function canvasToBlob(canvas, type, quality) {
 function compressImage(img, options) {
     if (options === void 0) { options = {}; }
     return new Promise(function (resolve, reject) {
-        var width = options.width, height = options.height, rotate = options.rotate, _a = options.offset, offset = _a === void 0 ? [0, 0] : _a, _b = options.cacheImage, cacheImage = _b === void 0 ? true : _b, _c = options.background, background = _c === void 0 ? '#fff' : _c, canvasWidth = options.canvasWidth, canvasHeight = options.canvasHeight, _d = options.format, format = _d === void 0 ? 'blob' : _d, _e = options.type, type = _e === void 0 ? 'image/jpeg' : _e, _f = options.quality, quality = _f === void 0 ? 0.8 : _f, beforeCompress = options.beforeCompress, beforeDraw = options.beforeDraw, afterDraw = options.afterDraw;
-        loadImageWithBlob(img, cacheImage)
+        var width = options.width, height = options.height, rotate = options.rotate, _a = options.offset, offset = _a === void 0 ? [0, 0] : _a, _b = options.cacheImage, cacheImage = _b === void 0 ? true : _b, _c = options.background, background = _c === void 0 ? '#fff' : _c, canvasWidth = options.canvasWidth, canvasHeight = options.canvasHeight, _d = options.format, format = _d === void 0 ? 'blob' : _d, _e = options.type, type = _e === void 0 ? 'image/jpeg' : _e, _f = options.quality, quality = _f === void 0 ? 0.8 : _f, beforeCompress = options.beforeCompress, beforeDraw = options.beforeDraw, afterDraw = options.afterDraw, ajaxOptions = options.ajaxOptions;
+        loadImageWithBlob(img, cacheImage, ajaxOptions)
             .then(function (_a) {
             var image = _a.image, blob = _a.blob;
             var numWidth = toNumber(width);

package/esm/getImageInfo.js

@@ -10,14 +10,14 @@ function calcContrast(w, h) {
 }
 var cacheImage;
 var cacheResult;
-function getImageInfo(img, useCache) {
+function getImageInfo(img, useCache, ajaxOptions) {
     if (useCache === void 0) { useCache = true; }
     return new Promise(function (resolve, reject) {
         if (useCache && cacheImage === img && cacheResult) {
             resolve(cacheResult);
         }
         else {
-            loadImageWithBlob(img, false)
+            loadImageWithBlob(img, false, ajaxOptions)
                 .then(function (_a) {
                 var image = _a.image, blob = _a.blob;
                 var width = image.width, height = image.height;

package/esm/index.js

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

package/esm/loadImageWithBlob.js

@@ -1,38 +1,44 @@
+import { __assign } from 'tslib';
 import { isBlob } from 'ut2';
 import ajax from './ajax.js';
 import { createObjectURL, revokeObjectURL } from './utils/native.js';
 
 var SuccessResponseStatus = [200, 304];
-function getBlob(img) {
+function getBlob(img, ajaxOptions) {
     return new Promise(function (resolve, reject) {
         if (isBlob(img)) {
             resolve(img);
         }
         else {
-            ajax(img, { responseType: 'blob' })
+            ajax(img, __assign({ responseType: 'blob' }, ajaxOptions))
                 .then(function (ev) {
                 var responseStatus = ev.target.status;
                 if (SuccessResponseStatus.indexOf(responseStatus) !== -1) {
                     resolve(ev.target.response);
                 }
                 else {
-                    reject(new Error("[loadImageWithBlob] The image does not support get requests, responseStatus ".concat(responseStatus, ", '").concat(img, "'.")));
+                    var err = new Error("[loadImageWithBlob] The image does not support get requests, responseStatus ".concat(responseStatus, ", '").concat(img, "'."));
+                    console.error(err);
+                    reject(err);
                 }
             })
-                .catch(reject);
+                .catch(function (err) {
+                console.error(new Error("[loadImageWithBlob] Failed to request image. ".concat(err)));
+                reject(err);
+            });
         }
     });
 }
 var cacheImage;
 var cacheResult;
-function loadImageWithBlob(img, useCache) {
+function loadImageWithBlob(img, useCache, ajaxOptions) {
     if (useCache === void 0) { useCache = true; }
     return new Promise(function (resolve, reject) {
         if (useCache && cacheImage === img && cacheResult) {
             resolve(cacheResult);
         }
         else {
-            getBlob(img)
+            getBlob(img, ajaxOptions)
                 .then(function (blob) {
                 var url = createObjectURL(blob);
                 var image = new Image();

package/lib/VERSION.js

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

package/lib/compressImage.js

@@ -13,8 +13,8 @@ function canvasToBlob(canvas, type, quality) {
 function compressImage(img, options) {
     if (options === void 0) { options = {}; }
     return new Promise(function (resolve, reject) {
-        var width = options.width, height = options.height, rotate = options.rotate, _a = options.offset, offset = _a === void 0 ? [0, 0] : _a, _b = options.cacheImage, cacheImage = _b === void 0 ? true : _b, _c = options.background, background = _c === void 0 ? '#fff' : _c, canvasWidth = options.canvasWidth, canvasHeight = options.canvasHeight, _d = options.format, format = _d === void 0 ? 'blob' : _d, _e = options.type, type = _e === void 0 ? 'image/jpeg' : _e, _f = options.quality, quality = _f === void 0 ? 0.8 : _f, beforeCompress = options.beforeCompress, beforeDraw = options.beforeDraw, afterDraw = options.afterDraw;
-        loadImageWithBlob(img, cacheImage)
+        var width = options.width, height = options.height, rotate = options.rotate, _a = options.offset, offset = _a === void 0 ? [0, 0] : _a, _b = options.cacheImage, cacheImage = _b === void 0 ? true : _b, _c = options.background, background = _c === void 0 ? '#fff' : _c, canvasWidth = options.canvasWidth, canvasHeight = options.canvasHeight, _d = options.format, format = _d === void 0 ? 'blob' : _d, _e = options.type, type = _e === void 0 ? 'image/jpeg' : _e, _f = options.quality, quality = _f === void 0 ? 0.8 : _f, beforeCompress = options.beforeCompress, beforeDraw = options.beforeDraw, afterDraw = options.afterDraw, ajaxOptions = options.ajaxOptions;
+        loadImageWithBlob(img, cacheImage, ajaxOptions)
             .then(function (_a) {
             var image = _a.image, blob = _a.blob;
             var numWidth = ut2.toNumber(width);

package/lib/getImageInfo.js

@@ -12,14 +12,14 @@ function calcContrast(w, h) {
 }
 var cacheImage;
 var cacheResult;
-function getImageInfo(img, useCache) {
+function getImageInfo(img, useCache, ajaxOptions) {
     if (useCache === void 0) { useCache = true; }
     return new Promise(function (resolve, reject) {
         if (useCache && cacheImage === img && cacheResult) {
             resolve(cacheResult);
         }
         else {
-            loadImageWithBlob(img, false)
+            loadImageWithBlob(img, false, ajaxOptions)
                 .then(function (_a) {
                 var image = _a.image, blob = _a.blob;
                 var width = image.width, height = image.height;

package/lib/index.js

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

package/lib/loadImageWithBlob.js

@@ -1,40 +1,46 @@
 'use strict';
 
+var tslib = require('tslib');
 var ut2 = require('ut2');
 var ajax = require('./ajax.js');
 var native = require('./utils/native.js');
 
 var SuccessResponseStatus = [200, 304];
-function getBlob(img) {
+function getBlob(img, ajaxOptions) {
     return new Promise(function (resolve, reject) {
         if (ut2.isBlob(img)) {
             resolve(img);
         }
         else {
-            ajax(img, { responseType: 'blob' })
+            ajax(img, tslib.__assign({ responseType: 'blob' }, ajaxOptions))
                 .then(function (ev) {
                 var responseStatus = ev.target.status;
                 if (SuccessResponseStatus.indexOf(responseStatus) !== -1) {
                     resolve(ev.target.response);
                 }
                 else {
-                    reject(new Error("[loadImageWithBlob] The image does not support get requests, responseStatus ".concat(responseStatus, ", '").concat(img, "'.")));
+                    var err = new Error("[loadImageWithBlob] The image does not support get requests, responseStatus ".concat(responseStatus, ", '").concat(img, "'."));
+                    console.error(err);
+                    reject(err);
                 }
             })
-                .catch(reject);
+                .catch(function (err) {
+                console.error(new Error("[loadImageWithBlob] Failed to request image. ".concat(err)));
+                reject(err);
+            });
         }
     });
 }
 var cacheImage;
 var cacheResult;
-function loadImageWithBlob(img, useCache) {
+function loadImageWithBlob(img, useCache, ajaxOptions) {
     if (useCache === void 0) { useCache = true; }
     return new Promise(function (resolve, reject) {
         if (useCache && cacheImage === img && cacheResult) {
             resolve(cacheResult);
         }
         else {
-            getBlob(img)
+            getBlob(img, ajaxOptions)
                 .then(function (blob) {
                 var url = native.createObjectURL(blob);
                 var image = new Image();

package/package.json

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

package/types/compressImage.d.ts

@@ -1,3 +1,4 @@
+import loadImageWithBlob from './loadImageWithBlob';
 type Info = {
     image: HTMLImageElement;
     blob: Blob;
@@ -9,7 +10,6 @@ type Options = {
     height?: number;
     rotate?: number;
     offset?: [number, number] | ((info: Info, options: Options) => [number, number]);
-    cacheImage?: boolean;
     background?: string;
     canvasWidth?: number | ((info: Info, options: Options) => number);
     canvasHeight?: number | ((info: Info, options: Options) => number);
@@ -19,6 +19,8 @@ type Options = {
     beforeCompress?: (imageWithBlob: Pick<Info, 'image' | 'blob'>, options: Options) => void;
     beforeDraw?: (info: Info, options: Options) => void;
     afterDraw?: (info: Info, options: Options) => void;
+    cacheImage?: boolean;
+    ajaxOptions?: Parameters<typeof loadImageWithBlob>[2];
 };
 declare function compressImage(img: string | Blob, options: Omit<Options, 'format'> & {
     format: 'dataURL';

package/types/getImageInfo.d.ts

@@ -1,3 +1,4 @@
+import loadImageWithBlob from './loadImageWithBlob';
 /**
  * 获取图片信息。
  *
@@ -8,6 +9,7 @@
  * @since 4.20.0
  * @param {string | Blob} img 图片地址或 blob 对象
  * @param {boolean} [useCache=true] 缓存最近一次成功结果，当图片地址或 blob 对象一致时，直接返回该缓存。避免连续请求同一个图片资源，重复加载问题。
+ * @param {AjaxOptions} [ajaxOptions] ajax 请求配置项，当传入的图片为字符串时才会触发请求。
  * @returns {Promise<ImageInfo>} 图片信息
  * @example
  *
@@ -24,7 +26,7 @@
  * });
  *
  */
-declare function getImageInfo(img: string | Blob, useCache?: boolean): Promise<{
+declare function getImageInfo(img: string | Blob, useCache?: boolean, ajaxOptions?: Parameters<typeof loadImageWithBlob>[2]): Promise<{
     width: number;
     height: number;
     contrast: string;

package/types/loadImageWithBlob.d.ts

@@ -1,3 +1,4 @@
+import ajax from './ajax';
 /**
  * @typedef {Object} ImageWithBlob HTML图片元素和 blob 对象
  * @property {HTMLImageElement} image HTML图片元素
@@ -13,6 +14,7 @@
  * @since 4.20.0
  * @param {string | Blob} img 图片地址或 blob 对象
  * @param {boolean} [useCache=true] 缓存最近一次成功结果，当图片地址或 blob 对象一致时，直接返回该缓存。避免连续请求同一个图片资源，重复加载问题。
+ * @param {AjaxOptions} [ajaxOptions] ajax 请求配置项，当传入的图片为字符串时才会触发请求。
  * @returns {Promise<ImageWithBlob>} HTML图片元素和 blob 对象
  * @example
  *
@@ -29,7 +31,7 @@
  * });
  *
  */
-declare function loadImageWithBlob(img: string | Blob, useCache?: boolean): Promise<{
+declare function loadImageWithBlob(img: string | Blob, useCache?: boolean, ajaxOptions?: Parameters<typeof ajax>[1]): Promise<{
     image: HTMLImageElement;
     blob: Blob;
 }>;