@whitesev/utils 2.3.4 → 2.3.6

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

@@ -434,7 +434,9 @@ declare class Utils {
     getMaxValue(val: UtilsOwnObject<number>, handler: (key: any, value: any) => number): number;
     /**
      * 获取页面中最大的z-index的元素信息
-     * @param deviation 获取最大的z-index值的偏移，默认是+1
+     * @param deviation 获取最大的z-index值的偏移，默认是1
+     * @param node 进行判断的元素，默认是document
+     * @param ignoreCallBack 执行元素处理时调用的函数，返回false可忽略不想要处理的元素
      * @example
      * Utils.getMaxZIndexNodeInfo();
      * > {
@@ -442,18 +444,20 @@ declare class Utils {
      *   zIndex: 1001
      * }
      **/
-    getMaxZIndexNodeInfo(deviation?: number): {
+    getMaxZIndexNodeInfo(deviation?: number, target?: Element | ShadowRoot | Document, ignoreCallBack?: ($ele: Element | HTMLElement | ShadowRoot) => boolean | void): {
         node: Element;
         zIndex: number;
     };
     /**
      * 获取页面中最大的z-index
-     * @param deviation 获取最大的z-index值的偏移，默认是+1
+     * @param deviation 获取最大的z-index值的偏移，默认是1
+     * @param node 进行判断的元素，默认是document
+     * @param ignoreCallBack 执行元素处理时调用的函数，返回false可忽略不想要处理的元素
      * @example
      * Utils.getMaxZIndex();
      * > 1001
      **/
-    getMaxZIndex(deviation?: number): number;
+    getMaxZIndex(deviation?: number, target?: Element | DocumentOrShadowRoot | Document, ignoreCallBack?: ($ele: Element | HTMLElement | ShadowRoot) => boolean | void): number;
     /**
      * 获取最小值
      * @example

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

@@ -32,6 +32,7 @@ export declare interface Vue2Object {
         params: any;
         path: string;
         query: any;
+        [key: string]: any;
     };
     $router: {
         afterHooks: Function[];
@@ -41,40 +42,45 @@ export declare interface Vue2Object {
         fallback: boolean;
         history: {
             base: string;
-            current: any;
+            current: Vue2Object["$route"];
             listeners: any[];
             router: Vue2Object["$router"];
             /**
              *
              * @param delta 访问的距离。如果 delta < 0 则后退相应数量的记录，如果 > 0 则前进。
              * @param triggerListeners 是否应该触发连接到该历史的监听器
-             * @returns
              */
             go: (delta: number, triggerListeners?: boolean) => void;
             /**
              *
              * @param to 要设置的地址
              * @param data 可选的 HistoryState 以关联该导航记录
-             * @returns
              */
             push: (to: string, data?: any) => void;
             /**
              *
              * @param to 要设置的地址
              * @param data 可选的 HistoryState 以关联该导航记录
-             * @returns
              */
             replace: (to: string, data?: any) => void;
+            [key: string]: any;
         };
         matcher: {
             addRoute: (...args: any[]) => any;
             addRoutes: (...args: any[]) => any;
             getRoutes: () => any;
             match: (...args: any[]) => any;
+            [key: string]: any;
         };
         mode: string;
+        options: {
+            mode: string;
+            routes: any[];
+            scrollBehavior: (...args: any[]) => any;
+            [key: string]: any;
+        };
         resolveHooks: ((...args: any[]) => any)[];
-        currentRoute: any;
+        currentRoute: Vue2Object["$route"];
         beforeEach: (callback: ((
         /** 即将要进入的目标 路由对象 */
         to: Vue2Object["$route"], 
@@ -97,6 +103,13 @@ export declare interface Vue2Object {
         from: Vue2Object["$route"]) => void)
         /** 移除上一个添加的监听 */
          | (() => void)) => void;
+        push: (...args: any[]) => void;
+        back: () => void;
+        go: (...args: any[]) => void;
+        replace: (...args: any[]) => void;
+        addRoute: (...args: any[]) => void;
+        addRoutes: (...args: any[]) => void;
+        [key: string]: any;
     };
     $ssrContext: any;
     $watch: (key: string | string[] | (() => any), handler: (this: any, newVal: any, oldVal: any) => void, options?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whitesev/utils",
-  "version": "2.3.4",
+  "version": "2.3.6",
   "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.9.28";
+	version = "2024.10.13";
 
 	/**
 	 * 在页面中增加style元素，如果html节点存在子节点，添加子节点第一个，反之，添加到html节点的子节点最后一个
@@ -1228,7 +1228,9 @@ class Utils {
 	}
 	/**
 	 * 获取页面中最大的z-index的元素信息
-	 * @param deviation 获取最大的z-index值的偏移，默认是+1
+	 * @param deviation 获取最大的z-index值的偏移，默认是1
+	 * @param node 进行判断的元素，默认是document
+	 * @param ignoreCallBack 执行元素处理时调用的函数，返回false可忽略不想要处理的元素
 	 * @example
 	 * Utils.getMaxZIndexNodeInfo();
 	 * > {
@@ -1236,11 +1238,23 @@ class Utils {
 	 *   zIndex: 1001
 	 * }
 	 **/
-	getMaxZIndexNodeInfo(deviation?: number): {
+	getMaxZIndexNodeInfo(
+		deviation?: number,
+		target?: Element | ShadowRoot | Document,
+		ignoreCallBack?: (
+			$ele: Element | HTMLElement | ShadowRoot
+		) => boolean | void
+	): {
 		node: Element;
 		zIndex: number;
 	};
-	getMaxZIndexNodeInfo(deviation = 1): {
+	getMaxZIndexNodeInfo(
+		deviation = 1,
+		target: Element | ShadowRoot | Document = this.windowApi.document,
+		ignoreCallBack?: (
+			$ele: Element | HTMLElement | ShadowRoot
+		) => boolean | void
+	): {
 		node: Element;
 		zIndex: number;
 	} {
@@ -1268,6 +1282,12 @@ class Utils {
 		 * @param $ele
 		 */
 		function queryMaxZIndex($ele: Element) {
+			if (typeof ignoreCallBack === "function") {
+				let ignoreResult = ignoreCallBack($ele);
+				if (typeof ignoreResult === "boolean" && !ignoreResult) {
+					return;
+				}
+			}
 			/** 元素的样式 */
 			const nodeStyle = UtilsContext.windowApi.window.getComputedStyle($ele);
 			/* 不对position为static和display为none的元素进行获取它们的z-index */
@@ -1288,7 +1308,7 @@ class Utils {
 				}
 			}
 		}
-		this.windowApi.document.querySelectorAll("*").forEach(($ele, index) => {
+		target.querySelectorAll("*").forEach(($ele, index) => {
 			queryMaxZIndex($ele);
 		});
 		zIndex += deviation;
@@ -1303,14 +1323,28 @@ class Utils {
 	}
 	/**
 	 * 获取页面中最大的z-index
-	 * @param deviation 获取最大的z-index值的偏移，默认是+1
+	 * @param deviation 获取最大的z-index值的偏移，默认是1
+	 * @param node 进行判断的元素，默认是document
+	 * @param ignoreCallBack 执行元素处理时调用的函数，返回false可忽略不想要处理的元素
 	 * @example
 	 * Utils.getMaxZIndex();
 	 * > 1001
 	 **/
-	getMaxZIndex(deviation?: number): number;
-	getMaxZIndex(deviation = 1): number {
-		return this.getMaxZIndexNodeInfo(deviation).zIndex;
+	getMaxZIndex(
+		deviation?: number,
+		target?: Element | DocumentOrShadowRoot | Document,
+		ignoreCallBack?: (
+			$ele: Element | HTMLElement | ShadowRoot
+		) => boolean | void
+	): number;
+	getMaxZIndex(
+		deviation = 1,
+		target: Element | ShadowRoot | Document = this.windowApi.document,
+		ignoreCallBack?: (
+			$ele: Element | HTMLElement | ShadowRoot
+		) => boolean | void
+	): number {
+		return this.getMaxZIndexNodeInfo(deviation, target, ignoreCallBack).zIndex;
 	}
 	/**
 	 * 获取最小值

package/src/VueObject.ts

@@ -34,6 +34,7 @@ export declare interface Vue2Object {
 		params: any;
 		path: string;
 		query: any;
+		[key: string]: any;
 	};
 	$router: {
 		afterHooks: Function[];
@@ -43,40 +44,45 @@ export declare interface Vue2Object {
 		fallback: boolean;
 		history: {
 			base: string;
-			current: any;
+			current: Vue2Object["$route"];
 			listeners: any[];
 			router: Vue2Object["$router"];
 			/**
 			 *
 			 * @param delta 访问的距离。如果 delta < 0 则后退相应数量的记录，如果 > 0 则前进。
 			 * @param triggerListeners 是否应该触发连接到该历史的监听器
-			 * @returns
 			 */
 			go: (delta: number, triggerListeners?: boolean) => void;
 			/**
 			 *
 			 * @param to 要设置的地址
 			 * @param data 可选的 HistoryState 以关联该导航记录
-			 * @returns
 			 */
 			push: (to: string, data?: any) => void;
 			/**
 			 *
 			 * @param to 要设置的地址
 			 * @param data 可选的 HistoryState 以关联该导航记录
-			 * @returns
 			 */
 			replace: (to: string, data?: any) => void;
+			[key: string]: any;
 		};
 		matcher: {
 			addRoute: (...args: any[]) => any;
 			addRoutes: (...args: any[]) => any;
 			getRoutes: () => any;
 			match: (...args: any[]) => any;
+			[key: string]: any;
 		};
 		mode: string;
+		options: {
+			mode: string;
+			routes: any[];
+			scrollBehavior: (...args: any[]) => any;
+			[key: string]: any;
+		};
 		resolveHooks: ((...args: any[]) => any)[];
-		currentRoute: any;
+		currentRoute: Vue2Object["$route"];
 		beforeEach: (
 			callback:
 				| ((
@@ -108,6 +114,13 @@ export declare interface Vue2Object {
 				/** 移除上一个添加的监听 */
 				| (() => void)
 		) => void;
+		push: (...args: any[]) => void;
+		back: () => void;
+		go: (...args: any[]) => void;
+		replace: (...args: any[]) => void;
+		addRoute: (...args: any[]) => void;
+		addRoutes: (...args: any[]) => void;
+		[key: string]: any;
 	};
 	$ssrContext: any;