@whitesev/domutils 1.3.6 → 1.3.8

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

@@ -184,7 +184,7 @@ declare class DOMUtils extends DOMUtilsEvent {
      * DOMUtils.val(document.querySelector("input.xx"),true)
      * DOMUtils.val("input.xx",true)
      * */
-    val(element: HTMLInputElement | HTMLTextAreaElement | string | (HTMLInputElement | HTMLTextAreaElement)[] | NodeListOf<HTMLInputElement | HTMLTextAreaElement>, value: string | boolean): void;
+    val(element: HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement | string | (HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement)[] | NodeListOf<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement>, value: string | boolean | number): void;
     /**
      * 获取value属性值
      * @param element 目标元素
@@ -192,7 +192,7 @@ declare class DOMUtils extends DOMUtilsEvent {
      * // 获取元素textarea的值
      * DOMUtils.val(document.querySelector("textarea.xx"))
      * */
-    val(element: HTMLInputElement | HTMLTextAreaElement | string | (HTMLInputElement | HTMLTextAreaElement)[] | NodeListOf<HTMLInputElement | HTMLTextAreaElement>): string;
+    val(element: HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement | string | (HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement)[] | NodeListOf<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement>): string;
     /**
      * 获取value属性值
      * @param element 目标元素
@@ -201,7 +201,7 @@ declare class DOMUtils extends DOMUtilsEvent {
      * DOMUtils.val(document.querySelector("input.xx"))
      * DOMUtils.val("input.xx")
      * */
-    val(element: HTMLInputElement | HTMLTextAreaElement | (HTMLInputElement | HTMLTextAreaElement)[] | NodeListOf<HTMLInputElement | HTMLTextAreaElement>): boolean | string;
+    val(element: HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement | (HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement)[] | NodeListOf<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement>): boolean | string;
     /**
      * 获取元素的属性值
      * @param element 目标元素
@@ -275,6 +275,12 @@ declare class DOMUtils extends DOMUtilsEvent {
      * DOMUtils.addClass("a.xx","_vue_")
      * */
     addClass(element: DOMUtilsTargetElementType, className: string | string[]): void;
+    /**
+     * 判断元素是否存在className
+     * @param element
+     * @param className
+     */
+    hasClass(element: DOMUtilsTargetElementType, className: string | string[]): boolean;
     /**
      * 函数在元素内部末尾添加子元素或HTML字符串
      * @param element 目标元素

package/package.json

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

package/src/DOMUtils.ts

@@ -52,7 +52,7 @@ class DOMUtils extends DOMUtilsEvent {
 	attr(element: DOMUtilsTargetElementType, attrName: string, attrValue?: any) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -251,7 +251,7 @@ class DOMUtils extends DOMUtilsEvent {
 			return propertyValue;
 		}
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -339,7 +339,7 @@ class DOMUtils extends DOMUtilsEvent {
 	text(element: DOMUtilsTargetElementType, text?: any) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -400,7 +400,7 @@ class DOMUtils extends DOMUtilsEvent {
 	html(element: DOMUtilsTargetElementType, html?: any) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -489,10 +489,11 @@ class DOMUtils extends DOMUtilsEvent {
 		element:
 			| HTMLInputElement
 			| HTMLTextAreaElement
+			| HTMLSelectElement
 			| string
-			| (HTMLInputElement | HTMLTextAreaElement)[]
-			| NodeListOf<HTMLInputElement | HTMLTextAreaElement>,
-		value: string | boolean
+			| (HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement)[]
+			| NodeListOf<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement>,
+		value: string | boolean | number
 	): void;
 	/**
 	 * 获取value属性值
@@ -505,9 +506,10 @@ class DOMUtils extends DOMUtilsEvent {
 		element:
 			| HTMLInputElement
 			| HTMLTextAreaElement
+			| HTMLSelectElement
 			| string
-			| (HTMLInputElement | HTMLTextAreaElement)[]
-			| NodeListOf<HTMLInputElement | HTMLTextAreaElement>
+			| (HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement)[]
+			| NodeListOf<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement>
 	): string;
 	/**
 	 * 获取value属性值
@@ -521,21 +523,23 @@ class DOMUtils extends DOMUtilsEvent {
 		element:
 			| HTMLInputElement
 			| HTMLTextAreaElement
-			| (HTMLInputElement | HTMLTextAreaElement)[]
-			| NodeListOf<HTMLInputElement | HTMLTextAreaElement>
+			| HTMLSelectElement
+			| (HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement)[]
+			| NodeListOf<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement>
 	): boolean | string;
 	val(
 		element:
 			| HTMLInputElement
 			| HTMLTextAreaElement
+			| HTMLSelectElement
 			| string
-			| (HTMLInputElement | HTMLTextAreaElement)[]
-			| NodeListOf<HTMLInputElement | HTMLTextAreaElement>,
-		value?: string | boolean
+			| (HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement)[]
+			| NodeListOf<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement>,
+		value?: string | boolean | number
 	) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -605,7 +609,7 @@ class DOMUtils extends DOMUtilsEvent {
 	prop(element: DOMUtilsTargetElementType, propName: string, propValue?: any) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -640,7 +644,7 @@ class DOMUtils extends DOMUtilsEvent {
 	removeAttr(element: DOMUtilsTargetElementType, attrName: string) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -669,7 +673,7 @@ class DOMUtils extends DOMUtilsEvent {
 	) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -705,7 +709,7 @@ class DOMUtils extends DOMUtilsEvent {
 	removeProp(element: DOMUtilsTargetElementType, propName: string) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -734,7 +738,7 @@ class DOMUtils extends DOMUtilsEvent {
 	) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -763,7 +767,7 @@ class DOMUtils extends DOMUtilsEvent {
 	addClass(element: DOMUtilsTargetElementType, className: string | string[]) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -785,6 +789,44 @@ class DOMUtils extends DOMUtilsEvent {
 			element.classList.add(itemClassName);
 		});
 	}
+	/**
+	 * 判断元素是否存在className
+	 * @param element
+	 * @param className
+	 */
+	hasClass(
+		element: DOMUtilsTargetElementType,
+		className: string | string[]
+	): boolean {
+		let DOMUtilsContext = this;
+		if (typeof element === "string") {
+			element = DOMUtilsContext.selectorAll(element);
+		}
+		if (element == null) {
+			return false;
+		}
+		if (isNodeList(element)) {
+			let flag = true;
+			for (let index = 0; index < element.length; index++) {
+				const $ele = element[index] as HTMLElement;
+				flag = flag && DOMUtilsContext.hasClass($ele, className);
+			}
+			return flag;
+		}
+		if (!element?.classList) {
+			return false;
+		}
+		if (!Array.isArray(className)) {
+			className = className.split(" ");
+		}
+		for (let index = 0; index < className.length; index++) {
+			const item = className[index].trim();
+			if (!element.classList.contains(item)) {
+				return false;
+			}
+		}
+		return true;
+	}
 	/**
 	 * 函数在元素内部末尾添加子元素或HTML字符串
 	 * @param element 目标元素
@@ -804,7 +846,7 @@ class DOMUtils extends DOMUtilsEvent {
 	) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -851,7 +893,7 @@ class DOMUtils extends DOMUtilsEvent {
 	prepend(element: DOMUtilsTargetElementType, content: HTMLElement | string) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -886,7 +928,7 @@ class DOMUtils extends DOMUtilsEvent {
 	after(element: DOMUtilsTargetElementType, content: HTMLElement | string) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -923,7 +965,7 @@ class DOMUtils extends DOMUtilsEvent {
 	before(element: DOMUtilsTargetElementType, content: HTMLElement | string) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -958,7 +1000,7 @@ class DOMUtils extends DOMUtilsEvent {
 	remove(element: DOMUtilsTargetElementType) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -982,7 +1024,7 @@ class DOMUtils extends DOMUtilsEvent {
 	empty(element: DOMUtilsTargetElementType) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -1008,9 +1050,7 @@ class DOMUtils extends DOMUtilsEvent {
 	offset(element: HTMLElement | string) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelector(
-				element
-			) as HTMLElement;
+			element = DOMUtilsContext.selector(element) as HTMLElement;
 		}
 		if (element == null) {
 			return;
@@ -1053,8 +1093,7 @@ class DOMUtils extends DOMUtilsEvent {
 	) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element =
-				DOMUtilsContext.windowApi.document.querySelector<HTMLElement>(element)!;
+			element = DOMUtilsContext.selector<HTMLElement>(element)!;
 		}
 		if (element == null) {
 			return;
@@ -1161,9 +1200,7 @@ class DOMUtils extends DOMUtilsEvent {
 				.clientHeight;
 		}
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelector(
-				element
-			) as HTMLElement;
+			element = DOMUtilsContext.selector(element) as HTMLElement;
 		}
 		if (element == null) {
 			// @ts-ignore
@@ -1261,9 +1298,7 @@ class DOMUtils extends DOMUtilsEvent {
 			return DOMUtilsContext.windowApi.window.innerWidth;
 		}
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelector(
-				element
-			) as HTMLElement;
+			element = DOMUtilsContext.selector(element) as HTMLElement;
 		}
 		if (element == null) {
 			// @ts-ignore
@@ -1312,9 +1347,7 @@ class DOMUtils extends DOMUtilsEvent {
 			return DOMUtilsContext.windowApi.window.innerHeight;
 		}
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelector(
-				element
-			) as HTMLElement;
+			element = DOMUtilsContext.selector(element) as HTMLElement;
 		}
 		if (element == null) {
 			// @ts-ignore
@@ -1359,7 +1392,7 @@ class DOMUtils extends DOMUtilsEvent {
 	) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -1430,7 +1463,7 @@ class DOMUtils extends DOMUtilsEvent {
 	wrap(element: DOMUtilsTargetElementType, wrapperHTML: string) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -1469,9 +1502,7 @@ class DOMUtils extends DOMUtilsEvent {
 	prev(element: HTMLElement | string) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelector(
-				element
-			) as HTMLElement;
+			element = DOMUtilsContext.selector(element) as HTMLElement;
 		}
 		if (element == null) {
 			return;
@@ -1493,9 +1524,7 @@ class DOMUtils extends DOMUtilsEvent {
 	next(element: HTMLElement | string) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelector(
-				element
-			) as HTMLElement;
+			element = DOMUtilsContext.selector(element) as HTMLElement;
 		}
 		if (element == null) {
 			return;
@@ -1529,9 +1558,7 @@ class DOMUtils extends DOMUtilsEvent {
 	siblings(element: HTMLElement | string) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelector(
-				element
-			) as HTMLElement;
+			element = DOMUtilsContext.selector(element) as HTMLElement;
 		}
 		if (element == null) {
 			return;
@@ -1576,18 +1603,15 @@ class DOMUtils extends DOMUtilsEvent {
 	parent(element: HTMLElement | NodeList | string | HTMLElement[]) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelector(
-				element
-			) as HTMLElement;
+			element = DOMUtilsContext.selector<HTMLElement>(element)!;
 		}
 		if (element == null) {
 			return;
 		}
-		if (element instanceof NodeList || element instanceof Array) {
-			element = element as HTMLElement[];
+		if (isNodeList(element)) {
 			let resultArray: HTMLElement[] = [];
-			element.forEach((eleItem) => {
-				resultArray.push(DOMUtilsContext.parent(eleItem));
+			element.forEach(($ele) => {
+				resultArray.push(DOMUtilsContext.parent($ele as HTMLElement));
 			});
 			return resultArray;
 		} else {
@@ -1728,7 +1752,7 @@ class DOMUtils extends DOMUtilsEvent {
 			return;
 		}
 		if (typeof target === "string") {
-			target = DOMUtilsContext.windowApi.document.querySelectorAll(target);
+			target = DOMUtilsContext.selectorAll(target);
 		}
 		if (target instanceof NodeList || target instanceof Array) {
 			target = target as HTMLElement[];
@@ -1764,7 +1788,7 @@ class DOMUtils extends DOMUtilsEvent {
 			return;
 		}
 		if (typeof target === "string") {
-			target = DOMUtilsContext.windowApi.document.querySelectorAll(target);
+			target = DOMUtilsContext.selectorAll(target);
 		}
 		if (target instanceof NodeList || target instanceof Array) {
 			target = target as HTMLElement[];
@@ -1806,7 +1830,7 @@ class DOMUtils extends DOMUtilsEvent {
 		}
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (isNodeList(element)) {
 			// 设置
@@ -1859,7 +1883,7 @@ class DOMUtils extends DOMUtilsEvent {
 			return;
 		}
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (isNodeList(element)) {
 			// 设置
@@ -1900,7 +1924,7 @@ class DOMUtils extends DOMUtilsEvent {
 	toggle(element: DOMUtilsTargetElementType, checkVisiblie?: boolean) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;

package/src/DOMUtilsEvent.ts

@@ -410,7 +410,7 @@ export class DOMUtilsEvent {
 		let DOMUtilsContext = this;
 		let args = arguments;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -667,7 +667,7 @@ export class DOMUtilsEvent {
 		let DOMUtilsContext = this;
 		let args = arguments;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -776,7 +776,7 @@ export class DOMUtilsEvent {
 	) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -967,9 +967,7 @@ export class DOMUtilsEvent {
 	) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelector(
-				element
-			) as HTMLElement;
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -1036,7 +1034,7 @@ export class DOMUtilsEvent {
 	) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -1086,9 +1084,7 @@ export class DOMUtilsEvent {
 	) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelector(
-				element
-			) as HTMLElement;
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -1143,7 +1139,7 @@ export class DOMUtilsEvent {
 	) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -1192,7 +1188,7 @@ export class DOMUtilsEvent {
 	) {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (element == null) {
 			return;
@@ -1232,7 +1228,7 @@ export class DOMUtilsEvent {
 			return;
 		}
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (isNodeList(element)) {
 			// 设置
@@ -1268,7 +1264,7 @@ export class DOMUtilsEvent {
 			return;
 		}
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (isNodeList(element)) {
 			// 设置
@@ -1304,7 +1300,7 @@ export class DOMUtilsEvent {
 			return;
 		}
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		if (isNodeList(element)) {
 			// 设置
@@ -1394,7 +1390,7 @@ export class DOMUtilsEvent {
 	} {
 		let DOMUtilsContext = this;
 		if (typeof element === "string") {
-			element = DOMUtilsContext.windowApi.document.querySelectorAll(element);
+			element = DOMUtilsContext.selectorAll(element);
 		}
 		let keyboardEventCallBack = function (event: KeyboardEvent) {
 			/** 键名 */