util-helpers 4.21.1 → 4.21.3

package/dist/util-helpers.js

@@ -6,6 +6,7 @@
 
     var objectProto = Object.prototype;
     var objectProtoToString = objectProto.toString;
+    var objectKeys$1 = Object.keys;
     var symbolExisted = typeof Symbol !== 'undefined';
     var symbolProto = symbolExisted ? Symbol.prototype : undefined;
     var mathMin = Math.min;
@@ -18,6 +19,7 @@
     var numberTag = '[object Number]';
     var stringTag = '[object String]';
     var symbolTag = '[object Symbol]';
+    var functionTags = ['Function', 'AsyncFunction', 'GeneratorFunction', 'Proxy'].map(function (item) { return '[object ' + item + ']'; });
     var blobTag = '[object Blob]';
 
     function isArray(value) {
@@ -71,6 +73,54 @@
         return remainder ? result - remainder : result;
     }
 
+    function identity(value) {
+        return value;
+    }
+
+    function isFunction(value) {
+        if (typeof value === 'function') {
+            return true;
+        }
+        var tag = getTag(value);
+        return functionTags.some(function (item) { return item === tag; });
+    }
+
+    function isLength(value) {
+        return typeof value === 'number' && value > -1 && value % 1 === 0 && value <= MAX_SAFE_INTEGER;
+    }
+
+    function isArrayLike(value) {
+        return value != null && isLength(value.length) && !isFunction(value);
+    }
+
+    function keys(object) {
+        if (!isObject(object)) {
+            return [];
+        }
+        return objectKeys$1(object);
+    }
+
+    function createForEach(dir) {
+        function forEach(collection, iteratee) {
+            if (iteratee === void 0) { iteratee = identity; }
+            var _keys = !isArrayLike(collection) && keys(collection);
+            var len = (_keys || collection).length;
+            var i = dir > 0 ? 0 : len - 1;
+            while (i >= 0 && i < len) {
+                var currentKey = _keys ? _keys[i] : i;
+                if (iteratee(collection[currentKey], currentKey, collection) === false) {
+                    break;
+                }
+                i += dir;
+            }
+            return collection;
+        }
+        return forEach;
+    }
+
+    var forEach = createForEach(1);
+    var forEach$1 = forEach;
+
     function isNil(value) {
         return value == null;
     }
@@ -578,6 +628,20 @@
     ***************************************************************************** */
     /* global Reflect, Promise, SuppressedError, Symbol */
 
+    var extendStatics = function(d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+
+    function __extends(d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    }
 
     var __assign = function() {
         __assign = Object.assign || function __assign(t) {
@@ -1419,13 +1483,137 @@
         });
     }
 
-    var cacheImage$2;
-    var cacheResult$2;
-    function loadImageWithBlob(img, useCache, ajaxOptions) {
-        if (useCache === void 0) { useCache = true; }
+    var EmitterPro = /** @class */ (function () {
+        function EmitterPro() {
+            this.handler = {};
+        }
+        EmitterPro.prototype.eventNames = function () {
+            return Object.keys(this.handler);
+        };
+        EmitterPro.prototype.listeners = function (eventName) {
+            return this.handler[eventName] || [];
+        };
+        EmitterPro.prototype.hasListener = function (eventName, listener) {
+            return this.listeners(eventName).some(function (item) { return item === listener; });
+        };
+        EmitterPro.prototype.on = function (eventName, listener) {
+            if (!this.handler[eventName]) {
+                this.handler[eventName] = [listener];
+            }
+            else {
+                // 不允许添加相同的方法
+                if (!this.hasListener(eventName, listener)) {
+                    this.handler[eventName].push(listener);
+                }
+            }
+            return this;
+        };
+        EmitterPro.prototype.off = function (eventName, listener) {
+            if (this.handler[eventName]) {
+                if (typeof listener === 'function') {
+                    this.handler[eventName] = this.handler[eventName].filter(function (item) { return item !== listener; });
+                }
+                else {
+                    delete this.handler[eventName];
+                }
+            }
+            return this;
+        };
+        EmitterPro.prototype.emit = function (eventName) {
+            var args = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                args[_i - 1] = arguments[_i];
+            }
+            var listeners = this.listeners(eventName);
+            if (listeners.length > 0) {
+                listeners.forEach(function (listener) {
+                    // eslint-disable-next-line prefer-spread
+                    listener.apply(void 0, args);
+                });
+                return true;
+            }
+            return false;
+        };
+        EmitterPro.prototype.once = function (eventName, listener) {
+            var _this = this;
+            var wrap = function () {
+                var args = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    args[_i] = arguments[_i];
+                }
+                // eslint-disable-next-line prefer-spread
+                listener.apply(void 0, args);
+                _this.off(eventName, wrap);
+            };
+            return this.on(eventName, wrap);
+        };
+        EmitterPro.prototype.offAll = function () {
+            this.handler = {};
+            return this;
+        };
+        return EmitterPro;
+    }());
+
+    var Cache = (function (_super) {
+        __extends(Cache, _super);
+        function Cache(options) {
+            var _this = _super.call(this) || this;
+            _this.data = [];
+            _this.options = __assign({ max: 10 }, options);
+            return _this;
+        }
+        Cache.prototype.has = function (k) {
+            return !!this.data.find(function (item) { return item.k === k; });
+        };
+        Cache.prototype.get = function (k) {
+            var _a;
+            return (_a = this.data.find(function (item) { return item.k === k; })) === null || _a === void 0 ? void 0 : _a.v;
+        };
+        Cache.prototype.checkLimit = function () {
+            var _this = this;
+            if (this.options.max !== 0) {
+                var limit = this.data.length - this.options.max;
+                if (limit >= 0) {
+                    var delArr = this.data.splice(0, limit + 1);
+                    forEach$1(delArr, function (item) {
+                        _this.emit('del', item.v, item.k);
+                    });
+                }
+            }
+        };
+        Cache.prototype.set = function (k, v) {
+            var newData = { k: k, v: v };
+            if (this.has(k)) {
+                var index = this.data.findIndex(function (item) { return item.k === k; });
+                this.data.splice(index, 1, newData);
+            }
+            else {
+                this.checkLimit();
+                this.data.push(newData);
+            }
+        };
+        return Cache;
+    }(EmitterPro));
+
+    var cache$2 = new Cache({ max: 1 });
+    cache$2.on('del', function (v) {
+        if (v.r) {
+            try {
+                revokeObjectURL(v.data.image.src);
+            }
+            catch (_a) {
+            }
+        }
+    });
+    function loadImageWithBlob(img, cacheOptions, ajaxOptions) {
+        if (cacheOptions === void 0) { cacheOptions = true; }
+        var _cacheOptions = {
+            useCache: typeof cacheOptions === 'object' ? cacheOptions.useCache !== false : cacheOptions !== false,
+            autoRevokeOnDel: typeof cacheOptions === 'object' ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions
+        };
         return new Promise(function (resolve, reject) {
-            if (useCache && cacheImage$2 === img && cacheResult$2) {
-                resolve(cacheResult$2);
+            if (_cacheOptions.useCache && cache$2.has(img)) {
+                resolve(cache$2.get(img).data);
             }
             else {
                 getFileBlob(img, ajaxOptions)
@@ -1434,9 +1622,11 @@
                     var image = new Image();
                     image.onload = function () {
                         var result = { blob: blob, image: image };
-                        if (useCache) {
-                            cacheImage$2 = img;
-                            cacheResult$2 = result;
+                        if (_cacheOptions.useCache) {
+                            cache$2.set(img, {
+                                data: result,
+                                r: _cacheOptions.autoRevokeOnDel
+                            });
                         }
                         resolve(result);
                     };
@@ -1483,7 +1673,11 @@
                 var numCanvasHeight = toNumber(typeof canvasHeight === 'function' ? canvasHeight(info, options) : canvasHeight);
                 canvas.width = numCanvasWidth || image.width;
                 canvas.height = numCanvasHeight || image.height;
-                if (background && background !== 'none') {
+                var bgIsTransparent = background === 'none' || background === 'transparent';
+                if (bgIsTransparent) {
+                    ctx.clearRect(0, 0, canvas.width, canvas.height);
+                }
+                else {
                     ctx.fillStyle = background;
                     ctx.fillRect(0, 0, canvas.width, canvas.height);
                 }
@@ -1498,7 +1692,7 @@
                 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') {
+                if (type === 'image/png' && bgIsTransparent) {
                     ctx.globalCompositeOperation = 'destination-in';
                     ctx.drawImage(image, dx, dy, image.width, image.height);
                 }
@@ -1596,17 +1790,29 @@
         });
     }
 
+    var cache$1 = new Cache({ max: 1 });
+    cache$1.on('del', function (v) {
+        if (v.r) {
+            try {
+                revokeObjectURL(v.data.image.src);
+            }
+            catch (_a) {
+            }
+        }
+    });
     function calcContrast(w, h) {
         var n = gcd(w, h);
         return "".concat(divide(round(w), n), ":").concat(divide(round(h), n));
     }
-    var cacheImage$1;
-    var cacheResult$1;
-    function getImageInfo(img, useCache, ajaxOptions) {
-        if (useCache === void 0) { useCache = true; }
+    function getImageInfo(img, cacheOptions, ajaxOptions) {
+        if (cacheOptions === void 0) { cacheOptions = true; }
+        var _cacheOptions = {
+            useCache: typeof cacheOptions === 'object' ? cacheOptions.useCache !== false : cacheOptions !== false,
+            autoRevokeOnDel: typeof cacheOptions === 'object' ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions
+        };
         return new Promise(function (resolve, reject) {
-            if (useCache && cacheImage$1 === img && cacheResult$1) {
-                resolve(cacheResult$1);
+            if (_cacheOptions.useCache && cache$1.has(img)) {
+                resolve(cache$1.get(img).data);
             }
             else {
                 loadImageWithBlob(img, false, ajaxOptions)
@@ -1623,9 +1829,11 @@
                         image: image,
                         blob: blob
                     };
-                    if (useCache) {
-                        cacheImage$1 = img;
-                        cacheResult$1 = result;
+                    if (_cacheOptions.useCache) {
+                        cache$1.set(img, {
+                            data: result,
+                            r: _cacheOptions.autoRevokeOnDel
+                        });
                     }
                     resolve(result);
                 })
@@ -1634,13 +1842,25 @@
         });
     }
 
-    var cacheImage;
-    var cacheResult;
-    function loadImage(img, useCache) {
-        if (useCache === void 0) { useCache = true; }
+    var cache = new Cache({ max: 1 });
+    cache.on('del', function (v) {
+        if (v.r) {
+            try {
+                revokeObjectURL(v.data.src);
+            }
+            catch (_a) {
+            }
+        }
+    });
+    function loadImage(img, cacheOptions) {
+        if (cacheOptions === void 0) { cacheOptions = true; }
+        var _cacheOptions = {
+            useCache: typeof cacheOptions === 'object' ? cacheOptions.useCache !== false : cacheOptions !== false,
+            autoRevokeOnDel: typeof cacheOptions === 'object' ? cacheOptions.autoRevokeOnDel !== false : !!cacheOptions
+        };
         return new Promise(function (resolve, reject) {
-            if (useCache && cacheImage === img && cacheResult) {
-                resolve(cacheResult);
+            if (_cacheOptions.useCache && cache.has(img)) {
+                resolve(cache.get(img).data);
             }
             else {
                 var imgIsBlob_1 = isBlob(img);
@@ -1650,9 +1870,11 @@
                     image_1.crossOrigin = 'anonymous';
                 }
                 image_1.onload = function () {
-                    if (useCache) {
-                        cacheImage = img;
-                        cacheResult = image_1;
+                    if (_cacheOptions.useCache) {
+                        cache.set(img, {
+                            data: image_1,
+                            r: _cacheOptions.autoRevokeOnDel
+                        });
                     }
                     resolve(image_1);
                 };
@@ -1759,11 +1981,14 @@
                 if (childrenField && isArray(newItem[childrenField]) && newItem[childrenField].length > 0) {
                     newItem[childrenField] = recusion(newItem[childrenField].slice());
                 }
-                objectKeys(fieldNames).forEach(function (newKey) {
+                var newKeys = objectKeys(fieldNames);
+                newKeys.forEach(function (newKey) {
                     var oldKey = fieldNames[newKey];
                     if (oldKey in newItem) {
                         newItem[newKey] = newItem[oldKey];
-                        delKeys.push(oldKey);
+                        if (newKeys.indexOf(oldKey) === -1) {
+                            delKeys.push(oldKey);
+                        }
                     }
                 });
                 if (delKeys.length > 0) {
@@ -2001,9 +2226,9 @@
         return internalFindTreeSelect(tree, predicate, childrenField);
     }
 
-    var VERSION = "4.21.1";
+    var VERSION = "4.21.3";
 
-    var version = "4.21.1";
+    var version = "4.21.3";
 
     exports.VERSION = VERSION;
     exports.ajax = ajax;