atr-components 0.2.242 → 0.2.243

package/fesm2020/atr-components.mjs

@@ -173,6 +173,77 @@ var UserAction;
     UserAction[UserAction["SUPPERADD"] = 4] = "SUPPERADD";
 })(UserAction || (UserAction = {}));
 
+class SessionStorageUtil {
+    static getStorageKey(key) {
+        return atr_static_datas.STORAGE_PRE + key;
+    }
+    static putDictGroup(dictGroup) {
+        let str = sessionStorage.getItem(this.getStorageKey('USER_INFO_') + ToolsUtil.getOrgCode());
+        let dicts = {};
+        // console.log("fff");
+        if (str) {
+            dicts = JSON.parse(str);
+        }
+        dicts[dictGroup.groupCode] = dictGroup;
+        if (dicts) {
+            sessionStorage.setItem(this.getStorageKey('USER_INFO_') + ToolsUtil.getOrgCode(), JSON.stringify(dicts));
+        }
+    }
+    static getDictGroupByCode(code) {
+        // console.log("jjj")
+        let str = sessionStorage.getItem(this.getStorageKey('USER_INFO_') + ToolsUtil.getOrgCode());
+        let dicts = null;
+        if (str) {
+            dicts = JSON.parse(str);
+        }
+        if (dicts && dicts.hasOwnProperty(code))
+            return dicts[code];
+        else
+            return null;
+    }
+    static setImg(url, dataUrl) {
+        let str = sessionStorage.getItem(this.getStorageKey('IMG_CACH'));
+        let map = null;
+        if (str) {
+            map = JSON.parse(str);
+        }
+        if (!map) {
+            map = {};
+        }
+        if (url.indexOf("?") > 0) {
+            url = url.substring(0, url.indexOf("?"));
+        }
+        map[url] = dataUrl;
+        sessionStorage.setItem(this.getStorageKey('IMG_CACH'), JSON.stringify(map));
+    }
+    static getImg(url) {
+        // console.log("jjj")
+        let str = sessionStorage.getItem(this.getStorageKey('IMG_CACH'));
+        let map = null;
+        if (str) {
+            if (url.indexOf("?") > 0) {
+                url = url.substring(0, url.indexOf("?"));
+            }
+            map = JSON.parse(str)[url];
+        }
+        return map;
+    }
+    static resetDict() {
+        sessionStorage.removeItem(this.getStorageKey('USER_INFO_') + ToolsUtil.getOrgCode());
+    }
+    static put(key, value) {
+        sessionStorage.setItem(this.getStorageKey(key), JSON.stringify(value));
+    }
+    static get(key) {
+        let str = sessionStorage.getItem(this.getStorageKey(key));
+        let value = null;
+        if (str) {
+            value = JSON.parse(str);
+        }
+        return value;
+    }
+}
+
 class ToolsUtil {
     static isBase64(string) {
         let reg = /^\s*data:([a-z]+\/[a-z0-9-+.]+(;[a-z-]+=[a-z0-9-]+)?)?(;base64)?,([a-z0-9!$&',()*+;=\-._~:@\/?%\s]*?)\s*$/i;
@@ -495,6 +566,37 @@ class ToolsUtil {
         // a.download = "3321.xls";
         a.click();
     }
+    static getImg(url, param = {
+        imgW: 0, imgH: 0,
+        needTime: false, isFullUrl: false
+    }) {
+        return new Promise((resolve, reject) => {
+            let dataUrl = SessionStorageUtil.getImg(url);
+            let img = new Image();
+            img.setAttribute('crossOrigin', 'anonymous');
+            if (!dataUrl) {
+                img.src = param.isFullUrl ? url : ToolsUtil.getOssUrl(url, param.needTime);
+            }
+            else {
+                let index = dataUrl.indexOf("}") + 1;
+                img.src = dataUrl.slice(0, 50) + dataUrl.slice(index);
+            }
+            img.onload = () => {
+                let c = document.createElement('canvas');
+                let context2 = c.getContext("2d");
+                c.width = param.imgW || img.width;
+                c.height = param.imgH || img.height;
+                context2.drawImage(img, 0, 0, c.width, c.height);
+                let dataUrl = c.toDataURL();
+                let str = c.width + "," + c.height + "}";
+                dataUrl = dataUrl.slice(0, 50) + str + dataUrl.slice(50);
+                console.log('getImg', dataUrl);
+                //不保存
+                //         SessionStorageUtil.setImg(url, dataUrl)
+                resolve(img);
+            };
+        });
+    }
     static pixelToNum(width) {
         const re = /px/gi;
         let widthStr = width.replace(re, "");
@@ -1571,50 +1673,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
                 }]
         }] });
 
-class SessionStorageUtil {
-    static getStorageKey(key) {
-        return atr_static_datas.STORAGE_PRE + key;
-    }
-    static putDictGroup(dictGroup) {
-        let str = sessionStorage.getItem(this.getStorageKey('USER_INFO_') + ToolsUtil.getOrgCode());
-        let dicts = {};
-        // console.log("fff");
-        if (str) {
-            dicts = JSON.parse(str);
-        }
-        dicts[dictGroup.groupCode] = dictGroup;
-        if (dicts) {
-            sessionStorage.setItem(this.getStorageKey('USER_INFO_') + ToolsUtil.getOrgCode(), JSON.stringify(dicts));
-        }
-    }
-    static getDictGroupByCode(code) {
-        // console.log("jjj")
-        let str = sessionStorage.getItem(this.getStorageKey('USER_INFO_') + ToolsUtil.getOrgCode());
-        let dicts = null;
-        if (str) {
-            dicts = JSON.parse(str);
-        }
-        if (dicts && dicts.hasOwnProperty(code))
-            return dicts[code];
-        else
-            return null;
-    }
-    static resetDict() {
-        sessionStorage.removeItem(this.getStorageKey('USER_INFO_') + ToolsUtil.getOrgCode());
-    }
-    static put(key, value) {
-        sessionStorage.setItem(this.getStorageKey(key), JSON.stringify(value));
-    }
-    static get(key) {
-        let str = sessionStorage.getItem(this.getStorageKey(key));
-        let value = null;
-        if (str) {
-            value = JSON.parse(str);
-        }
-        return value;
-    }
-}
-
 class DictService {
     constructor(httpService) {
         this.httpService = httpService;
@@ -4836,28 +4894,19 @@ class ImgCanvasComponent {
             return;
         //获得 2d 上下文对象
         let context1 = this.canvasDom.getContext('2d');
-        let image = this.imgUrl;
-        this.img = new Image(); //创建img元素
-        this.img.setAttribute('crossOrigin', 'anonymous');
-        this.img.src = this.imgUrl; //设置图片源地址
-        // this.img.src = ToolsUtil.getOssUrl(this.imgUrl);//设置图片源地址
-        this.img.onload = () => {
-            this.initBase(context1);
+        ToolsUtil.getImg(this.imgUrl, { isFullUrl: true }).then(img => {
+            this.img = img;
+            const { imgW, imgH } = this.getCanvasFull();
+            this.canvasDom.width = this.width;
+            this.canvasDom.height = this.height;
+            if (this.clipArr && this.clipArr.length > 0) {
+                this.goClip(context1);
+            }
+            // 参数 1：要绘制的 img   参数 2、3：绘制的 img 在 canvas 中的坐标 参数4,5是width，height
+            console.log("图片加载完毕 typeof", typeof this.img, Object.prototype.toString.call(this.img));
+            context1.drawImage(this.img, 0, 0, this.width, this.height);
             this.loadOver.emit({ code: 'loadOver' });
-        };
-    }
-    initBase(context1) {
-        console.log("图片加载完毕", this.img.height);
-        console.log("图片加载完毕", this.img.width);
-        const { imgW, imgH } = this.getCanvasFull();
-        this.canvasDom.width = this.width;
-        this.canvasDom.height = this.height;
-        if (this.clipArr && this.clipArr.length > 0) {
-            this.goClip(context1);
-        }
-        // 参数 1：要绘制的 img   参数 2、3：绘制的 img 在 canvas 中的坐标 参数4,5是width，height
-        context1.drawImage(this.img, 0, 0, this.width, this.height);
-        console.log("图片加载完毕", this.canvasDom.width + "," + this.canvasDom.height);
+        });
     }
     goClip(context) {
         context.beginPath();