@whitesev/domutils 1.5.4 → 1.5.6

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

@@ -72,7 +72,7 @@ declare class DOMUtils extends DOMUtilsEvent {
      * DOMUtils.css("a.xx","display");
      * > "none"
      * */
-    css(element: DOMUtilsTargetElementType, property: keyof CSSStyleDeclaration): string;
+    css(element: DOMUtilsTargetElementType, property: keyof Omit<CSSStyleDeclaration, "zIndex"> | "z-index"): string;
     /**
      * 获取元素的样式属性值
      * @param element 目标元素
@@ -100,7 +100,7 @@ declare class DOMUtils extends DOMUtilsEvent {
      * DOMUtils.css(document.querySelector("a.xx"),"top","10px");
      * DOMUtils.css(document.querySelector("a.xx"),"top",10);
      * */
-    css(element: DOMUtilsTargetElementType, property: keyof CSSStyleDeclaration & string, value: string | number): string;
+    css(element: DOMUtilsTargetElementType, property: (keyof Omit<CSSStyleDeclaration, "zIndex"> | "z-index") & string, value: string | number): string;
     /**
      * 设置元素的样式属性
      * @param element 目标元素
@@ -116,7 +116,9 @@ declare class DOMUtils extends DOMUtilsEvent {
      * DOMUtils.css(document.querySelector("a.xx"),{ top: 10 });
      * */
     css(element: DOMUtilsTargetElementType, property: {
-        [P in keyof CSSStyleDeclaration]?: CSSStyleDeclaration[P];
+        [P in keyof Omit<CSSStyleDeclaration, "zIndex">]?: CSSStyleDeclaration[P];
+    } | {
+        "z-index": string | number;
     } | {
         [key: string]: string | number;
     }): string;

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

@@ -44,5 +44,21 @@ declare const DOMUtilsCommonUtils: {
      * @param propName
      */
     delete(target: any, propName: any): void;
+    /**
+     * 自动使用 Worker 执行 setTimeout
+     */
+    setTimeout(callback: Function, timeout?: number): number;
+    /**
+     * 配合 .setTimeout 使用
+     */
+    clearTimeout(timeId: number | undefined): void;
+    /**
+     * 自动使用 Worker 执行 setInterval
+     */
+    setInterval(callback: Function, timeout?: number): number;
+    /**
+     * 配合 .setInterval 使用
+     */
+    clearInterval(timeId: number | undefined): void;
 };
 export { DOMUtilsCommonUtils };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whitesev/domutils",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "description": "使用js重新对jQuery的部分函数进行了仿写",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

package/src/DOMUtils.ts

@@ -20,7 +20,7 @@ class DOMUtils extends DOMUtilsEvent {
 		super(option);
 	}
 	/** 版本号 */
-	version = "2025.5.12";
+	version = "2025.5.26";
 	/**
 	 * 获取元素的属性值
 	 * @param element 目标元素
@@ -155,7 +155,7 @@ class DOMUtils extends DOMUtilsEvent {
 	 * */
 	css(
 		element: DOMUtilsTargetElementType,
-		property: keyof CSSStyleDeclaration
+		property: keyof Omit<CSSStyleDeclaration, "zIndex"> | "z-index"
 	): string;
 	/**
 	 * 获取元素的样式属性值
@@ -186,7 +186,7 @@ class DOMUtils extends DOMUtilsEvent {
 	 * */
 	css(
 		element: DOMUtilsTargetElementType,
-		property: keyof CSSStyleDeclaration & string,
+		property: (keyof Omit<CSSStyleDeclaration, "zIndex"> | "z-index") & string,
 		value: string | number
 	): string;
 	/**
@@ -207,7 +207,13 @@ class DOMUtils extends DOMUtilsEvent {
 		element: DOMUtilsTargetElementType,
 		property:
 			| {
-					[P in keyof CSSStyleDeclaration]?: CSSStyleDeclaration[P];
+					[P in keyof Omit<
+						CSSStyleDeclaration,
+						"zIndex"
+					>]?: CSSStyleDeclaration[P];
+			  }
+			| {
+					"z-index": string | number;
 			  }
 			| {
 					[key: string]: string | number;
@@ -216,10 +222,10 @@ class DOMUtils extends DOMUtilsEvent {
 	css(
 		element: DOMUtilsTargetElementType,
 		property:
-			| keyof CSSStyleDeclaration
+			| keyof Omit<CSSStyleDeclaration, "zIndex">
 			| string
 			| {
-					[P in keyof CSSStyleDeclaration]?:
+					[P in keyof Omit<CSSStyleDeclaration, "zIndex">]?:
 						| string
 						| number
 						| CSSStyleDeclaration[P];
@@ -1456,7 +1462,7 @@ class DOMUtils extends DOMUtilsEvent {
 				DOMUtilsContext.windowApi.globalThis.getComputedStyle(element)[prop];
 			to[prop] = styles[prop];
 		}
-		let timer = setInterval(function () {
+		let timer = DOMUtilsCommonUtils.setInterval(function () {
 			let timePassed = performance.now() - start;
 			let progress = timePassed / duration;
 			if (progress > 1) {
@@ -1467,7 +1473,7 @@ class DOMUtils extends DOMUtilsEvent {
 					from[prop] + (to[prop] - from[prop]) * progress + "px";
 			}
 			if (progress === 1) {
-				clearInterval(timer);
+				DOMUtilsCommonUtils.clearInterval(timer);
 				if (callback) {
 					callback();
 				}

package/src/DOMUtilsCommonUtils.ts

@@ -1,4 +1,10 @@
 import { WindowApi } from "./WindowApi";
+import {
+	clearInterval as WorkerClearInterval,
+	clearTimeout as WorkerClearTimeout,
+	setInterval as WorkerSetInterval,
+	setTimeout as WorkerSetTimeout,
+} from "worker-timers";
 
 /** 通用工具类 */
 const DOMUtilsCommonUtils = {
@@ -132,5 +138,51 @@ const DOMUtilsCommonUtils = {
 			delete target[propName];
 		}
 	},
+	/**
+	 * 自动使用 Worker 执行 setTimeout
+	 */
+	setTimeout(callback: Function, timeout: number = 0) {
+		try {
+			return WorkerSetTimeout(callback, timeout);
+		} catch (error) {
+			return globalThis.setTimeout(callback, timeout);
+		}
+	},
+	/**
+	 * 配合 .setTimeout 使用
+	 */
+	clearTimeout(timeId: number | undefined) {
+		try {
+			if (timeId != null) {
+				WorkerClearTimeout(timeId);
+			}
+		} catch (error) {
+		} finally {
+			globalThis.clearTimeout(timeId);
+		}
+	},
+	/**
+	 * 自动使用 Worker 执行 setInterval
+	 */
+	setInterval(callback: Function, timeout: number = 0) {
+		try {
+			return WorkerSetInterval(callback, timeout);
+		} catch (error) {
+			return globalThis.setInterval(callback, timeout);
+		}
+	},
+	/**
+	 * 配合 .setInterval 使用
+	 */
+	clearInterval(timeId: number | undefined) {
+		try {
+			if (timeId != null) {
+				WorkerClearInterval(timeId);
+			}
+		} catch (error) {
+		} finally {
+			globalThis.clearInterval(timeId);
+		}
+	},
 };
 export { DOMUtilsCommonUtils };

package/src/DOMUtilsEvent.ts

@@ -765,7 +765,7 @@ export class DOMUtilsEvent {
 		}
 		if (checkDOMReadyState()) {
 			/* 检查document状态 */
-			setTimeout(callback);
+			DOMUtilsCommonUtils.setTimeout(callback);
 		} else {
 			/* 添加监听 */
 			addDomReadyListener();