@whitesev/utils 2.4.6 → 2.4.8

package/dist/index.system.js

@@ -3829,9 +3829,18 @@ System.register('Utils', [], (function (exports) {
                 /** 使用的配置 */
                 api;
                 constructor(option) {
+                    if (option) {
+                        if (option.globalThis == null) {
+                            option.globalThis = option.window;
+                        }
+                        if (option.self == null) {
+                            option.self = option.window;
+                        }
+                    }
                     if (!option) {
                         option = Object.assign({}, this.defaultApi);
                     }
+                    // @ts-ignore
                     this.api = Object.assign({}, option);
                 }
                 get document() {
@@ -4096,7 +4105,7 @@ System.register('Utils', [], (function (exports) {
                     this.windowApi = new WindowApi(option);
                 }
                 /** 版本号 */
-                version = "2024.11.5";
+                version = "2024.11.6";
                 addStyle(cssText) {
                     if (typeof cssText !== "string") {
                         throw new Error("Utils.addStyle 参数cssText 必须为String类型");
@@ -5280,13 +5289,45 @@ System.register('Utils', [], (function (exports) {
                 isNativeFunc(target) {
                     return Boolean(target.toString().match(/^function .*\(\) { \[native code\] }$/));
                 }
-                isNearBottom(nearValue = 50) {
-                    var scrollTop = this.windowApi.window.pageYOffset ||
-                        this.windowApi.document.documentElement.scrollTop;
-                    var windowHeight = this.windowApi.window.innerHeight ||
-                        this.windowApi.document.documentElement.clientHeight;
-                    var documentHeight = this.windowApi.document.documentElement.scrollHeight;
-                    return scrollTop + windowHeight >= documentHeight - nearValue;
+                isNearBottom(...args) {
+                    let nearBottomHeight = 50;
+                    let checkWindow = () => {
+                        // 已滚动的距离
+                        let scrollTop = this.windowApi.window.pageYOffset ||
+                            this.windowApi.document.documentElement.scrollTop;
+                        // 视窗高度
+                        let viewportHeight = this.windowApi.window.innerHeight ||
+                            this.windowApi.document.documentElement.clientHeight;
+                        // 最大滚动距离
+                        let maxScrollHeight = this.windowApi.document.documentElement.scrollHeight - nearBottomHeight;
+                        return scrollTop + viewportHeight >= maxScrollHeight;
+                    };
+                    let checkNode = ($ele) => {
+                        // 已滚动的距离
+                        let scrollTop = $ele.scrollTop;
+                        // 视窗高度
+                        let viewportHeight = $ele.clientHeight;
+                        // 最大滚动距离
+                        let maxScrollHeight = $ele.scrollHeight - viewportHeight - nearBottomHeight;
+                        return scrollTop >= maxScrollHeight;
+                    };
+                    let firstArg = args[0];
+                    if (args.length === 0 || typeof args[0] === "number") {
+                        // nearBottomHeight
+                        //
+                        return checkWindow();
+                    }
+                    else if (typeof args[0] === "object" && args[0] instanceof HTMLElement) {
+                        // target
+                        // target，nearBottomHeight
+                        if (typeof args[1] === "number" && !Number.isNaN(args[1])) {
+                            nearBottomHeight = args[1];
+                        }
+                        return checkNode(args[0]);
+                    }
+                    else {
+                        throw new TypeError("参数1类型错误" + typeof firstArg);
+                    }
                 }
                 isDOM(target) {
                     return target instanceof Node;