lyb-pixi-js 1.12.3 → 1.12.5

package/Utils/LibPixiArrangeLinear.d.ts

@@ -4,6 +4,7 @@ import { Container } from "pixi.js";
  * @param items 要排列的元素数组。
  * @param gap 元素之间的间隔，可以是固定间隔或自定义的间隔数组。
  * @param direction 排列方向，"x"表示水平，"y"表示垂直，默认为水平。
+ * @param cols 列数，默认为元素数量。
  * @link 使用方法：https://www.npmjs.com/package/lyb-pixi-js#LibPixiArrangeLinear-间隔布局
  */
-export declare const LibPixiArrangeLinear: (items: Container[], gap: number | number[], direction?: "x" | "y") => void;
+export declare const LibPixiArrangeLinear: (items: Container[], gap: number | number[], direction?: "x" | "y", cols?: number) => void;

package/Utils/LibPixiArrangeLinear.js

@@ -3,27 +3,43 @@
  * @param items 要排列的元素数组。
  * @param gap 元素之间的间隔，可以是固定间隔或自定义的间隔数组。
  * @param direction 排列方向，"x"表示水平，"y"表示垂直，默认为水平。
+ * @param cols 列数，默认为元素数量。
  * @link 使用方法：https://www.npmjs.com/package/lyb-pixi-js#LibPixiArrangeLinear-间隔布局
  */
-export const LibPixiArrangeLinear = (items, gap, direction = "x") => {
+export const LibPixiArrangeLinear = (items, gap, direction = "x", cols = Infinity) => {
     if (Array.isArray(gap)) {
         if (gap.length !== items.length - 1) {
             console.error(new Error("间隔的数组长度只能等于元素数组长度-1"));
             return;
         }
     }
-    let lastPosition = 0;
+    let lastRowMax = 0; // 记录当前行/列最大高度或宽度
+    let rowOffset = 0; // 累计偏移量（多行时用）
     items.forEach((item, index) => {
-        const position = index === 0
-            ? 0
-            : lastPosition + (Array.isArray(gap) ? gap[index - 1] : gap);
+        var _a, _b;
+        const row = Math.floor(index / cols);
+        const col = index % cols;
         if (direction === "x") {
-            item.x = position;
-            lastPosition = item.x + item.width;
+            const gapValue = Array.isArray(gap) ? (_a = gap[index - 1]) !== null && _a !== void 0 ? _a : 0 : gap;
+            if (col === 0 && row > 0) {
+                rowOffset += lastRowMax + gapValue;
+                lastRowMax = 0;
+            }
+            item.x =
+                col === 0 ? 0 : items[index - 1].x + items[index - 1].width + gapValue;
+            item.y = rowOffset;
+            lastRowMax = Math.max(lastRowMax, item.height);
         }
         else {
-            item.y = position;
-            lastPosition = item.y + item.height;
+            const gapValue = Array.isArray(gap) ? (_b = gap[index - 1]) !== null && _b !== void 0 ? _b : 0 : gap;
+            if (col === 0 && row > 0) {
+                rowOffset += lastRowMax + gapValue;
+                lastRowMax = 0;
+            }
+            item.y =
+                col === 0 ? 0 : items[index - 1].y + items[index - 1].height + gapValue;
+            item.x = rowOffset;
+            lastRowMax = Math.max(lastRowMax, item.width);
         }
     });
 };

package/Utils/LibPixiEvent.js

@@ -21,7 +21,7 @@ const debounceImmediate = (func, wait) => {
  * @link 使用方法：https://www.npmjs.com/package/lyb-pixi-js#LibPixiEvent-事件注册
  */
 export const libPixiEvent = (v, eventName, callback, params = {}) => {
-    const { once = false, debounce = false, debounceTime = 1000, preventDragClick = false } = params;
+    const { once = false, debounce = false, debounceTime = 1000, preventDragClick = false, } = params;
     v.cursor = "pointer";
     v.eventMode = "static";
     let lastX = 0;
@@ -32,8 +32,11 @@ export const libPixiEvent = (v, eventName, callback, params = {}) => {
             isDragging = false;
             lastX = e.globalX;
             lastY = e.globalY;
+            const threshold = 10; // 阈值像素
             const moveHandler = (ev) => {
-                if (ev.globalX !== lastX || ev.globalY !== lastY) {
+                const dx = ev.globalX - lastX;
+                const dy = ev.globalY - lastY;
+                if (dx * dx + dy * dy > threshold * threshold) {
                     isDragging = true;
                 }
             };

package/libPixiJs.d.ts

@@ -274,7 +274,7 @@ export declare const Utils: {
      * @param direction 排列方向，"x"表示水平，"y"表示垂直，默认为水平。
      * @link 使用方法：https://www.npmjs.com/package/lyb-pixi-js#LibPixiArrangeLinear-间隔布局
      */
-    LibPixiArrangeLinear: (items: import("pixi.js").Container[], gap: number | number[], direction?: "x" | "y") => void;
+    LibPixiArrangeLinear: (items: import("pixi.js").Container[], gap: number | number[], direction?: "x" | "y", cols?: number) => void;
     /** @description 触发后代监听
      * @param container 容器
      * @param event 事件名称

package/lyb-pixi.js

@@ -48800,7 +48800,12 @@ void main(void)\r
     };
   };
   const libPixiEvent = (v2, eventName, callback, params = {}) => {
-    const { once = false, debounce = false, debounceTime = 1e3, preventDragClick = false } = params;
+    const {
+      once = false,
+      debounce = false,
+      debounceTime = 1e3,
+      preventDragClick = false
+    } = params;
     v2.cursor = "pointer";
     v2.eventMode = "static";
     let lastX = 0;
@@ -48811,8 +48816,11 @@ void main(void)\r
         isDragging = false;
         lastX = e2.globalX;
         lastY = e2.globalY;
+        const threshold = 10;
         const moveHandler = (ev) => {
-          if (ev.globalX !== lastX || ev.globalY !== lastY) {
+          const dx = ev.globalX - lastX;
+          const dy = ev.globalY - lastY;
+          if (dx * dx + dy * dy > threshold * threshold) {
             isDragging = true;
           }
         };
@@ -55107,22 +55115,36 @@ void main(void){
       item.y = rowIndex * (itemHeight + gap);
     });
   };
-  const LibPixiArrangeLinear = (items, gap, direction = "x") => {
+  const LibPixiArrangeLinear = (items, gap, direction = "x", cols = Infinity) => {
     if (Array.isArray(gap)) {
       if (gap.length !== items.length - 1) {
         console.error(new Error("间隔的数组长度只能等于元素数组长度-1"));
         return;
       }
     }
-    let lastPosition = 0;
+    let lastRowMax = 0;
+    let rowOffset = 0;
     items.forEach((item, index) => {
-      const position = index === 0 ? 0 : lastPosition + (Array.isArray(gap) ? gap[index - 1] : gap);
+      const row = Math.floor(index / cols);
+      const col = index % cols;
       if (direction === "x") {
-        item.x = position;
-        lastPosition = item.x + item.width;
+        const gapValue = Array.isArray(gap) ? gap[index - 1] ?? 0 : gap;
+        if (col === 0 && row > 0) {
+          rowOffset += lastRowMax + gapValue;
+          lastRowMax = 0;
+        }
+        item.x = col === 0 ? 0 : items[index - 1].x + items[index - 1].width + gapValue;
+        item.y = rowOffset;
+        lastRowMax = Math.max(lastRowMax, item.height);
       } else {
-        item.y = position;
-        lastPosition = item.y + item.height;
+        const gapValue = Array.isArray(gap) ? gap[index - 1] ?? 0 : gap;
+        if (col === 0 && row > 0) {
+          rowOffset += lastRowMax + gapValue;
+          lastRowMax = 0;
+        }
+        item.y = col === 0 ? 0 : items[index - 1].y + items[index - 1].height + gapValue;
+        item.x = rowOffset;
+        lastRowMax = Math.max(lastRowMax, item.width);
       }
     });
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lyb-pixi-js",
-  "version": "1.12.3",
+  "version": "1.12.5",
   "description": "自用Pixi.JS方法库",
   "license": "ISC",
   "exports": {