atr-components 0.2.302 → 0.2.303

package/fesm2020/atr-components.mjs

@@ -641,6 +641,11 @@ class ToolsUtil {
     static modaleStyle() {
         return { 'maxHeight': ToolsUtil.windowHeight() - 200 + 'px', 'overflow-y': 'auto' };
     }
+    static getLength(pointA, pointB) {
+        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) {
         //ABC中心点,起始点,终点
         let AB = {};
@@ -650,12 +655,9 @@ class ToolsUtil {
         AC.x1 = pointC.x1 - pointA.x1;
         AC.y1 = pointC.y1 - pointA.y1;
         var direct = AB.x1 * AC.y1 - AB.y1 * AC.y1;
-        var lengthAB = Math.sqrt(Math.pow(pointA.x1 - pointB.x1, 2) +
-            Math.pow(pointA.y1 - pointB.y1, 2));
-        var lengthAC = Math.sqrt(Math.pow(pointA.x1 - pointC.x1, 2) +
-            Math.pow(pointA.y1 - pointC.y1, 2));
-        var lengthBC = Math.sqrt(Math.pow(pointB.x1 - pointC.x1, 2) +
-            Math.pow(pointB.y1 - pointC.y1, 2));
+        var lengthAB = this.getLength(pointB, pointA);
+        var lengthAC = this.getLength(pointC, pointA);
+        var lengthBC = this.getLength(pointB, pointC);
         var cosA = (Math.pow(lengthAB, 2) + Math.pow(lengthAC, 2) -
             Math.pow(lengthBC, 2)) / (2 * lengthAB * lengthAC);
         var angleA = Math.round(Math.acos(cosA) * 180 / Math.PI);
@@ -4724,6 +4726,9 @@ class AtrFormComponent {
         return obj;
     }
     showTime(item) {
+        if (item.nzShowTime) {
+            return item.nzShowTime;
+        }
         if (!item.dateFormat || item.dateFormat == "yyyy-MM-dd") {
             return false;
         }