atr-components 0.2.238 → 0.2.240

package/fesm2020/atr-components.mjs

@@ -216,7 +216,7 @@ class ToolsUtil {
      * @param pointsArr
      */
     static judgeInRec(p, pointsArr) {
-        let px = p.x1, py = p.y1, flag = false, //穿越边框
+        let px = Number(p.x1), py = Number(p.y1), flag = false, //穿越边框
         inRect = false; //是否在多边形的边或者端点上
         let start = pointsArr[0];
         let end = pointsArr[pointsArr.length - 1];
@@ -230,7 +230,7 @@ class ToolsUtil {
                 return;
             }
             let endPoint = pointsArr[index + 1];
-            const startX = item.x1, startY = item.y1, endX = endPoint.x1, endY = endPoint.y1;
+            const startX = Number(item.x1), startY = Number(item.y1), endX = Number(endPoint.x1), endY = Number(endPoint.y1);
             //判断点是否在端点上
             if ((px == startX && py == startY)
                 || (px == endX && px == endY)) {
@@ -238,7 +238,7 @@ class ToolsUtil {
                 return;
             }
             //判断射线重合并且点在边上
-            if ((startY == endY == py)
+            if ((startY == endY && endY == py)
                 && ((px > endX && px < startX
                     || (px < endX && px > startX)))) {
                 inRect = true;
@@ -4766,6 +4766,8 @@ class ImgCanvasComponent {
         this.width = 800;
         this.height = 800;
         this.clipArr = [];
+        this.rotateNum = 0;
+        this.loadOver = new EventEmitter();
     }
     set url(url) {
         if (url && url.indexOf('?v=') < 0) {
@@ -4816,7 +4818,6 @@ class ImgCanvasComponent {
         };
     }
     initImg(needSession = true) {
-        let obj = SessionStorageUtil.get('appImg');
         this.canvasDom = this.canvas1.nativeElement;
         // this.canvasDom = document.getElementById(this.canvasId);
         //检测支持性
@@ -4825,23 +4826,13 @@ class ImgCanvasComponent {
         //获得 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 = () => {
-            obj[image] = this.img;
-            SessionStorageUtil.put('appImg', obj);
             this.initBase(context1);
+            this.loadOver.emit({ code: 'loadOver' });
         };
     }
     initBase(context1) {
@@ -4876,10 +4867,10 @@ 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" }, viewQueries: [{ propertyName: "canvas1", first: true, predicate: ["canvas1"], descendants: true }], ngImport: i0, template: "<canvas #canvas1 style=\"width: 100%;height: 100%\">\n    \u60A8\u7684\u6D4F\u89C8\u5668\u4E0D\u652F\u6301\u753B\u5E03\uFF01\n</canvas>\n", styles: [""] });
+ImgCanvasComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.11", type: ImgCanvasComponent, selector: "app-img", inputs: { url: "url", clipArr: "clipArr", rotateNum: "rotateNum" }, outputs: { loadOver: "loadOver" }, viewQueries: [{ propertyName: "canvas1", first: true, predicate: ["canvas1"], descendants: true }], ngImport: i0, template: "<canvas #canvas1 style=\"width: 100%;height: 100%;\">\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%\">\n    \u60A8\u7684\u6D4F\u89C8\u5668\u4E0D\u652F\u6301\u753B\u5E03\uFF01\n</canvas>\n", styles: [""] }]
+            args: [{ selector: 'app-img', template: "<canvas #canvas1 style=\"width: 100%;height: 100%;\">\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: [{
                 type: Input
             }], canvas1: [{
@@ -4887,6 +4878,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
                 args: ['canvas1', { static: false }]
             }], clipArr: [{
                 type: Input
+            }], rotateNum: [{
+                type: Input
+            }], loadOver: [{
+                type: Output
             }] } });
 
 const THIRDMODULES = [