atr-components 0.2.308 → 0.2.309

package/fesm2020/atr-components.mjs

@@ -330,46 +330,63 @@ class ToolsUtil {
         }
         return false;
     }
+    /**
+     *
+     * @param num1
+     * @param num2
+     * @param error 误差
+     */
+    static equalNum(num1, num2, error = 5) {
+        let num = num1 - num2;
+        return num < error && num > -error;
+    }
+    /**
+     * 坐标对比
+     * @param point1
+     * @param point2
+     * @param error
+     */
+    static equalPoint(point1, point2, error = 5) {
+        return ToolsUtil.equalNum(point1.x, point2.x, error) && ToolsUtil.equalNum(point1.y, point2.y, error);
+    }
     //判断点是否在线段上
-    static checkInLine(startP, endP, a) {
+    /**
+     *
+     * @param startP
+     * @param endP
+     * @param a
+     * @param error 误差
+     */
+    static checkInLine(startP, endP, a, error = 5) {
         //点和端点重合
-        if ((startP.x == endP.x && startP.y == endP.y)
-            || (startP.x == a.x && startP.y == a.y)
-            || (endP.x == a.x && endP.y == a.y)) {
+        if (ToolsUtil.equalPoint(startP, endP, error)
+            || ToolsUtil.equalPoint(startP, a)
+            || ToolsUtil.equalPoint(endP, a)) {
             return true;
         }
-        if (startP.x == endP.x && endP.x != a.x) {
+        if (ToolsUtil.equalNum(startP.x, endP.x, error)
+            && !ToolsUtil.equalNum(startP.x, a.x, error)) {
             return false;
         }
-        else if (startP.x == endP.x && endP.x == a.x) {
+        else if (ToolsUtil.equalNum(startP.x, endP.x, error)
+            && ToolsUtil.equalNum(startP.x, a.x, error)) {
             if (startP.y > endP.y) {
                 return startP.y > a.y && endP.y < a.y;
             }
-            return startP.y < a.y && endP.y < a.y;
+            return startP.y < a.y && endP.y > a.y;
         }
         //判断点在线段上
         //斜率是否一致
         let k1 = (endP.y - startP.y) / (endP.x - startP.x);
         let b = startP.y - k1 * startP.x;
-        //y = kx + y1 - kx1
-        //b = y1 - kx1
-        let y = k1 * a.x + b, num = y - a.y;
-        if (num > -5 && num < 5) {
+        let y = k1 * a.x + b;
+        if (ToolsUtil.equalNum(y, a.y, error)) {
             //5像素的误差
             let startLen = ToolsUtil.getLength(startP, a);
             let endLen = ToolsUtil.getLength(a, endP);
             let len = ToolsUtil.getLength(startP, endP);
             return len >= startLen && len >= endLen;
         }
-        // let k2 = (a.y - startP.y) / (a.x - startP.x);
-        // //Number.EPSILON是精度误差
-        // if (Math.abs(k1 - k2) <= Number.EPSILON) {
-        //   //斜率一致,并且a在线段上
-        //   let startLen = ToolsUtil.getLength(startP, a)
-        //   let endLen = ToolsUtil.getLength(a, endP)
-        //   let leng = ToolsUtil.getLength(startP, endP)
-        //   return leng >= startLen && leng >= endLen
-        // }
         return false;
     }
     /**
@@ -742,21 +759,21 @@ class ToolsUtil {
         return { 'maxHeight': ToolsUtil.windowHeight() - 200 + 'px', 'overflow-y': 'auto' };
     }
     static getLength(pointA, pointB) {
-        pointA.x1 = pointA.x || pointA.x1;
-        pointA.y1 = pointA.y || pointA.y1;
-        pointB.y1 = pointB.y || pointB.y1;
-        pointB.x1 = pointB.x || pointB.x1;
+        pointA.x1 = pointA.x || pointA.x1 || 0;
+        pointA.y1 = pointA.y || pointA.y1 || 0;
+        pointB.y1 = pointB.y || pointB.y1 || 0;
+        pointB.x1 = pointB.x || pointB.x1 || 0;
         var lengthAB = Math.sqrt(Math.pow(pointA.x1 - pointB.x1, 2) +
             Math.pow(pointA.y1 - pointB.y1, 2));
         return lengthAB;
     }
     static getRotateNum(pointB, pointC, pointA) {
-        pointA.x1 = pointA.x || pointA.x1;
-        pointA.y1 = pointA.y || pointA.y1;
-        pointB.x1 = pointB.y || pointB.x1;
-        pointB.y1 = pointB.x || pointB.x1;
-        pointC.x1 = pointC.y || pointC.x1;
-        pointC.y1 = pointC.x || pointC.x1;
+        pointA.x1 = pointA.x || pointA.x1 || 0;
+        pointA.y1 = pointA.y || pointA.y1 || 0;
+        pointB.x1 = pointB.y || pointB.x1 || 0;
+        pointB.y1 = pointB.x || pointB.x1 || 0;
+        pointC.x1 = pointC.y || pointC.x1 || 0;
+        pointC.y1 = pointC.x || pointC.x1 || 0;
         //ABC中心点,起始点,终点
         let AB = {};
         let AC = {};