atr-components 0.2.400 → 0.2.403

package/fesm2020/atr-components.mjs

@@ -407,9 +407,14 @@ class ToolsUtil {
      * @param pointsArr
      */
     static judgeInRec(p, pointsArr) {
+        pointsArr = pointsArr.map(item => {
+            return { x1: Number(item.x1 || item.x || 0), y1: Number(item.y1 || item.y || 0) };
+        });
+        p = { x1: p.x1 || p.x || 0, y1: p.y1 || p.y || 0 };
         let px = Number(p.x1), py = Number(p.y1), flag = false, //穿越边框
         inRect = false; //是否在多边形的边或者端点上
         let start = pointsArr[0];
+        //如果数组首尾没有相连,手动添加};
         let end = pointsArr[pointsArr.length - 1];
         //如果数组首尾没有相连,手动添加
         pointsArr = start.x1 != end.x1 || start.y1 != end.y1 ? pointsArr.concat(start) : pointsArr;
@@ -4551,24 +4556,26 @@ class AtrFormComponent {
                     if (item.selectUrl.convert) {
                         keys = item.selectUrl.convert.split(',');
                     }
-                    let selectUrl = item.selectUrl;
-                    if (selectUrl.host == 'oss') {
-                        this.httpService.getOss(selectUrl.url).subscribe(res => {
-                            item.dictList = this.conv(JSON.parse(res), keys);
-                            if (value && value.length > 0) {
-                                value = this.getCascaderDefaultValue(item.dictList, 0, value);
-                                this.setValue(item.key, value);
-                            }
-                        });
-                    }
-                    else {
-                        this.httpService.post(selectUrl.url, {}, ToolsUtil.getHttpOptions()).subscribe(res => {
-                            item.dictList = this.conv(res.data, keys);
-                            if (value && value.length > 0) {
-                                value = this.getCascaderDefaultValue(item.dictList, 0, value);
-                                this.setValue(item.key, value);
-                            }
-                        });
+                    if (item.selectUrl.url) {
+                        let selectUrl = item.selectUrl;
+                        if (selectUrl.host == 'oss') {
+                            this.httpService.getOss(selectUrl.url).subscribe(res => {
+                                item.dictList = this.conv(JSON.parse(res), keys);
+                                if (value && value.length > 0) {
+                                    value = this.getCascaderDefaultValue(item.dictList, 0, value);
+                                    this.setValue(item.key, value);
+                                }
+                            });
+                        }
+                        else {
+                            this.httpService.post(selectUrl.url, {}, ToolsUtil.getHttpOptions()).subscribe(res => {
+                                item.dictList = this.conv(res.data, keys);
+                                if (value && value.length > 0) {
+                                    value = this.getCascaderDefaultValue(item.dictList, 0, value);
+                                    this.setValue(item.key, value);
+                                }
+                            });
+                        }
                     }
                 }
                 if (item.type == "select") {
@@ -5091,6 +5098,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 = [];
@@ -5099,12 +5107,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() {
@@ -5156,6 +5165,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;
@@ -5189,11 +5204,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,