atr-components 0.2.401 → 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") {