@whitesev/utils 2.4.6 → 2.4.8

package/dist/types/src/Utils.d.ts

@@ -13,10 +13,10 @@ import type { DOMUtils_EventType } from "./types/Event";
 import type { UtilsAjaxHookResult } from "./types/ajaxHooker";
 import { Vue } from "./Vue";
 import { type ArgsType, type JSTypeNames, type UtilsOwnObject } from "./types/global";
-import type { UtilsWindowApiOption } from "./types/WindowApi";
+import type { WindowApiOption } from "./types/WindowApi";
 declare class Utils {
     private windowApi;
-    constructor(option?: UtilsWindowApiOption);
+    constructor(option?: WindowApiOption);
     /** 版本号 */
     version: string;
     /**
@@ -786,12 +786,18 @@ declare class Utils {
     isNativeFunc(target: Function): boolean;
     /**
      * 判断当前的位置是否位于页面底部附近
-     * @param nearValue （可选）判断在页面底部的误差值，默认：50
+     * @param nearBottomHeight （可选）判断在底部的误差值，默认：50
      * @returns
      * + true 在底部附近
      * + false 不在底部附近
      */
-    isNearBottom(nearValue?: number): boolean;
+    isNearBottom(nearBottomHeight?: number): boolean;
+    /**
+     * 判断元素内当前的位置是否位于元素内底部附近
+     * @param target 需要判断的元素
+     * @param nearBottomHeight （可选）判断在底部的误差值，默认：50
+     */
+    isNearBottom(target: HTMLElement, nearBottomHeight?: number): boolean;
     /**
      * 判断对象是否是元素
      * @param target
@@ -1720,7 +1726,7 @@ declare class Utils {
      * @param option
      * @returns
      */
-    createUtils(option?: UtilsWindowApiOption): Utils;
+    createUtils(option?: WindowApiOption): Utils;
     /**
      * 将对象转换为FormData
      * @param data 待转换的对象

package/dist/types/src/WindowApi.d.ts

@@ -1,10 +1,10 @@
-import type { UtilsWindowApiOption } from "./types/WindowApi";
+import type { WindowApiOption } from "./types/WindowApi";
 declare class WindowApi {
     /** 默认的配置 */
     private defaultApi;
     /** 使用的配置 */
     private api;
-    constructor(option?: UtilsWindowApiOption);
+    constructor(option?: WindowApiOption);
     get document(): Document;
     get window(): Window & typeof globalThis;
     get globalThis(): typeof globalThis | Window;

package/dist/types/src/types/WindowApi.d.ts

@@ -1,10 +1,10 @@
 /**
  * 配置类型
  */
-export type UtilsWindowApiOption = {
+export type WindowApiOption = {
 	document: Document;
 	window: Window & typeof globalThis;
-	globalThis: typeof globalThis | Window;
-	self: Window & typeof globalThis;
+	globalThis?: typeof globalThis | Window;
+	self?: Window & typeof globalThis;
 	top: Window;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whitesev/utils",
-  "version": "2.4.6",
+  "version": "2.4.8",
   "description": "一个常用的工具库",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

package/src/Utils.ts

@@ -21,15 +21,15 @@ import {
 	type JSTypeNames,
 	type UtilsOwnObject,
 } from "./types/global";
-import type { UtilsWindowApiOption } from "./types/WindowApi";
+import type { WindowApiOption } from "./types/WindowApi";
 
 class Utils {
-	private windowApi: WindowApi;
-	constructor(option?: UtilsWindowApiOption) {
+	private windowApi: typeof WindowApi.prototype;
+	constructor(option?: WindowApiOption) {
 		this.windowApi = new WindowApi(option);
 	}
 	/** 版本号 */
-	version = "2024.11.5";
+	version = "2024.11.6";
 
 	/**
 	 * 在页面中增加style元素，如果html节点存在子节点，添加子节点第一个，反之，添加到html节点的子节点最后一个
@@ -1857,21 +1857,64 @@ class Utils {
 	}
 	/**
 	 * 判断当前的位置是否位于页面底部附近
-	 * @param nearValue （可选）判断在页面底部的误差值，默认：50
+	 * @param nearBottomHeight （可选）判断在底部的误差值，默认：50
 	 * @returns
 	 * + true 在底部附近
 	 * + false 不在底部附近
 	 */
-	isNearBottom(nearValue?: number): boolean;
-	isNearBottom(nearValue: number = 50): boolean {
-		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(nearBottomHeight?: number): boolean;
+	/**
+	 * 判断元素内当前的位置是否位于元素内底部附近
+	 * @param target 需要判断的元素
+	 * @param nearBottomHeight （可选）判断在底部的误差值，默认：50
+	 */
+	isNearBottom(target: HTMLElement, nearBottomHeight?: number): boolean;
+	isNearBottom(...args: any[]): boolean {
+		let nearBottomHeight = 50;
+
+		let checkWindow = () => {
+			// 已滚动的距离
+			let scrollTop: number =
+				this.windowApi.window.pageYOffset ||
+				this.windowApi.document.documentElement.scrollTop;
+			// 视窗高度
+			let viewportHeight: number =
+				this.windowApi.window.innerHeight ||
+				this.windowApi.document.documentElement.clientHeight;
+			// 最大滚动距离
+			let maxScrollHeight: number =
+				this.windowApi.document.documentElement.scrollHeight - nearBottomHeight;
+
+			return scrollTop + viewportHeight >= maxScrollHeight;
+		};
+
+		let checkNode = ($ele: HTMLElement) => {
+			// 已滚动的距离
+			let scrollTop: number = $ele.scrollTop;
+			// 视窗高度
+			let viewportHeight: number = $ele.clientHeight;
+			// 最大滚动距离
+			let maxScrollHeight: number =
+				$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);
+		}
 	}
 	/**
 	 * 判断对象是否是元素
@@ -4978,7 +5021,7 @@ class Utils {
 	 * @param option
 	 * @returns
 	 */
-	createUtils(option?: UtilsWindowApiOption) {
+	createUtils(option?: WindowApiOption) {
 		return new Utils(option);
 	}
 

package/src/WindowApi.ts

@@ -1,8 +1,8 @@
-import type { UtilsWindowApiOption } from "./types/WindowApi";
+import type { WindowApiOption } from "./types/WindowApi";
 
 class WindowApi {
 	/** 默认的配置 */
-	private defaultApi: UtilsWindowApiOption = {
+	private defaultApi: Required<WindowApiOption> = {
 		document: document,
 		window: window,
 		globalThis: globalThis,
@@ -10,11 +10,20 @@ class WindowApi {
 		top: top!,
 	};
 	/** 使用的配置 */
-	private api: UtilsWindowApiOption;
-	constructor(option?: UtilsWindowApiOption) {
+	private api: Required<WindowApiOption>;
+	constructor(option?: WindowApiOption) {
+		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() {

package/src/types/WindowApi.d.ts

@@ -1,10 +1,10 @@
 /**
  * 配置类型
  */
-export type UtilsWindowApiOption = {
+export type WindowApiOption = {
 	document: Document;
 	window: Window & typeof globalThis;
-	globalThis: typeof globalThis | Window;
-	self: Window & typeof globalThis;
+	globalThis?: typeof globalThis | Window;
+	self?: Window & typeof globalThis;
 	top: Window;
 };