atr-components 0.2.312 → 0.2.401

package/fesm2020/atr-components.mjs

@@ -1897,7 +1897,7 @@ class DictService {
     }
     async getCodeNameSync(keys, code, selectUrl, splitKey) {
         return new Promise((resolve, reject) => {
-            this.getDictByCodeSync(code, selectUrl).then(() => {
+            this.getCodeNamePromise(code, selectUrl).then(() => {
                 if (splitKey && keys) {
                     let result = [];
                     for (let item of keys.split(splitKey)) {
@@ -1941,6 +1941,34 @@ class DictService {
             });
         });
     }
+    async getCodeNamePromise(code, selectUrl) {
+        return new Promise(async (resolve, reject) => {
+            let dict = SessionStorageUtil.getDictGroupByCode(code);
+            if (dict) {
+                resolve(dict);
+            }
+            else {
+                if (commonDatas.await_Data[code]) {
+                    setTimeout(() => {
+                        this.getDictBycode(code, selectUrl).subscribe(res => {
+                            resolve(res);
+                        }, error => {
+                            resolve(error);
+                        });
+                    }, 500);
+                    return;
+                }
+                commonDatas.await_Data[code] = true;
+                this.getDicBycodeBase(code, selectUrl).subscribe(result => {
+                    resolve(result);
+                    commonDatas.await_Data[code] = false;
+                }, error => {
+                    resolve(error);
+                    commonDatas.await_Data[code] = false;
+                });
+            }
+        });
+    }
     getDictBycode(code, selectUrl) {
         // //console.log(code);
         return new Observable(observe => {
@@ -2009,7 +2037,7 @@ class DictsPipe {
         if (ToolsUtil.isNull(dictCode)) {
             return value;
         }
-        // return this.dictService.getCodeNameSync(value, dictCode)
+        // return this.dictService.getCodeNameSync(value, dictCode,null,splitKey )
         return this.dictService.getCodeNameSync(value, dictCode, null, splitKey).then(res => {
             return res;
         });
@@ -2104,7 +2132,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
 class OssImgPipe {
     constructor() {
     }
-    transform(value, param = { isVideoCover: false, needTime: true }) {
+    transform(value, param = { isVideoCover: false, needTime: false }) {
         return param.isVideoCover ? ToolsUtil.getVideoCover(value) : ToolsUtil.getOssUrl(value, param.needTime);
     }
 }
@@ -5063,6 +5091,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
 class ImgCanvasComponent {
     constructor(elementRef) {
         this.elementRef = elementRef;
+        this.needTime = false;
         this.width = 800;
         this.height = 800;
         this.clipArr = [];
@@ -5071,12 +5100,13 @@ class ImgCanvasComponent {
         this.needContextmenu = false;
     }
     set url(url) {
-        if (url && url.indexOf('?v=') < 0) {
-            if (url.indexOf("?") < 0) {
-                url += "?";
-            }
-            url += "v=" + new Date().getTime();
-        }
+        // if (url && url.indexOf('?v=') < 0) {
+        //   if (url.indexOf("?") < 0) {
+        //     url += "?";
+        //
+        //   }
+        //   url += "v=" + new Date().getTime()
+        // }
         this.imgUrl = url;
     }
     ngOnInit() {
@@ -5128,6 +5158,12 @@ class ImgCanvasComponent {
         let context1 = this.canvasDom.getContext('2d');
         let img = new Image();
         img.setAttribute('crossOrigin', 'anonymous');
+        if (this.needTime) {
+            if (this.imgUrl.indexOf("?") < 0) {
+                this.imgUrl += "?";
+            }
+            this.imgUrl += "v=" + new Date().getTime();
+        }
         img.src = this.imgUrl;
         img.onload = () => {
             this.img = img;
@@ -5161,11 +5197,13 @@ class ImgCanvasComponent {
     }
 }
 ImgCanvasComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: ImgCanvasComponent, deps: [{ token: i0.ElementRef }], target: i0.ɵɵFactoryTarget.Component });
-ImgCanvasComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.11", type: ImgCanvasComponent, selector: "app-img", inputs: { url: "url", clipArr: "clipArr", rotateNum: "rotateNum", needContextmenu: "needContextmenu" }, outputs: { loadOver: "loadOver" }, viewQueries: [{ propertyName: "canvas1", first: true, predicate: ["canvas1"], descendants: true }], ngImport: i0, template: "<canvas #canvas1 style=\"width: 100%;height: 100%;\" oncontextmenu=\"return needContextmenu\">\n  \u60A8\u7684\u6D4F\u89C8\u5668\u4E0D\u652F\u6301\u753B\u5E03\uFF01\n</canvas>\n<ng-content></ng-content>\n", styles: [""] });
+ImgCanvasComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.11", type: ImgCanvasComponent, selector: "app-img", inputs: { needTime: "needTime", url: "url", clipArr: "clipArr", rotateNum: "rotateNum", needContextmenu: "needContextmenu" }, outputs: { loadOver: "loadOver" }, viewQueries: [{ propertyName: "canvas1", first: true, predicate: ["canvas1"], descendants: true }], ngImport: i0, template: "<canvas #canvas1 style=\"width: 100%;height: 100%;\" oncontextmenu=\"return needContextmenu\">\n  \u60A8\u7684\u6D4F\u89C8\u5668\u4E0D\u652F\u6301\u753B\u5E03\uFF01\n</canvas>\n<ng-content></ng-content>\n", styles: [""] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: ImgCanvasComponent, decorators: [{
             type: Component,
             args: [{ selector: 'app-img', template: "<canvas #canvas1 style=\"width: 100%;height: 100%;\" oncontextmenu=\"return needContextmenu\">\n  \u60A8\u7684\u6D4F\u89C8\u5668\u4E0D\u652F\u6301\u753B\u5E03\uFF01\n</canvas>\n<ng-content></ng-content>\n", styles: [""] }]
-        }], ctorParameters: function () { return [{ type: i0.ElementRef }]; }, propDecorators: { url: [{
+        }], ctorParameters: function () { return [{ type: i0.ElementRef }]; }, propDecorators: { needTime: [{
+                type: Input
+            }], url: [{
                 type: Input
             }], canvas1: [{
                 type: ViewChild,