atr-components 0.2.312 → 0.2.401

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/core/services/dict/dict.service.d.ts +1 -0
  2. package/esm2020/core/pipe/dicts.pipe.mjs +2 -2
  3. package/esm2020/core/pipe/image-pipe.pipe.mjs +2 -2
  4. package/esm2020/core/services/dict/dict.service.mjs +30 -2
  5. package/esm2020/lib/shared/img-canvas/img-canvas.component.mjs +19 -9
  6. package/fesm2015/atr-components.mjs +51 -11
  7. package/fesm2015/atr-components.mjs.map +1 -1
  8. package/fesm2020/atr-components.mjs +49 -11
  9. package/fesm2020/atr-components.mjs.map +1 -1
  10. package/lib/shared/img-canvas/img-canvas.component.d.ts +2 -1
  11. package/package.json +1 -1
package/core/services/dict/dict.service.d.ts CHANGED
@@ -11,6 +11,7 @@ export declare class DictService {
11
11
  getByCode(code: string, selectUrl?: any): DictGroup;
12
12
  private getDictByCodeSync;
13
13
  getDicBycodeBase(code: any, selectUrl?: any): Observable<any>;
14
+ getCodeNamePromise(code: string, selectUrl?: any): Promise<unknown>;
14
15
  getDictBycode(code: string, selectUrl?: any): Observable<DictGroup>;
15
16
  modifyByCode(code: string): void;
16
17
  reset(): void;
package/esm2020/core/pipe/dicts.pipe.mjs CHANGED
@@ -10,7 +10,7 @@ export class DictsPipe {
10
10
  if (ToolsUtil.isNull(dictCode)) {
11
11
  return value;
12
12
  }
13
- // return this.dictService.getCodeNameSync(value, dictCode)
13
+ // return this.dictService.getCodeNameSync(value, dictCode,null,splitKey )
14
14
  return this.dictService.getCodeNameSync(value, dictCode, null, splitKey).then(res => {
15
15
  return res;
16
16
  });
@@ -25,4 +25,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
25
25
  name: 'dicts'
26
26
  }]
27
27
  }], ctorParameters: function () { return [{ type: i1.DictService }]; } });
28
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGljdHMucGlwZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2NvbXBvbmVudHMvc3JjL2NvcmUvcGlwZS9kaWN0cy5waXBlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBQyxJQUFJLEVBQWdCLE1BQU0sZUFBZSxDQUFDO0FBRWxELE9BQU8sRUFBQyxTQUFTLEVBQUMsTUFBTSxvQkFBb0IsQ0FBQzs7O0FBSTdDLE1BQU0sT0FBTyxTQUFTO0lBQ2xCLFlBQW9CLFdBQXdCO1FBQXhCLGdCQUFXLEdBQVgsV0FBVyxDQUFhO0lBQzVDLENBQUM7SUFFRCxTQUFTLENBQUMsS0FBVSxFQUFFLFFBQWEsRUFBQyxRQUFnQjtRQUNsRCxJQUFJLFNBQVMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEVBQUU7WUFDOUIsT0FBTyxLQUFLLENBQUE7U0FDYjtRQUNELDJEQUEyRDtRQUMzRCxPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUFDLEtBQUssRUFBRSxRQUFRLEVBQUMsSUFBSSxFQUFDLFFBQVEsQ0FBRSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRTtZQUNqRixPQUFPLEdBQUcsQ0FBQztRQUNiLENBQUMsQ0FBQyxDQUFBO1FBQ0YsZUFBZTtJQUNqQixDQUFDOzt1R0FiUSxTQUFTO3FHQUFULFNBQVM7NEZBQVQsU0FBUztrQkFIckIsSUFBSTttQkFBQztvQkFDRixJQUFJLEVBQUUsT0FBTztpQkFDaEIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1BpcGUsIFBpcGVUcmFuc2Zvcm19IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQge0RpY3RTZXJ2aWNlfSBmcm9tIFwiLi4vc2VydmljZXMvZGljdC9kaWN0LnNlcnZpY2VcIjtcclxuaW1wb3J0IHtUb29sc1V0aWx9IGZyb20gXCIuLi91dGlscy9Ub29sc1V0aWxcIjtcclxuQFBpcGUoe1xyXG4gICAgbmFtZTogJ2RpY3RzJ1xyXG59KVxyXG5leHBvcnQgY2xhc3MgRGljdHNQaXBlIGltcGxlbWVudHMgUGlwZVRyYW5zZm9ybSB7XHJcbiAgICBjb25zdHJ1Y3Rvcihwcml2YXRlIGRpY3RTZXJ2aWNlOiBEaWN0U2VydmljZSkge1xyXG4gICAgfVxyXG5cclxuICAgIHRyYW5zZm9ybSh2YWx1ZTogYW55LCBkaWN0Q29kZTogYW55LHNwbGl0S2V5PzpzdHJpbmcpIHtcclxuICAgICAgaWYgKFRvb2xzVXRpbC5pc051bGwoZGljdENvZGUpKSB7XHJcbiAgICAgICAgcmV0dXJuIHZhbHVlXHJcbiAgICAgIH1cclxuICAgICAgLy8gcmV0dXJuIHRoaXMuZGljdFNlcnZpY2UuZ2V0Q29kZU5hbWVTeW5jKHZhbHVlLCBkaWN0Q29kZSlcclxuICAgICAgcmV0dXJuIHRoaXMuZGljdFNlcnZpY2UuZ2V0Q29kZU5hbWVTeW5jKHZhbHVlLCBkaWN0Q29kZSxudWxsLHNwbGl0S2V5ICkudGhlbihyZXMgPT57XHJcbiAgICAgICAgcmV0dXJuIHJlcztcclxuICAgICAgfSlcclxuICAgICAgLy8gcmV0dXJuIFwi5rWL6K+VMVwiXHJcbiAgICB9XHJcblxyXG59XHJcbiJdfQ==
28
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGljdHMucGlwZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2NvbXBvbmVudHMvc3JjL2NvcmUvcGlwZS9kaWN0cy5waXBlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBQyxJQUFJLEVBQWdCLE1BQU0sZUFBZSxDQUFDO0FBRWxELE9BQU8sRUFBQyxTQUFTLEVBQUMsTUFBTSxvQkFBb0IsQ0FBQzs7O0FBSTdDLE1BQU0sT0FBTyxTQUFTO0lBQ2xCLFlBQW9CLFdBQXdCO1FBQXhCLGdCQUFXLEdBQVgsV0FBVyxDQUFhO0lBQzVDLENBQUM7SUFFRCxTQUFTLENBQUMsS0FBVSxFQUFFLFFBQWEsRUFBQyxRQUFnQjtRQUNsRCxJQUFJLFNBQVMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEVBQUU7WUFDOUIsT0FBTyxLQUFLLENBQUE7U0FDYjtRQUNELDBFQUEwRTtRQUMxRSxPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUFDLEtBQUssRUFBRSxRQUFRLEVBQUMsSUFBSSxFQUFDLFFBQVEsQ0FBRSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRTtZQUNqRixPQUFPLEdBQUcsQ0FBQztRQUNiLENBQUMsQ0FBQyxDQUFBO1FBQ0YsZUFBZTtJQUNqQixDQUFDOzt1R0FiUSxTQUFTO3FHQUFULFNBQVM7NEZBQVQsU0FBUztrQkFIckIsSUFBSTttQkFBQztvQkFDRixJQUFJLEVBQUUsT0FBTztpQkFDaEIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1BpcGUsIFBpcGVUcmFuc2Zvcm19IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQge0RpY3RTZXJ2aWNlfSBmcm9tIFwiLi4vc2VydmljZXMvZGljdC9kaWN0LnNlcnZpY2VcIjtcclxuaW1wb3J0IHtUb29sc1V0aWx9IGZyb20gXCIuLi91dGlscy9Ub29sc1V0aWxcIjtcclxuQFBpcGUoe1xyXG4gICAgbmFtZTogJ2RpY3RzJ1xyXG59KVxyXG5leHBvcnQgY2xhc3MgRGljdHNQaXBlIGltcGxlbWVudHMgUGlwZVRyYW5zZm9ybSB7XHJcbiAgICBjb25zdHJ1Y3Rvcihwcml2YXRlIGRpY3RTZXJ2aWNlOiBEaWN0U2VydmljZSkge1xyXG4gICAgfVxyXG5cclxuICAgIHRyYW5zZm9ybSh2YWx1ZTogYW55LCBkaWN0Q29kZTogYW55LHNwbGl0S2V5PzpzdHJpbmcpIHtcclxuICAgICAgaWYgKFRvb2xzVXRpbC5pc051bGwoZGljdENvZGUpKSB7XHJcbiAgICAgICAgcmV0dXJuIHZhbHVlXHJcbiAgICAgIH1cclxuICAgICAgLy8gcmV0dXJuIHRoaXMuZGljdFNlcnZpY2UuZ2V0Q29kZU5hbWVTeW5jKHZhbHVlLCBkaWN0Q29kZSxudWxsLHNwbGl0S2V5IClcclxuICAgICAgcmV0dXJuIHRoaXMuZGljdFNlcnZpY2UuZ2V0Q29kZU5hbWVTeW5jKHZhbHVlLCBkaWN0Q29kZSxudWxsLHNwbGl0S2V5ICkudGhlbihyZXMgPT57XHJcbiAgICAgICAgcmV0dXJuIHJlcztcclxuICAgICAgfSlcclxuICAgICAgLy8gcmV0dXJuIFwi5rWL6K+VMVwiXHJcbiAgICB9XHJcblxyXG59XHJcbiJdfQ==
package/esm2020/core/pipe/image-pipe.pipe.mjs CHANGED
@@ -4,7 +4,7 @@ import * as i0 from "@angular/core";
4
4
  export class OssImgPipe {
5
5
  constructor() {
6
6
  }
7
- transform(value, param = { isVideoCover: false, needTime: true }) {
7
+ transform(value, param = { isVideoCover: false, needTime: false }) {
8
8
  return param.isVideoCover ? ToolsUtil.getVideoCover(value) : ToolsUtil.getOssUrl(value, param.needTime);
9
9
  }
10
10
  }
@@ -14,4 +14,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
14
14
  type: Pipe,
15
15
  args: [{ name: 'ossImg' }]
16
16
  }], ctorParameters: function () { return []; } });
17
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1hZ2UtcGlwZS5waXBlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvY29tcG9uZW50cy9zcmMvY29yZS9waXBlL2ltYWdlLXBpcGUucGlwZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUMsSUFBSSxFQUFnQixNQUFNLGVBQWUsQ0FBQztBQUVsRCxPQUFPLEVBQUMsU0FBUyxFQUFDLE1BQU0sb0JBQW9CLENBQUM7O0FBRzdDLE1BQU0sT0FBTyxVQUFVO0lBQ3JCO0lBQ0EsQ0FBQztJQUVELFNBQVMsQ0FBQyxLQUFVLEVBQUUsUUFBWSxFQUFDLFlBQVksRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBQztRQUNyRSxPQUFPLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUMxRyxDQUFDOzt3R0FOVSxVQUFVO3NHQUFWLFVBQVU7NEZBQVYsVUFBVTtrQkFEdEIsSUFBSTttQkFBQyxFQUFDLElBQUksRUFBRSxRQUFRLEVBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1BpcGUsIFBpcGVUcmFuc2Zvcm19IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQge0RvbVNhbml0aXplcn0gZnJvbSAnQGFuZ3VsYXIvcGxhdGZvcm0tYnJvd3Nlcic7XHJcbmltcG9ydCB7VG9vbHNVdGlsfSBmcm9tIFwiLi4vdXRpbHMvVG9vbHNVdGlsXCI7XHJcblxyXG5AUGlwZSh7bmFtZTogJ29zc0ltZyd9KVxyXG5leHBvcnQgY2xhc3MgT3NzSW1nUGlwZSBpbXBsZW1lbnRzIFBpcGVUcmFuc2Zvcm0ge1xyXG4gIGNvbnN0cnVjdG9yKCkge1xyXG4gIH1cclxuXHJcbiAgdHJhbnNmb3JtKHZhbHVlOiBhbnksIHBhcmFtOmFueSA9IHtpc1ZpZGVvQ292ZXI6IGZhbHNlLCBuZWVkVGltZTogdHJ1ZX0pIHtcclxuICAgIHJldHVybiBwYXJhbS5pc1ZpZGVvQ292ZXIgPyBUb29sc1V0aWwuZ2V0VmlkZW9Db3Zlcih2YWx1ZSkgOiBUb29sc1V0aWwuZ2V0T3NzVXJsKHZhbHVlLCBwYXJhbS5uZWVkVGltZSk7XHJcbiAgfVxyXG59XHJcbiJdfQ==
17
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1hZ2UtcGlwZS5waXBlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvY29tcG9uZW50cy9zcmMvY29yZS9waXBlL2ltYWdlLXBpcGUucGlwZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUMsSUFBSSxFQUFnQixNQUFNLGVBQWUsQ0FBQztBQUVsRCxPQUFPLEVBQUMsU0FBUyxFQUFDLE1BQU0sb0JBQW9CLENBQUM7O0FBRzdDLE1BQU0sT0FBTyxVQUFVO0lBQ3JCO0lBQ0EsQ0FBQztJQUVELFNBQVMsQ0FBQyxLQUFVLEVBQUUsUUFBWSxFQUFDLFlBQVksRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBQztRQUN0RSxPQUFPLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUMxRyxDQUFDOzt3R0FOVSxVQUFVO3NHQUFWLFVBQVU7NEZBQVYsVUFBVTtrQkFEdEIsSUFBSTttQkFBQyxFQUFDLElBQUksRUFBRSxRQUFRLEVBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1BpcGUsIFBpcGVUcmFuc2Zvcm19IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQge0RvbVNhbml0aXplcn0gZnJvbSAnQGFuZ3VsYXIvcGxhdGZvcm0tYnJvd3Nlcic7XHJcbmltcG9ydCB7VG9vbHNVdGlsfSBmcm9tIFwiLi4vdXRpbHMvVG9vbHNVdGlsXCI7XHJcblxyXG5AUGlwZSh7bmFtZTogJ29zc0ltZyd9KVxyXG5leHBvcnQgY2xhc3MgT3NzSW1nUGlwZSBpbXBsZW1lbnRzIFBpcGVUcmFuc2Zvcm0ge1xyXG4gIGNvbnN0cnVjdG9yKCkge1xyXG4gIH1cclxuXHJcbiAgdHJhbnNmb3JtKHZhbHVlOiBhbnksIHBhcmFtOmFueSA9IHtpc1ZpZGVvQ292ZXI6IGZhbHNlLCBuZWVkVGltZTogZmFsc2V9KSB7XHJcbiAgICByZXR1cm4gcGFyYW0uaXNWaWRlb0NvdmVyID8gVG9vbHNVdGlsLmdldFZpZGVvQ292ZXIodmFsdWUpIDogVG9vbHNVdGlsLmdldE9zc1VybCh2YWx1ZSwgcGFyYW0ubmVlZFRpbWUpO1xyXG4gIH1cclxufVxyXG4iXX0=
package/esm2020/core/services/dict/dict.service.mjs CHANGED
@@ -18,7 +18,7 @@ export class DictService {
18
18
  }
19
19
  async getCodeNameSync(keys, code, selectUrl, splitKey) {
20
20
  return new Promise((resolve, reject) => {
21
- this.getDictByCodeSync(code, selectUrl).then(() => {
21
+ this.getCodeNamePromise(code, selectUrl).then(() => {
22
22
  if (splitKey && keys) {
23
23
  let result = [];
24
24
  for (let item of keys.split(splitKey)) {
@@ -62,6 +62,34 @@ export class DictService {
62
62
  });
63
63
  });
64
64
  }
65
+ async getCodeNamePromise(code, selectUrl) {
66
+ return new Promise(async (resolve, reject) => {
67
+ let dict = SessionStorageUtil.getDictGroupByCode(code);
68
+ if (dict) {
69
+ resolve(dict);
70
+ }
71
+ else {
72
+ if (commonDatas.await_Data[code]) {
73
+ setTimeout(() => {
74
+ this.getDictBycode(code, selectUrl).subscribe(res => {
75
+ resolve(res);
76
+ }, error => {
77
+ resolve(error);
78
+ });
79
+ }, 500);
80
+ return;
81
+ }
82
+ commonDatas.await_Data[code] = true;
83
+ this.getDicBycodeBase(code, selectUrl).subscribe(result => {
84
+ resolve(result);
85
+ commonDatas.await_Data[code] = false;
86
+ }, error => {
87
+ resolve(error);
88
+ commonDatas.await_Data[code] = false;
89
+ });
90
+ }
91
+ });
92
+ }
65
93
  getDictBycode(code, selectUrl) {
66
94
  // //console.log(code);
67
95
  return new Observable(observe => {
@@ -121,4 +149,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
121
149
  providedIn: 'root'
122
150
  }]
123
151
  }], ctorParameters: function () { return [{ type: i1.HttpService }]; } });
124
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dict.service.js","sourceRoot":"","sources":["../../../../../../projects/components/src/core/services/dict/dict.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {Injectable} from '@angular/core';\r\nimport {HttpService} from '../http.service';\r\nimport {Observable} from 'rxjs';\r\nimport {atr_static_datas, commonDatas, DictGroup} from '../../base/atr-common';\r\nimport {SessionStorageUtil} from '../../utils/sessionstorage.util';\r\n\r\n@Injectable({\r\n  providedIn: 'root'\r\n})\r\nexport class DictService {\r\n  static await_Data = {};\r\n\r\n  constructor(private httpService: HttpService) {\r\n  }\r\n\r\n  getCodeName(code: string, value: string) {\r\n    let dict = SessionStorageUtil.getDictGroupByCode(code);\r\n    if (dict) {\r\n      let cur = dict.dicts.filter((v: any) => v.id == value)[0]\r\n      return cur ? cur.typeName : value;\r\n    }\r\n    return value;\r\n  }\r\n\r\n  async getCodeNameSync(keys: any, code: string, selectUrl?: any, splitKey?: string) {\r\n    return new Promise((resolve, reject) => {\r\n      this.getDictByCodeSync(code, selectUrl).then(() => {\r\n        if (splitKey && keys) {\r\n          let result = []\r\n          for (let item of keys.split(splitKey)) {\r\n            result.push(this.getCodeName(code, item));\r\n          }\r\n          resolve(result.join(splitKey));\r\n        } else {\r\n          let result = this.getCodeName(code, keys);\r\n          resolve(result);\r\n        }\r\n      })\r\n    })\r\n  }\r\n\r\n  getByCode(code: string, selectUrl?: any): DictGroup {\r\n    this.getDictByCodeSync(code, selectUrl);\r\n    return SessionStorageUtil.getDictGroupByCode(code);\r\n  }\r\n\r\n  private async getDictByCodeSync(code: string, selectUrl?: any) {\r\n    await this.getDictBycode(code, selectUrl).subscribe()\r\n  }\r\n\r\n  getDicBycodeBase(code: any, selectUrl?: any) {\r\n    return new Observable<any>(observe => {\r\n      let options = {\r\n        isCommonHttpHeader: true\r\n      };\r\n      this.httpService.post(selectUrl || atr_static_datas.dic_url, {groupCode: code}, options).subscribe(\r\n        result => {\r\n          let data: DictGroup | any = null;\r\n          if (result.status == 200) {\r\n            data = {\r\n              groupCode: code,\r\n              dicts: result.data\r\n            };\r\n            SessionStorageUtil.putDictGroup(data);\r\n          }\r\n          observe.next(data);\r\n          observe.unsubscribe()\r\n        },\r\n        error => {\r\n          observe.error(error);\r\n          observe.unsubscribe()\r\n        }\r\n      )\r\n    })\r\n  }\r\n\r\n  getDictBycode(code: string, selectUrl?: any): Observable<DictGroup> {\r\n    // //console.log(code);\r\n\r\n    return new Observable<any>(observe => {\r\n      let dict = SessionStorageUtil.getDictGroupByCode(code);\r\n      if (dict) {\r\n        observe.next(dict);\r\n        observe.unsubscribe()\r\n      } else {\r\n        if (commonDatas.await_Data[code]) {\r\n          setTimeout(() => {\r\n            this.getDictBycode(code, selectUrl).subscribe(res => {\r\n              observe.next(res);\r\n              observe.unsubscribe()\r\n            }, error => {\r\n              observe.next(error);\r\n              observe.unsubscribe()\r\n            })\r\n          }, 500)\r\n          return\r\n        }\r\n        commonDatas.await_Data[code] = true;\r\n        this.getDicBycodeBase(code, selectUrl).subscribe(result => {\r\n          observe.next(result);\r\n          observe.unsubscribe()\r\n          commonDatas.await_Data[code] = false;\r\n        }, error => {\r\n          observe.next(error);\r\n          observe.unsubscribe();\r\n          commonDatas.await_Data[code] = false;\r\n        })\r\n\r\n      }\r\n    })\r\n  }\r\n\r\n  modifyByCode(code: string) {\r\n    this.httpService.post(atr_static_datas.dic_url, {groupCode: code}, {isCommonHttpHeader: true}).subscribe(\r\n      result => {\r\n        let data: DictGroup | any = null;\r\n        if (result.status == 200) {\r\n          data = {\r\n            groupCode: code,\r\n            dicts: result.data\r\n          };\r\n          SessionStorageUtil.putDictGroup(data);\r\n        }\r\n      },\r\n    )\r\n  }\r\n\r\n  reset() {\r\n    SessionStorageUtil.resetDict();\r\n  }\r\n}\r\n"]}
152
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dict.service.js","sourceRoot":"","sources":["../../../../../../projects/components/src/core/services/dict/dict.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAC,UAAU,EAAC,MAAM,MAAM,CAAC;AAChC,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAY,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAC,kBAAkB,EAAC,MAAM,iCAAiC,CAAC;;;AAKnE,MAAM,OAAO,WAAW;IAGtB,YAAoB,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAC5C,CAAC;IAED,WAAW,CAAC,IAAY,EAAE,KAAa;QACrC,IAAI,IAAI,GAAG,kBAAkB,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,IAAI,EAAE;YACR,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YACzD,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;SACnC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,IAAS,EAAE,IAAY,EAAE,SAAe,EAAE,QAAiB;QAC/E,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;gBACjD,IAAI,QAAQ,IAAI,IAAI,EAAE;oBACpB,IAAI,MAAM,GAAG,EAAE,CAAA;oBACf,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;wBACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;qBAC3C;oBACD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;iBAChC;qBAAM;oBACL,IAAI,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oBAC1C,OAAO,CAAC,MAAM,CAAC,CAAC;iBACjB;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,SAAS,CAAC,IAAY,EAAE,SAAe;QACrC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACxC,OAAO,kBAAkB,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACrD,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,IAAY,EAAE,SAAe;QAC3D,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,SAAS,EAAE,CAAA;IACvD,CAAC;IAED,gBAAgB,CAAC,IAAS,EAAE,SAAe;QACzC,OAAO,IAAI,UAAU,CAAM,OAAO,CAAC,EAAE;YACnC,IAAI,OAAO,GAAG;gBACZ,kBAAkB,EAAE,IAAI;aACzB,CAAC;YACF,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,IAAI,gBAAgB,CAAC,OAAO,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,EAAE,OAAO,CAAC,CAAC,SAAS,CAChG,MAAM,CAAC,EAAE;gBACP,IAAI,IAAI,GAAoB,IAAI,CAAC;gBACjC,IAAI,MAAM,CAAC,MAAM,IAAI,GAAG,EAAE;oBACxB,IAAI,GAAG;wBACL,SAAS,EAAE,IAAI;wBACf,KAAK,EAAE,MAAM,CAAC,IAAI;qBACnB,CAAC;oBACF,kBAAkB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;iBACvC;gBACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnB,OAAO,CAAC,WAAW,EAAE,CAAA;YACvB,CAAC,EACD,KAAK,CAAC,EAAE;gBACN,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACrB,OAAO,CAAC,WAAW,EAAE,CAAA;YACvB,CAAC,CACF,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,IAAY,EAAE,SAAe;QACpD,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,IAAI,IAAI,GAAG,kBAAkB,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;YACvD,IAAI,IAAI,EAAE;gBACR,OAAO,CAAC,IAAI,CAAC,CAAC;aACf;iBAAM;gBACL,IAAI,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;oBAChC,UAAU,CAAC,GAAG,EAAE;wBACd,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;4BAClD,OAAO,CAAC,GAAG,CAAC,CAAC;wBACf,CAAC,EAAE,KAAK,CAAC,EAAE;4BACT,OAAO,CAAC,KAAK,CAAC,CAAC;wBACjB,CAAC,CAAC,CAAA;oBACJ,CAAC,EAAE,GAAG,CAAC,CAAA;oBACP,OAAM;iBACP;gBACD,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;gBACpC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;oBACxD,OAAO,CAAC,MAAM,CAAC,CAAC;oBAChB,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;gBACvC,CAAC,EAAE,KAAK,CAAC,EAAE;oBACT,OAAO,CAAC,KAAK,CAAC,CAAC;oBACf,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;gBACvC,CAAC,CAAC,CAAA;aAEH;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,aAAa,CAAC,IAAY,EAAE,SAAe;QACzC,uBAAuB;QAEvB,OAAO,IAAI,UAAU,CAAM,OAAO,CAAC,EAAE;YACnC,IAAI,IAAI,GAAG,kBAAkB,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;YACvD,IAAI,IAAI,EAAE;gBACR,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnB,OAAO,CAAC,WAAW,EAAE,CAAA;aACtB;iBAAM;gBACL,IAAI,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;oBAChC,UAAU,CAAC,GAAG,EAAE;wBACd,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;4BAClD,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;4BAClB,OAAO,CAAC,WAAW,EAAE,CAAA;wBACvB,CAAC,EAAE,KAAK,CAAC,EAAE;4BACT,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;4BACpB,OAAO,CAAC,WAAW,EAAE,CAAA;wBACvB,CAAC,CAAC,CAAA;oBACJ,CAAC,EAAE,GAAG,CAAC,CAAA;oBACP,OAAM;iBACP;gBACD,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;gBACpC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;oBACxD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBACrB,OAAO,CAAC,WAAW,EAAE,CAAA;oBACrB,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;gBACvC,CAAC,EAAE,KAAK,CAAC,EAAE;oBACT,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACpB,OAAO,CAAC,WAAW,EAAE,CAAC;oBACtB,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;gBACvC,CAAC,CAAC,CAAA;aAEH;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,YAAY,CAAC,IAAY;QACvB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,EAAE,EAAC,kBAAkB,EAAE,IAAI,EAAC,CAAC,CAAC,SAAS,CACtG,MAAM,CAAC,EAAE;YACP,IAAI,IAAI,GAAoB,IAAI,CAAC;YACjC,IAAI,MAAM,CAAC,MAAM,IAAI,GAAG,EAAE;gBACxB,IAAI,GAAG;oBACL,SAAS,EAAE,IAAI;oBACf,KAAK,EAAE,MAAM,CAAC,IAAI;iBACnB,CAAC;gBACF,kBAAkB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;aACvC;QACH,CAAC,CACF,CAAA;IACH,CAAC;IAED,KAAK;QACH,kBAAkB,CAAC,SAAS,EAAE,CAAC;IACjC,CAAC;;AApJM,sBAAU,GAAG,EAAE,CAAC;yGADZ,WAAW;6GAAX,WAAW,cAFV,MAAM;4FAEP,WAAW;kBAHvB,UAAU;mBAAC;oBACV,UAAU,EAAE,MAAM;iBACnB","sourcesContent":["import {Injectable} from '@angular/core';\r\nimport {HttpService} from '../http.service';\r\nimport {Observable} from 'rxjs';\r\nimport {atr_static_datas, commonDatas, DictGroup} from '../../base/atr-common';\r\nimport {SessionStorageUtil} from '../../utils/sessionstorage.util';\r\n\r\n@Injectable({\r\n  providedIn: 'root'\r\n})\r\nexport class DictService {\r\n  static await_Data = {};\r\n\r\n  constructor(private httpService: HttpService) {\r\n  }\r\n\r\n  getCodeName(code: string, value: string) {\r\n    let dict = SessionStorageUtil.getDictGroupByCode(code);\r\n    if (dict) {\r\n      let cur = dict.dicts.filter((v: any) => v.id == value)[0]\r\n      return cur ? cur.typeName : value;\r\n    }\r\n    return value;\r\n  }\r\n\r\n  async getCodeNameSync(keys: any, code: string, selectUrl?: any, splitKey?: string) {\r\n    return new Promise((resolve, reject) => {\r\n      this.getCodeNamePromise(code, selectUrl).then(() => {\r\n        if (splitKey && keys) {\r\n          let result = []\r\n          for (let item of keys.split(splitKey)) {\r\n            result.push(this.getCodeName(code, item));\r\n          }\r\n          resolve(result.join(splitKey));\r\n        } else {\r\n          let result = this.getCodeName(code, keys);\r\n          resolve(result);\r\n        }\r\n      })\r\n    })\r\n  }\r\n\r\n  getByCode(code: string, selectUrl?: any): DictGroup {\r\n    this.getDictByCodeSync(code, selectUrl);\r\n    return SessionStorageUtil.getDictGroupByCode(code);\r\n  }\r\n\r\n  private async getDictByCodeSync(code: string, selectUrl?: any) {\r\n    await this.getDictBycode(code, selectUrl).subscribe()\r\n  }\r\n\r\n  getDicBycodeBase(code: any, selectUrl?: any) {\r\n    return new Observable<any>(observe => {\r\n      let options = {\r\n        isCommonHttpHeader: true\r\n      };\r\n      this.httpService.post(selectUrl || atr_static_datas.dic_url, {groupCode: code}, options).subscribe(\r\n        result => {\r\n          let data: DictGroup | any = null;\r\n          if (result.status == 200) {\r\n            data = {\r\n              groupCode: code,\r\n              dicts: result.data\r\n            };\r\n            SessionStorageUtil.putDictGroup(data);\r\n          }\r\n          observe.next(data);\r\n          observe.unsubscribe()\r\n        },\r\n        error => {\r\n          observe.error(error);\r\n          observe.unsubscribe()\r\n        }\r\n      )\r\n    })\r\n  }\r\n\r\n  async getCodeNamePromise(code: string, selectUrl?: any) {\r\n    return new Promise(async (resolve, reject) => {\r\n      let dict = SessionStorageUtil.getDictGroupByCode(code);\r\n      if (dict) {\r\n        resolve(dict);\r\n      } else {\r\n        if (commonDatas.await_Data[code]) {\r\n          setTimeout(() => {\r\n            this.getDictBycode(code, selectUrl).subscribe(res => {\r\n              resolve(res);\r\n            }, error => {\r\n              resolve(error);\r\n            })\r\n          }, 500)\r\n          return\r\n        }\r\n        commonDatas.await_Data[code] = true;\r\n        this.getDicBycodeBase(code, selectUrl).subscribe(result => {\r\n          resolve(result);\r\n          commonDatas.await_Data[code] = false;\r\n        }, error => {\r\n          resolve(error);\r\n          commonDatas.await_Data[code] = false;\r\n        })\r\n\r\n      }\r\n    })\r\n  }\r\n\r\n  getDictBycode(code: string, selectUrl?: any): Observable<DictGroup> {\r\n    // //console.log(code);\r\n\r\n    return new Observable<any>(observe => {\r\n      let dict = SessionStorageUtil.getDictGroupByCode(code);\r\n      if (dict) {\r\n        observe.next(dict);\r\n        observe.unsubscribe()\r\n      } else {\r\n        if (commonDatas.await_Data[code]) {\r\n          setTimeout(() => {\r\n            this.getDictBycode(code, selectUrl).subscribe(res => {\r\n              observe.next(res);\r\n              observe.unsubscribe()\r\n            }, error => {\r\n              observe.next(error);\r\n              observe.unsubscribe()\r\n            })\r\n          }, 500)\r\n          return\r\n        }\r\n        commonDatas.await_Data[code] = true;\r\n        this.getDicBycodeBase(code, selectUrl).subscribe(result => {\r\n          observe.next(result);\r\n          observe.unsubscribe()\r\n          commonDatas.await_Data[code] = false;\r\n        }, error => {\r\n          observe.next(error);\r\n          observe.unsubscribe();\r\n          commonDatas.await_Data[code] = false;\r\n        })\r\n\r\n      }\r\n    })\r\n  }\r\n\r\n  modifyByCode(code: string) {\r\n    this.httpService.post(atr_static_datas.dic_url, {groupCode: code}, {isCommonHttpHeader: true}).subscribe(\r\n      result => {\r\n        let data: DictGroup | any = null;\r\n        if (result.status == 200) {\r\n          data = {\r\n            groupCode: code,\r\n            dicts: result.data\r\n          };\r\n          SessionStorageUtil.putDictGroup(data);\r\n        }\r\n      },\r\n    )\r\n  }\r\n\r\n  reset() {\r\n    SessionStorageUtil.resetDict();\r\n  }\r\n}\r\n"]}
package/esm2020/lib/shared/img-canvas/img-canvas.component.mjs CHANGED
@@ -3,6 +3,7 @@ import * as i0 from "@angular/core";
3
3
  export class ImgCanvasComponent {
4
4
  constructor(elementRef) {
5
5
  this.elementRef = elementRef;
6
+ this.needTime = false;
6
7
  this.width = 800;
7
8
  this.height = 800;
8
9
  this.clipArr = [];
@@ -11,12 +12,13 @@ export class ImgCanvasComponent {
11
12
  this.needContextmenu = false;
12
13
  }
13
14
  set url(url) {
14
- if (url && url.indexOf('?v=') < 0) {
15
- if (url.indexOf("?") < 0) {
16
- url += "?";
17
- }
18
- url += "v=" + new Date().getTime();
19
- }
15
+ // if (url && url.indexOf('?v=') < 0) {
16
+ // if (url.indexOf("?") < 0) {
17
+ // url += "?";
18
+ //
19
+ // }
20
+ // url += "v=" + new Date().getTime()
21
+ // }
20
22
  this.imgUrl = url;
21
23
  }
22
24
  ngOnInit() {
@@ -68,6 +70,12 @@ export class ImgCanvasComponent {
68
70
  let context1 = this.canvasDom.getContext('2d');
69
71
  let img = new Image();
70
72
  img.setAttribute('crossOrigin', 'anonymous');
73
+ if (this.needTime) {
74
+ if (this.imgUrl.indexOf("?") < 0) {
75
+ this.imgUrl += "?";
76
+ }
77
+ this.imgUrl += "v=" + new Date().getTime();
78
+ }
71
79
  img.src = this.imgUrl;
72
80
  img.onload = () => {
73
81
  this.img = img;
@@ -101,11 +109,13 @@ export class ImgCanvasComponent {
101
109
  }
102
110
  }
103
111
  ImgCanvasComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: ImgCanvasComponent, deps: [{ token: i0.ElementRef }], target: i0.ɵɵFactoryTarget.Component });
104
- 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: [""] });
112
+ 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: [""] });
105
113
  i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: ImgCanvasComponent, decorators: [{
106
114
  type: Component,
107
115
  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: [""] }]
108
- }], ctorParameters: function () { return [{ type: i0.ElementRef }]; }, propDecorators: { url: [{
116
+ }], ctorParameters: function () { return [{ type: i0.ElementRef }]; }, propDecorators: { needTime: [{
117
+ type: Input
118
+ }], url: [{
109
119
  type: Input
110
120
  }], canvas1: [{
111
121
  type: ViewChild,
@@ -119,4 +129,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
119
129
  }], needContextmenu: [{
120
130
  type: Input
121
131
  }] } });
122
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"img-canvas.component.js","sourceRoot":"","sources":["../../../../../../projects/components/src/lib/shared/img-canvas/img-canvas.component.ts","../../../../../../projects/components/src/lib/shared/img-canvas/img-canvas.component.html"],"names":[],"mappings":"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","sourcesContent":["import {AfterViewInit, Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core';\nimport {SessionStorageUtil} from \"../../../core/utils/sessionstorage.util\";\nimport {ToolsUtil} from \"../../../core/utils/ToolsUtil\";\n\n@Component({\n  selector: 'app-img',\n  templateUrl: './img-canvas.component.html',\n  styleUrls: ['./img-canvas.component.less']\n})\nexport class ImgCanvasComponent implements OnInit, AfterViewInit {\n\n  @Input() set url(url: string) {\n    if (url && url.indexOf('?v=') < 0) {\n      if (url.indexOf(\"?\") < 0) {\n        url += \"?\";\n\n      }\n      url += \"v=\" + new Date().getTime()\n    }\n    this.imgUrl = url;\n  }\n\n  @ViewChild('canvas1', {static: false}) canvas1: any;\n  canvasDom: any\n  width = 800;\n  height = 800;\n  imgUrl: any;\n  img: any;\n  @Input() clipArr: any[] = [];\n  @Input() rotateNum: any = 0;\n  @Output() loadOver: EventEmitter<any> = new EventEmitter();\n  @Input() needContextmenu = false\n\n  constructor(private elementRef: ElementRef) {\n  }\n\n  ngOnInit(): void {\n\n  }\n\n  getCanvasFull() {\n    let imgW = this.img.width//图片的宽\n    let imgH = this.img.height//图片的高\n    let cW = this.width;\n    let cH = this.height;\n    let rateW = imgH / imgW//比例\n    let rateH = imgW / imgH//比例\n    if (imgW > imgH) {\n      imgW = this.width\n      imgH = imgW * rateW;\n      if (imgH > cH) {\n        imgH = cH\n        imgW = imgH * rateH\n      }\n    } else {\n      imgH = this.height\n      imgW = imgH * rateH;\n      if (imgW > cW) {\n        imgW = cW\n        imgH = imgW * rateW\n      }\n    }\n\n    // imgH = this.canvasDom.offsetHeight\n    // imgW = this.canvasDom.offsetWidth\n    // let canvasH = imgH * rate\n    // if (canvasH > this.height) {\n    //   canvasH = this.height\n    //   rate = canvasH / imgH\n    //   canvasW = imgW * rate\n    // }\n    console.log(\"图片宽高\", imgW + \";\" + imgH)\n    return {\n      imgW: imgW,\n      imgH: imgH\n    }\n  }\n\n  initImg(needSession = true) {\n    this.canvasDom = this.canvas1.nativeElement;\n    // this.canvasDom = document.getElementById(this.canvasId);\n    //检测支持性\n    if (!this.canvasDom.getContext('2d')) return;\n    //获得 2d 上下文对象\n    let context1 = this.canvasDom.getContext('2d');\n    let img = new Image()\n    img.setAttribute('crossOrigin', 'anonymous')\n    img.src = this.imgUrl\n    img.onload = () => {\n      this.img = img\n      const {imgW, imgH} = this.getCanvasFull();\n      this.canvasDom.width = this.width;\n      this.canvasDom.height = this.height;\n      if (this.clipArr && this.clipArr.length > 0) {\n        this.goClip(context1)\n      }\n      // 参数 1：要绘制的 img   参数 2、3：绘制的 img 在 canvas 中的坐标 参数4,5是width，height\n      context1.drawImage(this.img, 0, 0, this.width, this.height,);\n      this.loadOver.emit({code: 'loadOver'})\n    }\n  }\n\n\n  goClip(context: any) {\n    context.beginPath()\n    context.moveTo(this.clipArr[0].x1, this.clipArr[0].y1);\n    this.clipArr.forEach((item, index) => {\n      if (index > 0) {\n        context.lineTo(item.x1, item.y1)\n      }\n    })\n    context.lineTo(this.clipArr[0].x1, this.clipArr[0].y1);\n    context.clip();\n  }\n\n  ngAfterViewInit(): void {\n    setTimeout(() => {\n      console.log('当前组件宽高', this.elementRef.nativeElement.offsetHeight)\n      this.initImg()\n    }, 300)\n  }\n\n}\n","<canvas #canvas1 style=\"width: 100%;height: 100%;\" oncontextmenu=\"return needContextmenu\">\n  您的浏览器不支持画布！\n</canvas>\n<ng-content></ng-content>\n"]}
132
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"img-canvas.component.js","sourceRoot":"","sources":["../../../../../../projects/components/src/lib/shared/img-canvas/img-canvas.component.ts","../../../../../../projects/components/src/lib/shared/img-canvas/img-canvas.component.html"],"names":[],"mappings":"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","sourcesContent":["import {AfterViewInit, Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core';\nimport {SessionStorageUtil} from \"../../../core/utils/sessionstorage.util\";\nimport {ToolsUtil} from \"../../../core/utils/ToolsUtil\";\n\n@Component({\n  selector: 'app-img',\n  templateUrl: './img-canvas.component.html',\n  styleUrls: ['./img-canvas.component.less']\n})\nexport class ImgCanvasComponent implements OnInit, AfterViewInit {\n\n  @Input() needTime = false;\n\n  @Input() set url(url: string) {\n    // if (url && url.indexOf('?v=') < 0) {\n    //   if (url.indexOf(\"?\") < 0) {\n    //     url += \"?\";\n    //\n    //   }\n    //   url += \"v=\" + new Date().getTime()\n    // }\n    this.imgUrl = url;\n  }\n\n  @ViewChild('canvas1', {static: false}) canvas1: any;\n  canvasDom: any\n  width = 800;\n  height = 800;\n  imgUrl: any;\n  img: any;\n  @Input() clipArr: any[] = [];\n  @Input() rotateNum: any = 0;\n  @Output() loadOver: EventEmitter<any> = new EventEmitter();\n  @Input() needContextmenu = false\n\n  constructor(private elementRef: ElementRef) {\n  }\n\n  ngOnInit(): void {\n\n  }\n\n  getCanvasFull() {\n    let imgW = this.img.width//图片的宽\n    let imgH = this.img.height//图片的高\n    let cW = this.width;\n    let cH = this.height;\n    let rateW = imgH / imgW//比例\n    let rateH = imgW / imgH//比例\n    if (imgW > imgH) {\n      imgW = this.width\n      imgH = imgW * rateW;\n      if (imgH > cH) {\n        imgH = cH\n        imgW = imgH * rateH\n      }\n    } else {\n      imgH = this.height\n      imgW = imgH * rateH;\n      if (imgW > cW) {\n        imgW = cW\n        imgH = imgW * rateW\n      }\n    }\n\n    // imgH = this.canvasDom.offsetHeight\n    // imgW = this.canvasDom.offsetWidth\n    // let canvasH = imgH * rate\n    // if (canvasH > this.height) {\n    //   canvasH = this.height\n    //   rate = canvasH / imgH\n    //   canvasW = imgW * rate\n    // }\n    console.log(\"图片宽高\", imgW + \";\" + imgH)\n    return {\n      imgW: imgW,\n      imgH: imgH\n    }\n  }\n\n  initImg(needSession = true) {\n    this.canvasDom = this.canvas1.nativeElement;\n    // this.canvasDom = document.getElementById(this.canvasId);\n    //检测支持性\n    if (!this.canvasDom.getContext('2d')) return;\n    //获得 2d 上下文对象\n    let context1 = this.canvasDom.getContext('2d');\n    let img = new Image()\n    img.setAttribute('crossOrigin', 'anonymous')\n    if (this.needTime) {\n      if (this.imgUrl.indexOf(\"?\") < 0) {\n        this.imgUrl += \"?\";\n      }\n      this.imgUrl += \"v=\" + new Date().getTime()\n    }\n    img.src = this.imgUrl\n    img.onload = () => {\n      this.img = img\n      const {imgW, imgH} = this.getCanvasFull();\n      this.canvasDom.width = this.width;\n      this.canvasDom.height = this.height;\n      if (this.clipArr && this.clipArr.length > 0) {\n        this.goClip(context1)\n      }\n      // 参数 1：要绘制的 img   参数 2、3：绘制的 img 在 canvas 中的坐标 参数4,5是width，height\n      context1.drawImage(this.img, 0, 0, this.width, this.height,);\n      this.loadOver.emit({code: 'loadOver'})\n    }\n  }\n\n\n  goClip(context: any) {\n    context.beginPath()\n    context.moveTo(this.clipArr[0].x1, this.clipArr[0].y1);\n    this.clipArr.forEach((item, index) => {\n      if (index > 0) {\n        context.lineTo(item.x1, item.y1)\n      }\n    })\n    context.lineTo(this.clipArr[0].x1, this.clipArr[0].y1);\n    context.clip();\n  }\n\n  ngAfterViewInit(): void {\n    setTimeout(() => {\n      console.log('当前组件宽高', this.elementRef.nativeElement.offsetHeight)\n      this.initImg()\n    }, 300)\n  }\n\n}\n","<canvas #canvas1 style=\"width: 100%;height: 100%;\" oncontextmenu=\"return needContextmenu\">\n  您的浏览器不支持画布！\n</canvas>\n<ng-content></ng-content>\n"]}
package/fesm2015/atr-components.mjs CHANGED
@@ -1899,7 +1899,7 @@ class DictService {
1899
1899
  getCodeNameSync(keys, code, selectUrl, splitKey) {
1900
1900
  return __awaiter(this, void 0, void 0, function* () {
1901
1901
  return new Promise((resolve, reject) => {
1902
- this.getDictByCodeSync(code, selectUrl).then(() => {
1902
+ this.getCodeNamePromise(code, selectUrl).then(() => {
1903
1903
  if (splitKey && keys) {
1904
1904
  let result = [];
1905
1905
  for (let item of keys.split(splitKey)) {
@@ -1946,6 +1946,36 @@ class DictService {
1946
1946
  });
1947
1947
  });
1948
1948
  }
1949
+ getCodeNamePromise(code, selectUrl) {
1950
+ return __awaiter(this, void 0, void 0, function* () {
1951
+ return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
1952
+ let dict = SessionStorageUtil.getDictGroupByCode(code);
1953
+ if (dict) {
1954
+ resolve(dict);
1955
+ }
1956
+ else {
1957
+ if (commonDatas.await_Data[code]) {
1958
+ setTimeout(() => {
1959
+ this.getDictBycode(code, selectUrl).subscribe(res => {
1960
+ resolve(res);
1961
+ }, error => {
1962
+ resolve(error);
1963
+ });
1964
+ }, 500);
1965
+ return;
1966
+ }
1967
+ commonDatas.await_Data[code] = true;
1968
+ this.getDicBycodeBase(code, selectUrl).subscribe(result => {
1969
+ resolve(result);
1970
+ commonDatas.await_Data[code] = false;
1971
+ }, error => {
1972
+ resolve(error);
1973
+ commonDatas.await_Data[code] = false;
1974
+ });
1975
+ }
1976
+ }));
1977
+ });
1978
+ }
1949
1979
  getDictBycode(code, selectUrl) {
1950
1980
  // //console.log(code);
1951
1981
  return new Observable(observe => {
@@ -2014,7 +2044,7 @@ class DictsPipe {
2014
2044
  if (ToolsUtil.isNull(dictCode)) {
2015
2045
  return value;
2016
2046
  }
2017
- // return this.dictService.getCodeNameSync(value, dictCode)
2047
+ // return this.dictService.getCodeNameSync(value, dictCode,null,splitKey )
2018
2048
  return this.dictService.getCodeNameSync(value, dictCode, null, splitKey).then(res => {
2019
2049
  return res;
2020
2050
  });
@@ -2109,7 +2139,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
2109
2139
  class OssImgPipe {
2110
2140
  constructor() {
2111
2141
  }
2112
- transform(value, param = { isVideoCover: false, needTime: true }) {
2142
+ transform(value, param = { isVideoCover: false, needTime: false }) {
2113
2143
  return param.isVideoCover ? ToolsUtil.getVideoCover(value) : ToolsUtil.getOssUrl(value, param.needTime);
2114
2144
  }
2115
2145
  }
@@ -5082,6 +5112,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
5082
5112
  class ImgCanvasComponent {
5083
5113
  constructor(elementRef) {
5084
5114
  this.elementRef = elementRef;
5115
+ this.needTime = false;
5085
5116
  this.width = 800;
5086
5117
  this.height = 800;
5087
5118
  this.clipArr = [];
@@ -5090,12 +5121,13 @@ class ImgCanvasComponent {
5090
5121
  this.needContextmenu = false;
5091
5122
  }
5092
5123
  set url(url) {
5093
- if (url && url.indexOf('?v=') < 0) {
5094
- if (url.indexOf("?") < 0) {
5095
- url += "?";
5096
- }
5097
- url += "v=" + new Date().getTime();
5098
- }
5124
+ // if (url && url.indexOf('?v=') < 0) {
5125
+ // if (url.indexOf("?") < 0) {
5126
+ // url += "?";
5127
+ //
5128
+ // }
5129
+ // url += "v=" + new Date().getTime()
5130
+ // }
5099
5131
  this.imgUrl = url;
5100
5132
  }
5101
5133
  ngOnInit() {
@@ -5147,6 +5179,12 @@ class ImgCanvasComponent {
5147
5179
  let context1 = this.canvasDom.getContext('2d');
5148
5180
  let img = new Image();
5149
5181
  img.setAttribute('crossOrigin', 'anonymous');
5182
+ if (this.needTime) {
5183
+ if (this.imgUrl.indexOf("?") < 0) {
5184
+ this.imgUrl += "?";
5185
+ }
5186
+ this.imgUrl += "v=" + new Date().getTime();
5187
+ }
5150
5188
  img.src = this.imgUrl;
5151
5189
  img.onload = () => {
5152
5190
  this.img = img;
@@ -5180,11 +5218,13 @@ class ImgCanvasComponent {
5180
5218
  }
5181
5219
  }
5182
5220
  ImgCanvasComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: ImgCanvasComponent, deps: [{ token: i0.ElementRef }], target: i0.ɵɵFactoryTarget.Component });
5183
- 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: [""] });
5221
+ 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: [""] });
5184
5222
  i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: ImgCanvasComponent, decorators: [{
5185
5223
  type: Component,
5186
5224
  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: [""] }]
5187
- }], ctorParameters: function () { return [{ type: i0.ElementRef }]; }, propDecorators: { url: [{
5225
+ }], ctorParameters: function () { return [{ type: i0.ElementRef }]; }, propDecorators: { needTime: [{
5226
+ type: Input
5227
+ }], url: [{
5188
5228
  type: Input
5189
5229
  }], canvas1: [{
5190
5230
  type: ViewChild,