lyb-js 1.6.5 → 1.6.7

package/Base/LibJsResizeWatcher.d.ts

@@ -2,7 +2,7 @@
  * @description 用于监听浏览器窗口尺寸变化的类
  * @link 使用方法：https://www.npmjs.com/package/lyb-js#LibJsResizeWatcher-窗口监听
  */
-type Listener = (w: number, h: number) => void;
+type Listener = (w: number, h: number, s: number) => void;
 /** @description 监听窗口变化，内部只注册一次resize事件，调用监听自身可取消监听 */
 export declare class LibJsResizeWatcher {
     /** 存储所有监听器及其是否需要立即执行的标志 */

package/Base/LibJsResizeWatcher.js

@@ -9,7 +9,15 @@ export class LibJsResizeWatcher {
         this._handleResize = () => {
             const w = window.innerWidth;
             const h = window.innerHeight;
-            this._listeners.forEach(({ cb }) => cb(w, h));
+            let s;
+            const orientation = w > h ? "h" : "v";
+            if (orientation === "h") {
+                s = Math.min(w / 1920, h / 1080);
+            }
+            else {
+                s = Math.min(w / 1080, h / 1920);
+            }
+            this._listeners.forEach(({ cb }) => cb(w, h, s));
         };
         this._mode = mode;
         if (mode === "h" || mode === "v")
@@ -24,18 +32,28 @@ export class LibJsResizeWatcher {
      * @returns 一个函数，用于移除该监听器
      */
     on(cb, immediate = true) {
+        const w = window.innerWidth;
+        const h = window.innerHeight;
+        const orientation = w > h ? "h" : "v";
         if (this._mode === "h") {
-            immediate && cb(1920, 1080);
+            immediate && cb(1920, 1080, Math.min(w / 1920, h / 1080));
             return () => { };
         }
         else if (this._mode === "v") {
-            immediate && cb(1080, 1920);
+            immediate && cb(1080, 1920, Math.min(w / 1080, h / 1920));
             return () => { };
         }
+        let s;
+        if (orientation === "h") {
+            s = Math.min(w / 1920, h / 1080);
+        }
+        else {
+            s = Math.min(w / 1080, h / 1920);
+        }
         const item = { cb, immediate };
         this._listeners.push(item);
         if (immediate)
-            cb(window.innerWidth, window.innerHeight);
+            cb(window.innerWidth, window.innerHeight, s);
         return () => {
             this._listeners = this._listeners.filter((l) => l !== item);
         };

package/Math/LibJsCoordsAngle.d.ts

@@ -9,4 +9,4 @@ export declare const libJsCoordsAngle: (coord1: {
 }, coord2: {
     x: number;
     y: number;
-}) => number;
+}, mode?: "deg" | "rad") => number;

package/Math/LibJsCoordsAngle.js

@@ -3,19 +3,22 @@
  * @param coord2 终点坐标
  * @link 使用方法：https://www.npmjs.com/package/lyb-js#LibJsCoordsAngle-两点角度
  */
-export const libJsCoordsAngle = (coord1, coord2) => {
+export const libJsCoordsAngle = (coord1, coord2, mode = "deg") => {
     //计算相对于第一个坐标的水平和垂直距离
     const deltaX = coord2.x - coord1.x;
     const deltaY = coord2.y - coord1.y;
     //使用反三角函数计算角度（以弧度为单位）
     const angleRad = Math.atan2(deltaY, deltaX);
-    //将弧度转换为角度
-    let angleDeg = angleRad * (180 / Math.PI);
-    //将角度转换为顺时针方向为正方向的角度
-    angleDeg = -angleDeg + 90;
-    //调整角度使得右边成为 360 度的位置变为 0 度
-    if (angleDeg < 0) {
-        angleDeg += 360;
+    if (mode === "deg") {
+        //将弧度转换为角度
+        let angleDeg = angleRad * (180 / Math.PI);
+        //将角度转换为顺时针方向为正方向的角度
+        angleDeg = -angleDeg + 90;
+        //调整角度使得右边成为 360 度的位置变为 0 度
+        if (angleDeg < 0) {
+            angleDeg += 360;
+        }
+        return angleDeg;
     }
-    return angleDeg;
+    return angleRad;
 };

package/libJs.d.ts

@@ -198,7 +198,7 @@ export declare const Math: {
     }, coord2: {
         x: number;
         y: number;
-    }) => number;
+    }, mode?: "deg" | "rad") => number;
     /** @description 计算两点距离
      * @param coord1 起点坐标
      * @param coord2 终点坐标

package/lyb.js

@@ -284,16 +284,19 @@ ${log3.label}：`, log3.value];
       throw new Error("请使用正确类型");
     }
   };
-  const libJsCoordsAngle = (coord1, coord2) => {
+  const libJsCoordsAngle = (coord1, coord2, mode = "deg") => {
     const deltaX = coord2.x - coord1.x;
     const deltaY = coord2.y - coord1.y;
     const angleRad = Math.atan2(deltaY, deltaX);
-    let angleDeg = angleRad * (180 / Math.PI);
-    angleDeg = -angleDeg + 90;
-    if (angleDeg < 0) {
-      angleDeg += 360;
+    if (mode === "deg") {
+      let angleDeg = angleRad * (180 / Math.PI);
+      angleDeg = -angleDeg + 90;
+      if (angleDeg < 0) {
+        angleDeg += 360;
+      }
+      return angleDeg;
     }
-    return angleDeg;
+    return angleRad;
   };
   const libJsCoordsDistance = (coord1, coord2) => {
     const deltaX = coord2.x - coord1.x;
@@ -3526,7 +3529,14 @@ ${log3.label}：`, log3.value];
       this._handleResize = () => {
         const w = window.innerWidth;
         const h = window.innerHeight;
-        this._listeners.forEach(({ cb }) => cb(w, h));
+        let s;
+        const orientation = w > h ? "h" : "v";
+        if (orientation === "h") {
+          s = Math.min(w / 1920, h / 1080);
+        } else {
+          s = Math.min(w / 1080, h / 1920);
+        }
+        this._listeners.forEach(({ cb }) => cb(w, h, s));
       };
       this._mode = mode;
       if (mode === "h" || mode === "v")
@@ -3540,19 +3550,28 @@ ${log3.label}：`, log3.value];
      * @returns 一个函数，用于移除该监听器
      */
     on(cb, immediate = true) {
+      const w = window.innerWidth;
+      const h = window.innerHeight;
+      const orientation = w > h ? "h" : "v";
       if (this._mode === "h") {
-        immediate && cb(1920, 1080);
+        immediate && cb(1920, 1080, Math.min(w / 1920, h / 1080));
         return () => {
         };
       } else if (this._mode === "v") {
-        immediate && cb(1080, 1920);
+        immediate && cb(1080, 1920, Math.min(w / 1080, h / 1920));
         return () => {
         };
       }
+      let s;
+      if (orientation === "h") {
+        s = Math.min(w / 1920, h / 1080);
+      } else {
+        s = Math.min(w / 1080, h / 1920);
+      }
       const item = { cb, immediate };
       this._listeners.push(item);
       if (immediate)
-        cb(window.innerWidth, window.innerHeight);
+        cb(window.innerWidth, window.innerHeight, s);
       return () => {
         this._listeners = this._listeners.filter((l) => l !== item);
       };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lyb-js",
-  "version": "1.6.5",
+  "version": "1.6.7",
   "description": "自用JS方法库",
   "license": "ISC",
   "type": "module",