atr-components 0.2.236 → 0.2.238

package/fesm2020/atr-components.mjs

@@ -387,14 +387,37 @@ class ToolsUtil {
         }
         return date.getFullYear() + "-" + month + "-" + strDate + " " + hours + ":" + seconds;
     }
-    static getOssUrl(url) {
+    static getFormatDateHour(date) {
+        let month = date.getMonth() + 1;
+        let strDate = date.getDate();
+        let hours = date.getHours();
+        let seconds = date.getMinutes();
+        if (month <= 9) {
+            month = "0" + month;
+        }
+        if (strDate <= 9) {
+            strDate = "0" + strDate;
+        }
+        if (hours <= 9) {
+            hours = "0" + hours;
+        }
+        if (seconds <= 9) {
+            seconds = "0" + seconds;
+        }
+        return date.getFullYear() + "" + month + strDate + hours;
+    }
+    static getOssUrl(url, needTime = false) {
         if (!url) {
             return "";
         }
+        if (needTime) {
+            url = url + "?v=" + ToolsUtil.getFormatDateHour(new Date());
+        }
         if (url.startsWith("http")) {
             return url;
         }
-        return atr_static_datas.OSS_URL + url + "?v=" + new Date().getTime();
+        let result = atr_static_datas.OSS_URL + url;
+        return result;
     }
     static getStaticOssUrl(url) {
         if (!url) {
@@ -403,8 +426,7 @@ class ToolsUtil {
         if (url.startsWith("http")) {
             return url;
         }
-        let v = new Date().getTime();
-        return atr_static_datas.STATIC_OSS_URL + url + "?v=" + v;
+        return atr_static_datas.STATIC_OSS_URL + url;
     }
     static removeHtml(value) {
         if (!value) {
@@ -1814,8 +1836,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
 class OssImgPipe {
     constructor() {
     }
-    transform(value, isVideoCover = false) {
-        return isVideoCover ? ToolsUtil.getVideoCover(value) : ToolsUtil.getOssUrl(value);
+    transform(value, isVideoCover = false, needTime = false) {
+        return isVideoCover ? ToolsUtil.getVideoCover(value) : ToolsUtil.getOssUrl(value, needTime);
     }
 }
 OssImgPipe.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: OssImgPipe, deps: [], target: i0.ɵɵFactoryTarget.Pipe });
@@ -1909,8 +1931,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
         }] });
 
 class OssPipe {
-    transform(value, defaultVal) {
-        return ToolsUtil.getOssUrl(value);
+    transform(value, defaultVal, needTime = false) {
+        return ToolsUtil.getOssUrl(value, needTime);
     }
 }
 OssPipe.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: OssPipe, deps: [], target: i0.ɵɵFactoryTarget.Pipe });
@@ -4746,6 +4768,12 @@ class ImgCanvasComponent {
         this.clipArr = [];
     }
     set url(url) {
+        if (url && url.indexOf('?v=') < 0) {
+            if (url.indexOf("?") < 0) {
+                url += "?";
+            }
+            url += "v=" + new Date().getTime();
+        }
         this.imgUrl = url;
     }
     ngOnInit() {
@@ -4787,7 +4815,8 @@ class ImgCanvasComponent {
             imgH: imgH
         };
     }
-    initImg() {
+    initImg(needSession = true) {
+        let obj = SessionStorageUtil.get('appImg');
         this.canvasDom = this.canvas1.nativeElement;
         // this.canvasDom = document.getElementById(this.canvasId);
         //检测支持性
@@ -4795,24 +4824,39 @@ class ImgCanvasComponent {
             return;
         //获得 2d 上下文对象
         let context1 = this.canvasDom.getContext('2d');
+        let image = this.imgUrl;
+        // if (obj && needSession && obj[image]) {
+        //   //图片缓存在session中
+        //   this.img = obj[image]
+        //   this.initBase(context1)
+        //   return;
+        // }
+        if (!obj) {
+            obj = {};
+        }
         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 = () => {
-            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);
+            obj[image] = this.img;
+            SessionStorageUtil.put('appImg', obj);
+            this.initBase(context1);
         };
     }
+    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();
         context.moveTo(this.clipArr[0].x1, this.clipArr[0].y1);