atr-components 0.2.239 → 0.2.241
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.
- package/esm2020/core/utils/ToolsUtil.mjs +4 -4
- package/esm2020/lib/shared/img-canvas/img-canvas.component.mjs +3 -3
- package/fesm2015/atr-components.mjs +5 -5
- package/fesm2015/atr-components.mjs.map +1 -1
- package/fesm2020/atr-components.mjs +5 -5
- package/fesm2020/atr-components.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -216,7 +216,7 @@ class ToolsUtil {
|
|
|
216
216
|
* @param pointsArr
|
|
217
217
|
*/
|
|
218
218
|
static judgeInRec(p, pointsArr) {
|
|
219
|
-
let px = p.x1, py = p.y1, flag = false, //穿越边框
|
|
219
|
+
let px = Number(p.x1), py = Number(p.y1), flag = false, //穿越边框
|
|
220
220
|
inRect = false; //是否在多边形的边或者端点上
|
|
221
221
|
let start = pointsArr[0];
|
|
222
222
|
let end = pointsArr[pointsArr.length - 1];
|
|
@@ -230,7 +230,7 @@ class ToolsUtil {
|
|
|
230
230
|
return;
|
|
231
231
|
}
|
|
232
232
|
let endPoint = pointsArr[index + 1];
|
|
233
|
-
const startX = item.x1, startY = item.y1, endX = endPoint.x1, endY = endPoint.y1;
|
|
233
|
+
const startX = Number(item.x1), startY = Number(item.y1), endX = Number(endPoint.x1), endY = Number(endPoint.y1);
|
|
234
234
|
//判断点是否在端点上
|
|
235
235
|
if ((px == startX && py == startY)
|
|
236
236
|
|| (px == endX && px == endY)) {
|
|
@@ -238,7 +238,7 @@ class ToolsUtil {
|
|
|
238
238
|
return;
|
|
239
239
|
}
|
|
240
240
|
//判断射线重合并且点在边上
|
|
241
|
-
if ((startY == endY == py)
|
|
241
|
+
if ((startY == endY && endY == py)
|
|
242
242
|
&& ((px > endX && px < startX
|
|
243
243
|
|| (px < endX && px > startX)))) {
|
|
244
244
|
inRect = true;
|
|
@@ -4867,10 +4867,10 @@ class ImgCanvasComponent {
|
|
|
4867
4867
|
}
|
|
4868
4868
|
}
|
|
4869
4869
|
ImgCanvasComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: ImgCanvasComponent, deps: [{ token: i0.ElementRef }], target: i0.ɵɵFactoryTarget.Component });
|
|
4870
|
-
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: [""] });
|
|
4870
|
+
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%;\" oncontextmenu=\"return false\">\n \u60A8\u7684\u6D4F\u89C8\u5668\u4E0D\u652F\u6301\u753B\u5E03\uFF01\n</canvas>\n<ng-content></ng-content>\n", styles: [""] });
|
|
4871
4871
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: ImgCanvasComponent, decorators: [{
|
|
4872
4872
|
type: Component,
|
|
4873
|
-
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: [""] }]
|
|
4873
|
+
args: [{ selector: 'app-img', template: "<canvas #canvas1 style=\"width: 100%;height: 100%;\" oncontextmenu=\"return false\">\n \u60A8\u7684\u6D4F\u89C8\u5668\u4E0D\u652F\u6301\u753B\u5E03\uFF01\n</canvas>\n<ng-content></ng-content>\n", styles: [""] }]
|
|
4874
4874
|
}], ctorParameters: function () { return [{ type: i0.ElementRef }]; }, propDecorators: { url: [{
|
|
4875
4875
|
type: Input
|
|
4876
4876
|
}], canvas1: [{
|