lyb-js 1.6.9 → 1.6.11

package/Data/LibJsDeepJSONParse.d.ts

@@ -1,4 +1,4 @@
-/** @description 递归将JSON字符串深度解析为对象（安全版，支持循环引用检测）
+/** @description 递归将JSON字符串深度解析为对象
  * @link 使用方法：https://www.npmjs.com/package/lyb-js#LibJsDeepJSONParse-深度解析JSON
  */
-export declare const libJsDeepJSONParse: <T>(data: any, seen?: WeakSet<object>) => T;
+export declare const libJsDeepJSONParse: (data: any) => any;

package/Data/LibJsDeepJSONParse.js

@@ -1,31 +1,30 @@
-/** @description 递归将JSON字符串深度解析为对象（安全版，支持循环引用检测）
+/** @description 递归将JSON字符串深度解析为对象
  * @link 使用方法：https://www.npmjs.com/package/lyb-js#LibJsDeepJSONParse-深度解析JSON
  */
-export const libJsDeepJSONParse = (data, seen = new WeakSet()) => {
-    // 检查是否为字符串并尝试解析（仅在可能是JSON时才解析）
-    if (typeof data === "string" && /^[\[{]/.test(data.trim())) {
-        try {
-            const parsed = JSON.parse(data);
-            return libJsDeepJSONParse(parsed, seen);
+export const libJsDeepJSONParse = (data) => {
+    // 检查是否为字符串并尝试解析
+    if (typeof data === "string") {
+        const trimmed = data.trim();
+        // 仅当字符串看起来是对象或数组时才尝试解析
+        if ((trimmed.startsWith("{") && trimmed.endsWith("}")) ||
+            (trimmed.startsWith("[") && trimmed.endsWith("]"))) {
+            try {
+                return libJsDeepJSONParse(JSON.parse(trimmed));
+            }
+            catch (_a) {
+                return data; // 如果解析失败，返回原始字符串
+            }
         }
-        catch (_a) {
-            return data;
-        }
-    }
-    // 循环引用检测
-    if (data !== null && typeof data === "object") {
-        if (seen.has(data))
-            return data;
-        seen.add(data);
+        return data; // 非 JSON 字符串直接返回
     }
     // 如果是数组，递归处理每个元素
     if (Array.isArray(data)) {
-        return data.map((item) => libJsDeepJSONParse(item, seen));
+        return data.map((item) => libJsDeepJSONParse(item));
     }
     // 如果是对象，递归处理每个属性值
     if (data !== null && typeof data === "object") {
-        return Object.entries(data).reduce((acc, [key, value]) => {
-            acc[key] = libJsDeepJSONParse(value, seen);
+        return Object.keys(data).reduce((acc, key) => {
+            acc[key] = libJsDeepJSONParse(data[key]);
             return acc;
         }, {});
     }

package/Misc/LibJsPullUpLoad.d.ts

@@ -0,0 +1,21 @@
+import { LibJsClassObservable } from "./LibJsClassObservable";
+interface PullUpLoadObservable {
+    /** 当前加载状态文案 */
+    statusText: string;
+    /** 加载状态 */
+    loadStatus: "idle" | "loading" | "noMore" | "empty";
+}
+interface PullUpLoadParams {
+    /** 滚动容器 */
+    scrollEl: HTMLElement;
+    /** 加载状态元素 */
+    loadStatusEl: HTMLElement;
+    /** 触发加载回调 */
+    onLoad: () => void;
+}
+/** @description 上拉加载 */
+export declare class LibJsPullUpLoad extends LibJsClassObservable<PullUpLoadObservable> {
+    constructor(params: PullUpLoadParams);
+    private checkAutoLoad;
+}
+export {};

package/Misc/LibJsPullUpLoad.js

@@ -0,0 +1,47 @@
+import { LibJsClassObservable } from "./LibJsClassObservable";
+/** @description 上拉加载 */
+export class LibJsPullUpLoad extends LibJsClassObservable {
+    constructor(params) {
+        super({
+            statusText: "加载中...",
+            loadStatus: "idle",
+        });
+        const { scrollEl, loadStatusEl, onLoad } = params;
+        this.checkAutoLoad(onLoad, scrollEl);
+        this.onValue("loadStatus", (v) => {
+            if (v === "idle") {
+                this.checkAutoLoad(onLoad, scrollEl);
+            }
+        });
+        /** @description 滚动触发 */
+        scrollEl.addEventListener("scroll", () => {
+            //如果所有数据已加载完毕，则不再触发加载
+            if (["noMore", "empty", "loading"].includes(this.getValue("loadStatus")))
+                return;
+            const y = scrollEl.scrollTop;
+            //获取距离加载触发像素值
+            const loadDistance = scrollEl.scrollHeight -
+                scrollEl.clientHeight -
+                y -
+                loadStatusEl.offsetHeight;
+            if (loadDistance <= 0) {
+                this.setValue("loadStatus", "loading");
+                this.setValue("statusText", "加载中...");
+                setTimeout(() => {
+                    onLoad();
+                }, 500);
+            }
+        });
+    }
+    // 1. 新增方法
+    checkAutoLoad(onLoad, scrollEl) {
+        if (!["noMore", "empty", "loading"].includes(this.getValue("loadStatus")) &&
+            scrollEl.scrollHeight <= scrollEl.clientHeight) {
+            this.setValue("loadStatus", "loading");
+            this.setValue("statusText", "加载中...");
+            setTimeout(() => {
+                onLoad();
+            }, 500);
+        }
+    }
+}

package/libJs.d.ts

@@ -1,6 +1,7 @@
 import { LibJsNumberStepper } from "./Misc/LibJsNumberStepper";
 import { LibJsClassObservable } from "./Misc/LibJsClassObservable";
 import { LibJsResizeWatcher } from "./Base/LibJsResizeWatcher";
+import { LibJsPullUpLoad } from "./Misc/LibJsPullUpLoad";
 /** @description 基础方法 */
 export declare const Base: {
     /**
@@ -78,7 +79,7 @@ export declare const Data: {
     /** @description 递归将JSON字符串深度解析为对象
      * @link 使用方法：https://www.npmjs.com/package/lyb-js#LibJsDeepJSONParse-深度解析JSON
      */
-    libJsDeepJSONParse: <T>(data: any, seen?: WeakSet<object>) => T;
+    libJsDeepJSONParse: (data: any) => any;
     /**
      * @description 分类汇总，将数组对象按照指定键值整理成一个以键值为键名的对象
      * @param arr 要分组的数组
@@ -278,6 +279,8 @@ export declare const Misc: {
      * @link 使用方法：https://www.npmjs.com/package/lyb-js#LibJsClassObservable-类属性监听器
      */
     LibJsClassObservable: typeof LibJsClassObservable;
+    /** @description 上拉加载 */
+    LibJsPullUpLoad: typeof LibJsPullUpLoad;
 };
 /** @description 随机相关方法 */
 export declare const Random: {

package/libJs.js

@@ -43,6 +43,7 @@ import { LibJsNormalizeInRange } from "./Math/LibJsNormalizeInRange";
 import { LibJsClassObservable } from "./Misc/LibJsClassObservable";
 import { libJsCopy } from "./Browser/LibJsCopy";
 import { LibJsResizeWatcher } from "./Base/LibJsResizeWatcher";
+import { LibJsPullUpLoad } from "./Misc/LibJsPullUpLoad";
 /** @description 基础方法 */
 export const Base = {
     /**
@@ -290,6 +291,8 @@ export const Misc = {
      * @link 使用方法：https://www.npmjs.com/package/lyb-js#LibJsClassObservable-类属性监听器
      */
     LibJsClassObservable,
+    /** @description 上拉加载 */
+    LibJsPullUpLoad,
 };
 /** @description 随机相关方法 */
 export const Random = {

package/lyb.js

@@ -133,31 +133,26 @@ ${log3.label}：`, log3.value];
     }
     return result;
   };
-  const libJsDeepJSONParse = (data, seen = /* @__PURE__ */ new WeakSet()) => {
-    if (typeof data === "string" && /^[\[{]/.test(data.trim())) {
-      try {
-        const parsed = JSON.parse(data);
-        return libJsDeepJSONParse(parsed, seen);
-      } catch {
-        return data;
+  const libJsDeepJSONParse = (data) => {
+    if (typeof data === "string") {
+      const trimmed = data.trim();
+      if (trimmed.startsWith("{") && trimmed.endsWith("}") || trimmed.startsWith("[") && trimmed.endsWith("]")) {
+        try {
+          return libJsDeepJSONParse(JSON.parse(trimmed));
+        } catch {
+          return data;
+        }
       }
-    }
-    if (data !== null && typeof data === "object") {
-      if (seen.has(data))
-        return data;
-      seen.add(data);
+      return data;
     }
     if (Array.isArray(data)) {
-      return data.map((item) => libJsDeepJSONParse(item, seen));
+      return data.map((item) => libJsDeepJSONParse(item));
     }
     if (data !== null && typeof data === "object") {
-      return Object.entries(data).reduce(
-        (acc, [key, value]) => {
-          acc[key] = libJsDeepJSONParse(value, seen);
-          return acc;
-        },
-        {}
-      );
+      return Object.keys(data).reduce((acc, key) => {
+        acc[key] = libJsDeepJSONParse(data[key]);
+        return acc;
+      }, {});
     }
     return data;
   };
@@ -313,10 +308,10 @@ ${log3.label}：`, log3.value];
     return distance;
   };
   /*!
-   *  decimal.js v10.4.3
+   *  decimal.js v10.5.0
    *  An arbitrary-precision Decimal type for JavaScript.
    *  https://github.com/MikeMcl/decimal.js
-   *  Copyright (c) 2022 Michael Mclaughlin <M8ch88l@gmail.com>
+   *  Copyright (c) 2025 Michael Mclaughlin <M8ch88l@gmail.com>
    *  MIT Licence
    */
   var EXP_LIMIT = 9e15, MAX_DIGITS = 1e9, NUMERALS = "0123456789abcdef", LN10 = "2.3025850929940456840179914546843642076011014886287729760333279009675726096773524802359972050895982983419677840422862486334095254650828067566662873690987816894829072083255546808437998948262331985283935053089653777326288461633662222876982198867465436674744042432743651550489343149393914796194044002221051017141748003688084012647080685567743216228355220114804663715659121373450747856947683463616792101806445070648000277502684916746550586856935673420670581136429224554405758925724208241314695689016758940256776311356919292033376587141660230105703089634572075440370847469940168269282808481184289314848524948644871927809676271275775397027668605952496716674183485704422507197965004714951050492214776567636938662976979522110718264549734772662425709429322582798502585509785265383207606726317164309505995087807523710333101197857547331541421808427543863591778117054309827482385045648019095610299291824318237525357709750539565187697510374970888692180205189339507238539205144634197265287286965110862571492198849978748873771345686209167058", PI = "3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679821480865132823066470938446095505822317253594081284811174502841027019385211055596446229489549303819644288109756659334461284756482337867831652712019091456485669234603486104543266482133936072602491412737245870066063155881748815209209628292540917153643678925903600113305305488204665213841469519415116094330572703657595919530921861173819326117931051185480744623799627495673518857527248912279381830119491298336733624406566430860213949463952247371907021798609437027705392171762931767523846748184676694051320005681271452635608277857713427577896091736371787214684409012249534301465495853710507922796892589235420199561121290219608640344181598136297747713099605187072113499999983729780499510597317328160963185950244594553469083026425223082533446850352619311881710100031378387528865875332083814206171776691473035982534904287554687311595628638823537875937519577818577805321712268066130019278766111959092164201989380952572010654858632789", DEFAULTS = {
@@ -585,7 +580,7 @@ ${log3.label}：`, log3.value];
     return divide(x.sinh(), x.cosh(), Ctor.precision = pr, Ctor.rounding = rm);
   };
   P.inverseCosine = P.acos = function() {
-    var halfPi, x = this, Ctor = x.constructor, k = x.abs().cmp(1), pr = Ctor.precision, rm = Ctor.rounding;
+    var x = this, Ctor = x.constructor, k = x.abs().cmp(1), pr = Ctor.precision, rm = Ctor.rounding;
     if (k !== -1) {
       return k === 0 ? x.isNeg() ? getPi(Ctor, pr, rm) : new Ctor(0) : new Ctor(NaN);
     }
@@ -593,11 +588,10 @@ ${log3.label}：`, log3.value];
       return getPi(Ctor, pr + 4, rm).times(0.5);
     Ctor.precision = pr + 6;
     Ctor.rounding = 1;
-    x = x.asin();
-    halfPi = getPi(Ctor, pr + 4, rm).times(0.5);
+    x = new Ctor(1).minus(x).div(x.plus(1)).sqrt().atan();
     Ctor.precision = pr;
     Ctor.rounding = rm;
-    return halfPi.minus(x);
+    return x.times(2);
   };
   P.inverseHyperbolicCosine = P.acosh = function() {
     var pr, rm, x = this, Ctor = x.constructor;
@@ -1809,14 +1803,16 @@ ${log3.label}：`, log3.value];
   function isOdd(n) {
     return n.d[n.d.length - 1] & 1;
   }
-  function maxOrMin(Ctor, args, ltgt) {
-    var y, x = new Ctor(args[0]), i = 0;
+  function maxOrMin(Ctor, args, n) {
+    var k, y, x = new Ctor(args[0]), i = 0;
     for (; ++i < args.length; ) {
       y = new Ctor(args[i]);
       if (!y.s) {
         x = y;
         break;
-      } else if (x[ltgt](y)) {
+      }
+      k = x.cmp(y);
+      if (k === n || k === 0 && x.s === n) {
         x = y;
       }
     }
@@ -2397,7 +2393,8 @@ ${log3.label}：`, log3.value];
             x.d = [v];
           }
           return;
-        } else if (v * 0 !== 0) {
+        }
+        if (v * 0 !== 0) {
           if (!v)
             x.s = NaN;
           x.e = NaN;
@@ -2405,18 +2402,28 @@ ${log3.label}：`, log3.value];
           return;
         }
         return parseDecimal(x, v.toString());
-      } else if (t !== "string") {
-        throw Error(invalidArgument + v);
       }
-      if ((i2 = v.charCodeAt(0)) === 45) {
-        v = v.slice(1);
-        x.s = -1;
-      } else {
-        if (i2 === 43)
+      if (t === "string") {
+        if ((i2 = v.charCodeAt(0)) === 45) {
           v = v.slice(1);
-        x.s = 1;
+          x.s = -1;
+        } else {
+          if (i2 === 43)
+            v = v.slice(1);
+          x.s = 1;
+        }
+        return isDecimal.test(v) ? parseDecimal(x, v) : parseOther(x, v);
       }
-      return isDecimal.test(v) ? parseDecimal(x, v) : parseOther(x, v);
+      if (t === "bigint") {
+        if (v < 0) {
+          v = -v;
+          x.s = -1;
+        } else {
+          x.s = 1;
+        }
+        return parseDecimal(x, v.toString());
+      }
+      throw Error(invalidArgument + v);
     }
     Decimal2.prototype = P;
     Decimal2.ROUND_UP = 0;
@@ -2526,10 +2533,10 @@ ${log3.label}：`, log3.value];
     return new this(x).log(10);
   }
   function max() {
-    return maxOrMin(this, arguments, "lt");
+    return maxOrMin(this, arguments, -1);
   }
   function min() {
-    return maxOrMin(this, arguments, "gt");
+    return maxOrMin(this, arguments, 1);
   }
   function mod(x, y) {
     return new this(x).mod(y);
@@ -3560,6 +3567,44 @@ ${log3.label}：`, log3.value];
       };
     }
   }
+  class LibJsPullUpLoad extends LibJsClassObservable {
+    constructor(params) {
+      super({
+        statusText: "加载中...",
+        loadStatus: "idle"
+      });
+      const { scrollEl, loadStatusEl, onLoad } = params;
+      this.checkAutoLoad(onLoad, scrollEl);
+      this.onValue("loadStatus", (v) => {
+        if (v === "idle") {
+          this.checkAutoLoad(onLoad, scrollEl);
+        }
+      });
+      scrollEl.addEventListener("scroll", () => {
+        if (["noMore", "empty", "loading"].includes(this.getValue("loadStatus")))
+          return;
+        const y = scrollEl.scrollTop;
+        const loadDistance = scrollEl.scrollHeight - scrollEl.clientHeight - y - loadStatusEl.offsetHeight;
+        if (loadDistance <= 0) {
+          this.setValue("loadStatus", "loading");
+          this.setValue("statusText", "加载中...");
+          setTimeout(() => {
+            onLoad();
+          }, 500);
+        }
+      });
+    }
+    // 1. 新增方法
+    checkAutoLoad(onLoad, scrollEl) {
+      if (!["noMore", "empty", "loading"].includes(this.getValue("loadStatus")) && scrollEl.scrollHeight <= scrollEl.clientHeight) {
+        this.setValue("loadStatus", "loading");
+        this.setValue("statusText", "加载中...");
+        setTimeout(() => {
+          onLoad();
+        }, 500);
+      }
+    }
+  }
   const Base = {
     /**
      * @description 返回数据类型
@@ -3799,7 +3844,9 @@ ${log3.label}：`, log3.value];
     /** @description 类属性监听器
      * @link 使用方法：https://www.npmjs.com/package/lyb-js#LibJsClassObservable-类属性监听器
      */
-    LibJsClassObservable
+    LibJsClassObservable,
+    /** @description 上拉加载 */
+    LibJsPullUpLoad
   };
   const Random = {
     /** @description 百分比概率结果

package/package.json

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

package/Misc/LibJsObserver.d.ts

@@ -1,25 +0,0 @@
-type Callback<T> = (newValue: T[keyof T], oldValue: T[keyof T]) => void;
-export declare class LibJsObserver<Store> {
-    /** 递增索引 */
-    private _index;
-    private _store;
-    private _lastData;
-    private _listeners;
-    constructor(store: Store);
-    /** @description 监听
-     * @param key 要监听的键
-     * @param callback key值变化时执行的回调函数
-     * @param immediately 监听时是否立即执行回调函数
-     * @returns 返回一个函数用于注销监听器
-     */
-    on(key: keyof Store, callback: Callback<Store>, immediately?: boolean): () => void;
-    /** @description 获取数据 */
-    getData(key: keyof Store): Store[keyof Store];
-    /** @description 手动更新数据 */
-    setData(newData: Partial<Store>): void;
-    /** @description 通知监听器更新 */
-    private _notifyListeners;
-    /** @description 判断数据变化并通知监听器 */
-    private _update;
-}
-export {};

package/Misc/LibJsObserver.js

@@ -1,100 +0,0 @@
-export class LibJsObserver {
-    constructor(store) {
-        /** 递增索引 */
-        this._index = 0;
-        // 监听器映射，用于存储不同键的回调函数
-        this._listeners = new Map();
-        this._store = store;
-        this._lastData = Object.assign({}, store);
-    }
-    /** @description 监听
-     * @param key 要监听的键
-     * @param callback key值变化时执行的回调函数
-     * @param immediately 监听时是否立即执行回调函数
-     * @returns 返回一个函数用于注销监听器
-     */
-    on(key, callback, immediately = true) {
-        this._index += 1;
-        const index = this._index;
-        // 如果该键没有对应的监听器集合，则初始化一个新的集合
-        if (!this._listeners.has(key)) {
-            this._listeners.set(key, new Map());
-        }
-        // 将回调函数添加到对应键的监听器集合中
-        this._listeners.get(key).set(index, callback);
-        immediately && callback(this._store[key], this._lastData[key]);
-        return () => {
-            // 从特定键的监听器集合中移除指定标识符的回调函数
-            const listenerMap = this._listeners.get(key);
-            if (listenerMap) {
-                listenerMap.delete(index);
-            }
-            else {
-                console.warn(`监听 Key "${key.toString()}" 重复注销事件`);
-            }
-        };
-    }
-    /** @description 获取数据 */
-    getData(key) {
-        return this._store[key];
-    }
-    /** @description 手动更新数据 */
-    setData(newData) {
-        this._store = Object.assign(Object.assign({}, this._store), newData);
-        this._update();
-    }
-    /** @description 通知监听器更新 */
-    _notifyListeners(key, newValue, oldValue) {
-        // 获取特定键的所有监听器
-        const keyListeners = this._listeners.get(key);
-        if (keyListeners) {
-            // 遍历并执行每个监听器的回调函数
-            keyListeners.forEach((callback) => callback(newValue, oldValue));
-        }
-    }
-    /** @description 判断数据变化并通知监听器 */
-    _update() {
-        // 遍历当前数据对象的每个键，检查是否有变化
-        for (const key in this._store) {
-            const typedKey = key;
-            const newValue = this._store[typedKey];
-            const oldValue = this._lastData[typedKey];
-            //如果旧值与新值不相等，则通知监听器
-            if (newValue !== oldValue) {
-                this._notifyListeners(typedKey, newValue, oldValue);
-                this._lastData[typedKey] = this._store[typedKey];
-            }
-        }
-    }
-}
-class LibJsStore extends LibJsObserver {
-    constructor() {
-        super({
-            name: "张三",
-            age: 20,
-        });
-    }
-}
-const store = new LibJsStore();
-const offA = store.on("age", (newValue) => {
-    console.log(`A收到年龄更新：`, newValue);
-});
-store.on("age", (newValue) => {
-    console.log(`B收到年龄更新：`, newValue);
-});
-// 模拟更新数据
-setTimeout(() => {
-    console.log("尝试更新年龄值为：25");
-    store.setData({ age: 25 });
-    setTimeout(() => {
-        console.warn("注销A监听器");
-        offA();
-        setTimeout(() => {
-            console.warn("尝试更新年龄值为：26");
-            store.setData({ age: 26 });
-            setTimeout(() => {
-                console.log("尝试获取年龄值：", store.getData("age"));
-            }, 1000);
-        }, 1000);
-    }, 1000);
-}, 1000);