lyb-pixi-js 1.12.57 → 1.12.59

package/Components/Custom/LibPixiInput.d.ts

@@ -31,8 +31,6 @@ interface Params {
     maxLength?: number;
     /** 对齐方式 */
     align?: "left" | "center";
-    /** 输入回调 */
-    onInput?: (text: number | string) => void;
     /** 失去焦点回调 */
     onValue?: (text: number | string) => void;
     /** 格式化显示值 */
@@ -67,11 +65,11 @@ export declare class LibPixiInput extends LibPixiContainer {
     private _createInput;
     /** @description 创建只读输入框 */
     private _createReadOnlyInput;
-    /** @description 失焦 */
-    private _blur;
     /** @description 失去焦点处理 */
     private _onBlurHandler;
     /** @description 实时更新输入框位置 */
     private _updateInputPosition;
+    /** @description 失焦 */
+    private _blur;
 }
 export {};

package/Components/Custom/LibPixiInput.js

@@ -49,20 +49,32 @@ export class LibPixiInput extends LibPixiContainer {
     }
     /** @description 设置值 */
     setValue(v) {
-        const { onFormatValue, type = "text" } = this._params;
-        const value = v;
-        this._value = value;
-        if (type === "password") {
-            this._readonlyInput.text =
-                (onFormatValue === null || onFormatValue === void 0 ? void 0 : onFormatValue(value)) || "●".repeat(value.length);
+        const { onFormatValue, type = "text", onValue, width } = this._params;
+        this._value = v;
+        const formatted = onFormatValue === null || onFormatValue === void 0 ? void 0 : onFormatValue(v);
+        const displayText = type === "password" ? formatted || "●".repeat(v.length) : formatted || v;
+        this._readonlyInput.text = displayText;
+        this._input.style.display = "none";
+        libPixiScaleContainer(this._readonlyInput, width);
+        const isEmpty = v === "";
+        const isNumber = type === "number";
+        const num = Number(v);
+        if (isNumber) {
+            const validNum = !isNaN(num) && num !== 0;
+            this._readonlyInput.visible = validNum;
+            this._placeholder.visible = !validNum;
+            onValue === null || onValue === void 0 ? void 0 : onValue(num);
         }
         else {
-            this._readonlyInput.text = (onFormatValue === null || onFormatValue === void 0 ? void 0 : onFormatValue(value)) || value;
+            this._readonlyInput.visible = !isEmpty;
+            this._placeholder.visible = isEmpty;
+            onValue === null || onValue === void 0 ? void 0 : onValue(v);
         }
     }
     /** @description 更改输入框描述 */
     setPlaceholder(v) {
         this._placeholder.text = v;
+        libPixiScaleContainer(this._placeholder, this._params.width);
     }
     /** @description 聚焦 */
     focus() {
@@ -87,13 +99,11 @@ export class LibPixiInput extends LibPixiContainer {
     /** @description 清空输入框 */
     clear() {
         this._input.value = "";
-        this._placeholder.visible = true;
-        this._readonlyInput.visible = false;
         this._blur();
     }
     /** @description 创建输入框 */
     _createInput() {
-        const { color = "#fff", maxLength = 999999, align = "left", type = "text", onInput = () => { }, fontFamily = "", bold = false, } = this._params;
+        const { color = "#fff", maxLength = 999999, align = "left", type = "text", fontFamily = "", bold = false, } = this._params;
         this._input = document.createElement("input");
         this._input.type = type;
         this._input.maxLength = maxLength;
@@ -113,7 +123,6 @@ export class LibPixiInput extends LibPixiContainer {
             if (this.value.length > maxLength && type === "number") {
                 this.value = this.value.slice(0, maxLength);
             }
-            onInput(this.value.trim());
         });
         this._input.addEventListener("paste", function (e) {
             var _a, _b;
@@ -140,6 +149,7 @@ export class LibPixiInput extends LibPixiContainer {
         this._placeholder.visible = !value;
         this._placeholder.anchor.set(align === "left" ? 0 : 0.5, 0.5);
         this._placeholder.position.set(align === "left" ? 0 : width / 2, height / 2);
+        libPixiScaleContainer(this._placeholder, this._params.width);
         //创建实际显示的文本
         this._readonlyInput = new LibPixiText({
             text: value,
@@ -153,28 +163,6 @@ export class LibPixiInput extends LibPixiContainer {
         this._readonlyInput.anchor.set(align === "left" ? 0 : 0.5, 0.5);
         this._readonlyInput.position.set(align === "left" ? 0 : width / 2, height / 2);
     }
-    /** @description 失焦 */
-    _blur() {
-        const { onValue, width } = this._params;
-        const value = this._onBlurHandler();
-        this.setValue(value);
-        this._input.style.display = "none";
-        libPixiScaleContainer(this._readonlyInput, width);
-        if (this._params.type === "number" && value !== "") {
-            this._readonlyInput.visible = true;
-            onValue === null || onValue === void 0 ? void 0 : onValue(Number(value));
-        }
-        else {
-            onValue === null || onValue === void 0 ? void 0 : onValue(value);
-            //如果输入的值为空，并且启用了描述，并且没有默认值，则显示描述
-            if (value === "" && this._placeholder) {
-                this._placeholder.visible = true;
-            }
-            else {
-                this._readonlyInput.visible = true;
-            }
-        }
-    }
     /** @description 实时更新输入框位置 */
     _updateInputPosition() {
         const { width, height, x, y } = this.getBounds();
@@ -201,4 +189,9 @@ export class LibPixiInput extends LibPixiContainer {
             this._input.style.transform = `rotate(90deg)`;
         }
     }
+    /** @description 失焦 */
+    _blur() {
+        const value = this._onBlurHandler();
+        this.setValue(value);
+    }
 }

package/Components/Custom/LibPixiScrollContainerX.d.ts

@@ -15,6 +15,8 @@ export interface LibPixiScrollContainerXParams {
     maskX?: number;
     /** 遮罩Y坐标 */
     maskY?: number;
+    /** 滚动触发 */
+    onScroll?: (x: number) => void;
 }
 /** @description 支持鼠标滚轮滚动、鼠标拖动、手指滑动，支持惯性滚动及回弹 */
 export declare class LibPixiScrollContainerX extends LibPixiContainer {
@@ -42,6 +44,8 @@ export declare class LibPixiScrollContainerX extends LibPixiContainer {
     private _maskGraphics;
     /** 滚动的内容 */
     private _content;
+    /** 滚动触发 */
+    private _onScroll?;
     constructor(params: LibPixiScrollContainerXParams);
     /** @description 添加边距 */
     addMargin(leftMargin: number, rightMargin?: number): void;

package/Components/Custom/LibPixiScrollContainerX.js

@@ -6,7 +6,7 @@ import { LibPixiRectangle } from "../Base/LibPixiRectangle";
 /** @description 支持鼠标滚轮滚动、鼠标拖动、手指滑动，支持惯性滚动及回弹 */
 export class LibPixiScrollContainerX extends LibPixiContainer {
     constructor(params) {
-        const { width, height, scrollContent, bgColor, maskTexture, maskX = 0, maskY = 0, } = params;
+        const { width, height, scrollContent, bgColor, maskTexture, maskX = 0, maskY = 0, onScroll, } = params;
         super(width, height, bgColor);
         /** 开始位置 */
         this._startX = 0;
@@ -23,6 +23,7 @@ export class LibPixiScrollContainerX extends LibPixiContainer {
         /** 左边距 */
         this._leftMargin = 0;
         this._scrollContent = scrollContent;
+        this._onScroll = onScroll;
         // 创建内容容器
         this._content = new Container();
         this.addChild(this._content);
@@ -113,10 +114,12 @@ export class LibPixiScrollContainerX extends LibPixiContainer {
     }
     /** @description 拖动 */
     _onDragMove(event) {
+        var _a;
         if (this._isDragging) {
             const { x } = event.getLocalPosition(this);
             const newPosition = x - this._startX;
             this._content.x = newPosition;
+            (_a = this._onScroll) === null || _a === void 0 ? void 0 : _a.call(this, this._content.x);
         }
     }
     /** @description 拖动结束 */
@@ -164,6 +167,8 @@ export class LibPixiScrollContainerX extends LibPixiContainer {
     }
     /** @description 限制滚动范围 */
     _limitScrollRange() {
+        var _a;
+        (_a = this._onScroll) === null || _a === void 0 ? void 0 : _a.call(this, this._content.x);
         //如果内容顶部离开了滚动容器顶部，则归位
         if (this._content.x > 0) {
             //回弹
@@ -171,6 +176,10 @@ export class LibPixiScrollContainerX extends LibPixiContainer {
                 duration: 0.2,
                 ease: "power1.out",
                 x: 0,
+                onUpdate: () => {
+                    var _a;
+                    (_a = this._onScroll) === null || _a === void 0 ? void 0 : _a.call(this, this._content.x);
+                },
             });
         }
         // 如果滚动距离大于内容高度减去遮罩高度
@@ -184,6 +193,10 @@ export class LibPixiScrollContainerX extends LibPixiContainer {
                     duration: 0.2,
                     ease: "power1.out",
                     x,
+                    onUpdate: () => {
+                        var _a;
+                        (_a = this._onScroll) === null || _a === void 0 ? void 0 : _a.call(this, this._content.x);
+                    },
                 });
             }
             // 否则静止不动
@@ -191,6 +204,10 @@ export class LibPixiScrollContainerX extends LibPixiContainer {
                 gsap.to(this._content, {
                     duration: 0.25,
                     x: 0,
+                    onUpdate: () => {
+                        var _a;
+                        (_a = this._onScroll) === null || _a === void 0 ? void 0 : _a.call(this, this._content.x);
+                    },
                 });
             }
         }

package/package.json

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