@whitesev/utils 2.2.5 → 2.2.7

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

@@ -19,6 +19,7 @@ export type HttpxResponseMap = {
     stream: ReadableStream<string>;
     document: Document;
     undefined: string;
+    html: string;
 };
 /**
  * headers的配置
@@ -1208,7 +1209,7 @@ declare class Httpx {
      * @param url 网址
      * @param details 配置
      */
-    get<T extends HttpxDetails>(url: string, details: T): HttpxPromise<HttpxAsyncResult<T>>;
+    get<T extends HttpxDetails>(url: string, details?: T): HttpxPromise<HttpxAsyncResult<T>>;
     /**
      * GET 请求
      * @param details 配置
@@ -1224,7 +1225,7 @@ declare class Httpx {
      * @param url 网址
      * @param details 配置
      */
-    post<T extends HttpxDetails>(url: string, details: T): HttpxPromise<HttpxAsyncResult<T>>;
+    post<T extends HttpxDetails>(url: string, details?: T): HttpxPromise<HttpxAsyncResult<T>>;
     /**
      * HEAD 请求
      * @param details 配置
@@ -1235,7 +1236,7 @@ declare class Httpx {
      * @param url 网址
      * @param details 配置
      */
-    head<T extends HttpxDetails>(url: string, details: T): HttpxPromise<HttpxAsyncResult<T>>;
+    head<T extends HttpxDetails>(url: string, details?: T): HttpxPromise<HttpxAsyncResult<T>>;
     /**
      * OPTIONS 请求
      * @param details 配置
@@ -1246,7 +1247,7 @@ declare class Httpx {
      * @param url 网址
      * @param details 配置
      */
-    options<T extends HttpxDetails>(url: string, details: T): HttpxPromise<HttpxAsyncResult<T>>;
+    options<T extends HttpxDetails>(url: string, details?: T): HttpxPromise<HttpxAsyncResult<T>>;
     /**
      * DELETE 请求
      * @param details 配置
@@ -1257,7 +1258,7 @@ declare class Httpx {
      * @param url 网址
      * @param details 配置
      */
-    delete<T extends HttpxDetails>(url: string, details: T): HttpxPromise<HttpxAsyncResult<T>>;
+    delete<T extends HttpxDetails>(url: string, details?: T): HttpxPromise<HttpxAsyncResult<T>>;
     /**
      * PUT 请求
      * @param details 配置
@@ -1268,6 +1269,6 @@ declare class Httpx {
      * @param url 网址
      * @param details 配置
      */
-    put<T extends HttpxDetails>(url: string, details: T): HttpxPromise<HttpxAsyncResult<T>>;
+    put<T extends HttpxDetails>(url: string, details?: T): HttpxPromise<HttpxAsyncResult<T>>;
 }
 export { Httpx };

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

@@ -254,6 +254,7 @@ declare class Utils {
      * Utils.formatByteToSize("812304",false);
      * > 793.27
      **/
+    formatByteToSize(byteSize: number | string): number;
     formatByteToSize<T extends boolean>(byteSize: number | string, addType?: T): T extends true ? string : number;
     /**
      * 应用场景: 当你想要获取数组形式的元素时，它可能是其它的选择器，那么需要按照先后顺序填入参数
@@ -430,6 +431,20 @@ declare class Utils {
      * > 456
      */
     getMaxValue(val: UtilsOwnObject<number>, handler: (key: any, value: any) => number): number;
+    /**
+     * 获取页面中最大的z-index的元素信息
+     * @param deviation 获取最大的z-index值的偏移，默认是+1
+     * @example
+     * Utils.getMaxZIndexNodeInfo();
+     * > {
+     *   node: ...,
+     *   zIndex: 1001
+     * }
+     **/
+    getMaxZIndexNodeInfo(deviation?: number): {
+        node: Element;
+        zIndex: number;
+    };
     /**
      * 获取页面中最大的z-index
      * @param deviation 获取最大的z-index值的偏移，默认是+1
@@ -1221,7 +1236,7 @@ declare class Utils {
      * @param startIndex （可选）开始坐标，可为空
      * @param endIndex （可选）结束坐标，可为空
      */
-    selectElementText(element: HTMLElement | Element | Node, childTextNode: ChildNode, startIndex?: number, endIndex?: number): void;
+    selectElementText(element: HTMLElement | Element | Node, childTextNode?: ChildNode, startIndex?: number, endIndex?: number): void;
     /**
      * 复制到剪贴板
      * @param data 需要复制到剪贴板的文本
@@ -1343,12 +1358,33 @@ declare class Utils {
      * Utils.toJSON("{123:123}")
      * > {123:123}
      */
-    toJSON<T extends AnyObject>(data: string | null, errorCallBack?: (error: Error) => void): T;
+    toJSON<T extends any>(data: string | null, errorCallBack?: (error: Error) => void): T;
     /**
      * 对象转为UrlSearchParams格式的字符串
      * @param obj 目标对象，可以是对象组成的数组
+     * @param addPrefix 是否添加前缀?
+     * @example
+     * Utils.toSearchParamsStr({
+     *   "test": 1,
+     *   "test2": 2
+     * })
+     * > test=1&test2=2
+     * @example
+     * Utils.toSearchParamsStr([{
+     *   "test": 1,
+     *   "test2": 2
+     * },
+     * {
+     *   "test3": 3
+     * }
+     * ])
+     * > test=1&test2=2&test3=3
+     */
+    toSearchParamsStr(obj: object | object[], addPrefix?: boolean): string;
+    /**
+     * 将UrlSearchParams格式的字符串转为对象
      */
-    toSearchParamsStr(obj: object | object[]): string;
+    searchParamStrToObj<T extends any>(searhParamsStr?: string | null | undefined): T;
     /**
      * 提供一个封装了 try-catch 的函数，可以执行传入的函数并捕获其可能抛出的错误，并通过传入的错误处理函数进行处理。
      * @example

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whitesev/utils",
-  "version": "2.2.5",
+  "version": "2.2.7",
   "description": "一个常用的工具库",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
@@ -44,6 +44,7 @@
     "typescript": "^5.5.4"
   },
   "scripts": {
-    "build": "rollup --config"
+    "build": "rollup --config",
+    "build:all": "rollup --config"
   }
 }

package/src/Httpx.ts

@@ -102,6 +102,7 @@ export type HttpxResponseMap = {
 	stream: ReadableStream<string>;
 	document: Document;
 	undefined: string;
+	html: string;
 };
 
 /**
@@ -2322,7 +2323,7 @@ class Httpx {
 	 */
 	async get<T extends HttpxDetails>(
 		url: string,
-		details: T // @ts-ignore
+		details?: T // @ts-ignore
 	): HttpxPromise<HttpxAsyncResult<T>>;
 	/**
 	 * GET 请求
@@ -2386,7 +2387,7 @@ class Httpx {
 	 */
 	async post<T extends HttpxDetails>(
 		url: string,
-		details: T // @ts-ignore
+		details?: T // @ts-ignore
 	): HttpxPromise<HttpxAsyncResult<T>>;
 	/**
 	 * POST 请求
@@ -2440,7 +2441,7 @@ class Httpx {
 	 */
 	async head<T extends HttpxDetails>(
 		url: string,
-		details: T // @ts-ignore
+		details?: T // @ts-ignore
 	): HttpxPromise<HttpxAsyncResult<T>>;
 	/**
 	 * HEAD 请求
@@ -2499,7 +2500,7 @@ class Httpx {
 	 */
 	options<T extends HttpxDetails>(
 		url: string,
-		details: T // @ts-ignore
+		details?: T // @ts-ignore
 	): HttpxPromise<HttpxAsyncResult<T>>;
 	/**
 	 * OPTIONS 请求
@@ -2555,7 +2556,7 @@ class Httpx {
 	 */
 	async delete<T extends HttpxDetails>(
 		url: string,
-		details: T // @ts-ignore
+		details?: T // @ts-ignore
 	): HttpxPromise<HttpxAsyncResult<T>>;
 	/**
 	 * DELETE 请求
@@ -2612,7 +2613,7 @@ class Httpx {
 	 */
 	async put<T extends HttpxDetails>(
 		url: string,
-		details: T // @ts-ignore
+		details?: T // @ts-ignore
 	): HttpxPromise<HttpxAsyncResult<T>>;
 	/**
 	 * PUT 请求

package/src/Utils.ts

@@ -52,7 +52,7 @@ class Utils {
 		this.windowApi = new WindowApi(option);
 	}
 	/** 版本号 */
-	version = "2024.9.4";
+	version = "2024.9.10";
 
 	/**
 	 * 在页面中增加style元素，如果html节点存在子节点，添加子节点第一个，反之，添加到html节点的子节点最后一个
@@ -724,6 +724,7 @@ class Utils {
 	 * Utils.formatByteToSize("812304",false);
 	 * > 793.27
 	 **/
+	formatByteToSize(byteSize: number | string): number;
 	formatByteToSize<T extends boolean>(
 		byteSize: number | string,
 		addType?: T
@@ -1225,43 +1226,90 @@ class Utils {
 		}
 	}
 	/**
-	 * 获取页面中最大的z-index
+	 * 获取页面中最大的z-index的元素信息
 	 * @param deviation 获取最大的z-index值的偏移，默认是+1
 	 * @example
-	 * Utils.getMaxZIndex();
-	 * > 1001
+	 * Utils.getMaxZIndexNodeInfo();
+	 * > {
+	 *   node: ...,
+	 *   zIndex: 1001
+	 * }
 	 **/
-	getMaxZIndex(deviation?: number): number;
-	getMaxZIndex(deviation = 1): number {
+	getMaxZIndexNodeInfo(deviation?: number): {
+		node: Element;
+		zIndex: number;
+	};
+	getMaxZIndexNodeInfo(deviation = 1): {
+		node: Element;
+		zIndex: number;
+	} {
 		deviation = Number.isNaN(deviation) ? 1 : deviation;
+		const UtilsContext = this;
 		// 最大值2147483647
-		let maxZIndex = Math.pow(2, 31) - 1;
+		const maxZIndex = Math.pow(2, 31) - 1;
 		// 比较值2000000000
-		let maxZIndexCompare = 2 * Math.pow(10, 9);
+		const maxZIndexCompare = 2 * Math.pow(10, 9);
 		// 当前页面最大的z-index
 		let zIndex = 0;
 		// 当前的最大z-index的元素，调试使用
 		// @ts-ignore
-		let maxZIndexNode = null;
-		this.windowApi.document.querySelectorAll("*").forEach(($ele, index) => {
-			let nodeStyle = this.windowApi.window.getComputedStyle($ele);
+		let maxZIndexNode: Element = null;
+		/**
+		 * 元素是否可见
+		 * @param $css
+		 */
+		function isVisibleNode($css: CSSStyleDeclaration): boolean {
+			return $css.position !== "static" && $css.display !== "none";
+		}
+		/**
+		 * 查询元素的z-index
+		 * 并比较值是否是已获取的最大值
+		 * @param $ele
+		 */
+		function queryMaxZIndex($ele: Element) {
+			/** 元素的样式 */
+			const nodeStyle = UtilsContext.windowApi.window.getComputedStyle($ele);
 			/* 不对position为static和display为none的元素进行获取它们的z-index */
-			if (nodeStyle.position !== "static" && nodeStyle.display !== "none") {
+			if (isVisibleNode(nodeStyle)) {
 				let nodeZIndex = parseInt(nodeStyle.zIndex);
 				if (!isNaN(nodeZIndex)) {
 					if (nodeZIndex > zIndex) {
+						// 赋值到全局
 						zIndex = nodeZIndex;
 						maxZIndexNode = $ele;
 					}
 				}
+				// 判断shadowRoot
+				if ($ele.shadowRoot != null && $ele instanceof ShadowRoot) {
+					$ele.shadowRoot.querySelectorAll("*").forEach(($shadowEle) => {
+						queryMaxZIndex($shadowEle);
+					});
+				}
 			}
+		}
+		this.windowApi.document.querySelectorAll("*").forEach(($ele, index) => {
+			queryMaxZIndex($ele);
 		});
 		zIndex += deviation;
 		if (zIndex >= maxZIndexCompare) {
 			// 最好不要超过最大值
 			zIndex = maxZIndex;
 		}
-		return zIndex;
+		return {
+			node: maxZIndexNode,
+			zIndex: zIndex,
+		};
+	}
+	/**
+	 * 获取页面中最大的z-index
+	 * @param deviation 获取最大的z-index值的偏移，默认是+1
+	 * @example
+	 * Utils.getMaxZIndex();
+	 * > 1001
+	 **/
+	getMaxZIndex(deviation?: number): number;
+	getMaxZIndex(deviation = 1): number {
+		return this.getMaxZIndexNodeInfo(deviation).zIndex;
 	}
 	/**
 	 * 获取最小值
@@ -3111,13 +3159,13 @@ class Utils {
 	 */
 	selectElementText(
 		element: HTMLElement | Element | Node,
-		childTextNode: ChildNode,
+		childTextNode?: ChildNode,
 		startIndex?: number,
 		endIndex?: number
 	): void;
 	selectElementText(
 		element: HTMLElement | Element | Node,
-		childTextNode: ChildNode,
+		childTextNode?: ChildNode,
 		startIndex?: number,
 		endIndex?: number
 	): void {
@@ -3764,16 +3812,16 @@ class Utils {
 	 * Utils.toJSON("{123:123}")
 	 * > {123:123}
 	 */
-	toJSON<T extends AnyObject>(
+	toJSON<T extends any>(
 		data: string | null,
 		errorCallBack?: (error: Error) => void
 	): T;
-	toJSON<T extends AnyObject>(
+	toJSON<T extends any>(
 		data: string | null,
 		errorCallBack?: (error: Error) => void
 	): T {
 		let UtilsContext = this;
-		let result: AnyObject = {};
+		let result: any = {};
 		if (typeof data === "object") {
 			return data as any;
 		}
@@ -3822,9 +3870,26 @@ class Utils {
 	/**
 	 * 对象转为UrlSearchParams格式的字符串
 	 * @param obj 目标对象，可以是对象组成的数组
+	 * @param addPrefix 是否添加前缀?
+	 * @example
+	 * Utils.toSearchParamsStr({
+	 *   "test": 1,
+	 *   "test2": 2
+	 * })
+	 * > test=1&test2=2
+	 * @example
+	 * Utils.toSearchParamsStr([{
+	 *   "test": 1,
+	 *   "test2": 2
+	 * },
+	 * {
+	 *   "test3": 3
+	 * }
+	 * ])
+	 * > test=1&test2=2&test3=3
 	 */
-	toSearchParamsStr(obj: object | object[]): string;
-	toSearchParamsStr(obj: object | object[]): string {
+	toSearchParamsStr(obj: object | object[], addPrefix?: boolean): string;
+	toSearchParamsStr(obj: object | object[], addPrefix?: boolean): string {
 		let UtilsContext = this;
 		let searhParamsStr = "";
 		if (Array.isArray(obj)) {
@@ -3838,8 +3903,22 @@ class Utils {
 		} else {
 			searhParamsStr = new URLSearchParams(Object.entries(obj)).toString();
 		}
+		if (addPrefix && !searhParamsStr.startsWith("?")) {
+			searhParamsStr = "?" + searhParamsStr;
+		}
 		return searhParamsStr;
 	}
+	/**
+	 * 将UrlSearchParams格式的字符串转为对象
+	 */
+	searchParamStrToObj<T extends any>(searhParamsStr?: string | null | undefined): T {
+		if (typeof searhParamsStr !== "string") {
+			// @ts-ignore
+			return {};
+		}
+		// @ts-ignore
+		return Object.fromEntries(new URLSearchParams(searhParamsStr));
+	}
 	/**
 	 * 提供一个封装了 try-catch 的函数，可以执行传入的函数并捕获其可能抛出的错误，并通过传入的错误处理函数进行处理。
 	 * @example