@whitesev/utils 2.11.2 → 2.11.4

package/dist/types/src/Utils.d.ts

@@ -1620,6 +1620,26 @@ declare class Utils {
      * @param timeout 超时时间，默认为`1500ms`
      */
     hasWorkerCSP(timeout?: number): Promise<boolean>;
+    /**
+     * 计算两个坐标的直线距离
+     * @param positionX 坐标x信息
+     * @param positionY 坐标y信息
+     * @param otherPositionX 坐标x信息
+     * @param otherPositionY 坐标y信息
+     */
+    calcPositionDistance(positionX: number | string, positionY: number | string, otherPositionX: number | string, otherPositionY: number | string): number;
+    /**
+     * 计算两个坐标的直线距离
+     * @param position 坐标信息
+     * @param otherPosition 坐标信息
+     */
+    calcPositionDistance(position: {
+        x: number | string;
+        y: number | string;
+    }, otherPosition: {
+        x: number | string;
+        y: number | string;
+    }): number;
 }
 declare const utils: Utils;
 export { utils as Utils };

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@whitesev/utils",
-  "version": "2.11.2",
+  "version": "2.11.4",
   "description": "一个常用的工具库",
   "keywords": [
     "ScriptCat",

package/src/ColorConversion.ts

@@ -83,10 +83,18 @@ export class ColorConversion {
     if (isNaN(level)) {
       throw new TypeError(`输入错误的level：${level}`);
     }
+    if (level < 0 || level > 1) {
+      throw new TypeError(`level must between 0~1.0: ${level}`);
+    }
     const rgbc = this.hexToRgb(color);
     for (let index = 0; index < 3; index++) {
       const rgbcItemValue = rgbc[index];
-      const value = Math.floor(Number(rgbcItemValue) * (1 - level));
+      let value = Math.floor(Number(rgbcItemValue) * (1 - level));
+      if (value > 255) {
+        value = 255;
+      } else if (value < 0) {
+        value = 0;
+      }
       Reflect.set(rgbc, index, value);
     }
 
@@ -107,10 +115,18 @@ export class ColorConversion {
     if (isNaN(level)) {
       throw new TypeError(`输入错误的level：${level}`);
     }
+    if (level < 0 || level > 1) {
+      throw new TypeError(`level must between 0~1.0: ${level}`);
+    }
     const rgbc = this.hexToRgb(color);
     for (let index = 0; index < 3; index++) {
       const rgbcItemValue = Number(rgbc[index]);
-      const value = Math.floor(255 - rgbcItemValue * level + rgbcItemValue);
+      let value = Math.floor(255 - rgbcItemValue * level + rgbcItemValue);
+      if (value > 255) {
+        value = 255;
+      } else if (value < 0) {
+        value = 0;
+      }
       Reflect.set(rgbc, index, value);
     }
     return this.rgbToHex(rgbc[0], rgbc[1], rgbc[2]);

package/src/Utils.ts

@@ -3959,6 +3959,78 @@ class Utils {
       }
     });
   }
+  /**
+   * 计算两个坐标的直线距离
+   * @param positionX 坐标x信息
+   * @param positionY 坐标y信息
+   * @param otherPositionX 坐标x信息
+   * @param otherPositionY 坐标y信息
+   */
+  calcPositionDistance(
+    positionX: number | string,
+    positionY: number | string,
+    otherPositionX: number | string,
+    otherPositionY: number | string
+  ): number;
+  /**
+   * 计算两个坐标的直线距离
+   * @param position 坐标信息
+   * @param otherPosition 坐标信息
+   */
+  calcPositionDistance(
+    position: { x: number | string; y: number | string },
+    otherPosition: { x: number | string; y: number | string }
+  ): number;
+  calcPositionDistance(...args: any[]) {
+    let position = {
+      x: 0,
+      y: 0,
+    };
+    let otherPosition = {
+      x: 0,
+      y: 0,
+    };
+    if (typeof args[0] === "object" && args[0] != null && typeof args[1] === "object" && args[1] != null) {
+      position = args[0];
+      otherPosition = args[1];
+    } else if (args.length === 4) {
+      position = {
+        x: args[0],
+        y: args[1],
+      };
+      otherPosition = {
+        x: args[2],
+        y: args[3],
+      };
+    } else {
+      throw new Error("Invalid arguments");
+    }
+    if (typeof position.x === "string") {
+      position.x = Number(position.x);
+    }
+    if (isNaN(position.x)) {
+      throw new Error(`Invalid x: ${position.x}`);
+    }
+    if (typeof position.y === "string") {
+      position.y = Number(position.y);
+    }
+    if (isNaN(position.y)) {
+      throw new Error(`Invalid y: ${position.y}`);
+    }
+    if (typeof otherPosition.x === "string") {
+      otherPosition.x = Number(otherPosition.x);
+    }
+    if (isNaN(otherPosition.x)) {
+      throw new Error(`Invalid x: ${otherPosition.x}`);
+    }
+    if (typeof otherPosition.y === "string") {
+      otherPosition.y = Number(otherPosition.y);
+    }
+    if (isNaN(otherPosition.y)) {
+      throw new Error(`Invalid y: ${otherPosition.y}`);
+    }
+    return Math.sqrt(Math.pow(otherPosition.x - position.x, 2) + Math.pow(otherPosition.y - position.y, 2));
+  }
 }
 
 const utils = new Utils();