@whitesev/utils 2.3.6 → 2.3.8

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

@@ -963,7 +963,7 @@ declare class Utils {
      * Utils.parseObjectToArray({"工具类":"jsonToArray","return","Array"});
      * > ['jsonToArray', 'Array']
      **/
-    parseObjectToArray(target: any): any;
+    parseObjectToArray<T extends any>(target: T): T[keyof T][];
     /**
      * 自动锁对象，用于循环判断运行的函数，在循环外new后使用，注意，如果函数内部存在异步操作，需要使用await
      * @example
@@ -1014,7 +1014,7 @@ declare class Utils {
      * Utils.mergeArrayToString([{"name":"数组内数据部分字段合并成字符串->"},{"name":"mergeToString"}],(item)=>{return item["name"]});
      * > '数组内数据部分字段合并成字符串->mergeToString'
      **/
-    mergeArrayToString(data: any[], handleFunc?: (val: any) => any): string;
+    mergeArrayToString<T extends any>(data: T[], handleFunc?: ((val: T) => T) | keyof T): string;
     /**
      * 监听页面元素改变并处理
      * @param target 需要监听的元素，如果不存在，可以等待它出现
@@ -1142,7 +1142,7 @@ declare class Utils {
      * Utils.parseInt(["aaaaaaa"],"aa");
      * > NaN
      **/
-    parseInt(matchList?: any[], defaultValue?: number): number;
+    parseInt(matchList?: any[] | null | undefined | RegExpMatchArray, defaultValue?: number): number;
     /**
      * blob转File对象
      * @param blobUrl 需要转换的blob的链接

package/package.json

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

package/src/Utils.ts

@@ -53,7 +53,7 @@ class Utils {
 		this.windowApi = new WindowApi(option);
 	}
 	/** 版本号 */
-	version = "2024.10.13";
+	version = "2024.10.19";
 
 	/**
 	 * 在页面中增加style元素，如果html节点存在子节点，添加子节点第一个，反之，添加到html节点的子节点最后一个
@@ -291,37 +291,38 @@ class Utils {
 				"Utils.checkUserClickInNode 参数 targetNode 必须为 Element|Node 类型"
 			);
 		}
-		let mouseClickPosX = Number(
-			(window!.event as any).clientX.toString()
-		); /* 鼠标相对屏幕横坐标 */
-		let mouseClickPosY = Number(
-			(window!.event as any).clientY.toString()
-		); /* 鼠标相对屏幕纵坐标 */
-		let elementPosXLeft = Number(
-			(element as HTMLElement).getBoundingClientRect().left
-		); /* 要检测的元素的相对屏幕的横坐标最左边 */
-		let elementPosXRight = Number(
-			(element as HTMLElement).getBoundingClientRect().right
-		); /* 要检测的元素的相对屏幕的横坐标最右边 */
-		let elementPosYTop = Number(
-			(element as HTMLElement).getBoundingClientRect().top
-		); /* 要检测的元素的相对屏幕的纵坐标最上边 */
-		let elementPosYBottom = Number(
-			(element as HTMLElement).getBoundingClientRect().bottom
-		); /* 要检测的元素的相对屏幕的纵坐标最下边 */
-		let clickNodeHTML = (this.windowApi.window.event as any).target
-			.innerHTML as string;
+		let clickEvent = UtilsContext.windowApi.window.event as PointerEvent;
+		let touchEvent = UtilsContext.windowApi.window.event as TouchEvent;
+		let $click = clickEvent?.composedPath()?.[0] as HTMLElement;
+
+		// 点击的x坐标
+		let clickPosX =
+			clickEvent?.clientX != null
+				? clickEvent.clientX
+				: touchEvent.touches[0].clientX;
+		// 点击的y坐标
+		let clickPosY =
+			clickEvent?.clientY != null
+				? clickEvent.clientY
+				: touchEvent.touches[0].clientY;
+		let {
+			/* 要检测的元素的相对屏幕的横坐标最左边 */
+			left: elementPosXLeft,
+			/* 要检测的元素的相对屏幕的横坐标最右边 */
+			right: elementPosXRight,
+			/* 要检测的元素的相对屏幕的纵坐标最上边 */
+			top: elementPosYTop,
+			/* 要检测的元素的相对屏幕的纵坐标最下边 */
+			bottom: elementPosYBottom,
+		} = (element as HTMLElement).getBoundingClientRect();
 		if (
-			mouseClickPosX >= elementPosXLeft &&
-			mouseClickPosX <= elementPosXRight &&
-			mouseClickPosY >= elementPosYTop &&
-			mouseClickPosY <= elementPosYBottom
+			clickPosX >= elementPosXLeft &&
+			clickPosX <= elementPosXRight &&
+			clickPosY >= elementPosYTop &&
+			clickPosY <= elementPosYBottom
 		) {
 			return true;
-		} else if (
-			clickNodeHTML &&
-			(element as HTMLElement).innerHTML.includes(clickNodeHTML)
-		) {
+		} else if (($click && element.contains($click)) || $click == element) {
 			/* 这种情况是应对在界面中隐藏的元素，getBoundingClientRect获取的都是0 */
 			return true;
 		} else {
@@ -2378,16 +2379,16 @@ class Utils {
 	 * Utils.parseObjectToArray({"工具类":"jsonToArray","return","Array"});
 	 * > ['jsonToArray', 'Array']
 	 **/
-	parseObjectToArray(target: any): any;
-	parseObjectToArray(target: any): any {
+	parseObjectToArray<T extends any>(target: T): T[keyof T][];
+	parseObjectToArray<T extends any>(target: T) {
 		if (typeof target !== "object") {
 			throw new Error(
 				"Utils.parseObjectToArray 参数 target 必须为 object 类型"
 			);
 		}
-		let result: any[] = [];
-		Object.keys(target).forEach(function (keyName) {
-			result = result.concat(target[keyName]);
+		let result: T[keyof T][] = [];
+		Object.keys(target!).forEach(function (keyName) {
+			result = result.concat(target![keyName as any as keyof T]);
 		});
 		return result;
 	}
@@ -2441,8 +2442,14 @@ class Utils {
 	 * Utils.mergeArrayToString([{"name":"数组内数据部分字段合并成字符串->"},{"name":"mergeToString"}],(item)=>{return item["name"]});
 	 * > '数组内数据部分字段合并成字符串->mergeToString'
 	 **/
-	mergeArrayToString(data: any[], handleFunc?: (val: any) => any): string;
-	mergeArrayToString(data: any[], handleFunc?: (val: any) => any): string {
+	mergeArrayToString<T extends any>(
+		data: T[],
+		handleFunc?: ((val: T) => T) | keyof T
+	): string;
+	mergeArrayToString<T extends any>(
+		data: T[],
+		handleFunc?: ((val: T) => T) | keyof T
+	): string {
 		if (!(data instanceof Array)) {
 			throw new Error("Utils.mergeArrayToString 参数 data 必须为 Array 类型");
 		}
@@ -2457,7 +2464,7 @@ class Utils {
 			});
 		} else {
 			data.forEach((item) => {
-				Object.values(item)
+				Object.values(item as any)
 					.filter((item2) => typeof item2 === "string")
 					.forEach((item3) => {
 						content += item3;
@@ -2914,7 +2921,10 @@ class Utils {
 	 * Utils.parseInt(["aaaaaaa"],"aa");
 	 * > NaN
 	 **/
-	parseInt(matchList?: any[], defaultValue?: number): number;
+	parseInt(
+		matchList?: any[] | null | undefined | RegExpMatchArray,
+		defaultValue?: number
+	): number;
 	parseInt(matchList: any[] = [], defaultValue = 0): number {
 		if (matchList == null) {
 			return parseInt(defaultValue.toString());

package/src/indexedDB.ts

@@ -35,6 +35,10 @@ class indexedDB {
 			code: 401,
 			msg: "操作失败",
 		},
+		empty: {
+			code: 201,
+			msg: "操作成功，但是没有数据",
+		},
 		openFailed: { code: 91001, msg: "打开数据库失败" },
 		saveFailed: { code: 91002, msg: "保存数据失败" },
 		getFailed: { code: 91003, msg: "获取数据失败" },
@@ -287,23 +291,21 @@ class indexedDB {
 						/* result 返回的是 {key: string, value: any} */
 						/* 键值对存储 */
 						let data = result ? result.value : void 0;
-						if (data) {
+						if (data == null) {
 							resolve({
 								success: true,
-								code: that.#statusCode.operationSuccess.code,
-								msg: that.#statusCode.operationSuccess.msg,
-								data: data,
-
+								code: that.#statusCode.empty.code,
+								msg: that.#statusCode.empty.msg,
+								data: data!,
 								event: event,
 								result: result,
 							});
 						} else {
 							resolve({
-								success: false,
-								code: that.#statusCode.operationFailed.code,
-								msg: that.#statusCode.operationFailed.msg,
-								data: void 0 as any,
-
+								success: true,
+								code: that.#statusCode.operationSuccess.code,
+								msg: that.#statusCode.operationSuccess.msg,
+								data: data,
 								event: event,
 								result: result,
 							});