@whitesev/utils 2.3.7 → 2.4.0

package/src/Log.ts

@@ -1,22 +1,4 @@
-/** Utils.Log的初始化配置 */
-declare interface UtilsLogOptions {
-	/** 是否输出Tag，false的话其它的颜色也不输出 @default true */
-	tag: boolean;
-	/** log.success的颜色 @default "#0000FF" */
-	successColor: string;
-	/** log.warn的颜色 @default "0" */
-	warnColor: string;
-	/** log.error的颜色 @default "#FF0000" */
-	errorColor: string;
-	/** log.info的颜色 @default "0" */
-	infoColor: string;
-	/** 是否开启debug模式，true会在控制台每次调用时输出调用函数的所在位置，false不会输出位置 @default false */
-	debug: boolean;
-	/** 当console输出超过logMaxCount数量自动清理控制台 @default false */
-	autoClearConsole: boolean;
-	/** console输出的最高数量，autoClearConsole开启则生效 @default 999 */
-	logMaxCount: number;
-}
+import type { UtilsLogOptions } from "./types/Log";
 
 class Log {
 	/** 是否禁用输出的flag */

package/src/Progress.ts

@@ -1,25 +1,6 @@
+import type { ProgressParamConfig } from "./types/Progress";
 import { Utils } from "./Utils";
 
-declare interface ProgressParamConfig {
-	/** canvas元素节点 */
-	canvasNode: HTMLCanvasElement;
-	/** 绘制角度，默认：95 */
-	deg: number;
-	/** 进度，默认：0 */
-	progress: number;
-	/** 绘制的线宽度，默认：10 */
-	lineWidth: number;
-	/** 绘制的背景颜色，默认：#1e637c */
-	lineBgColor: string;
-	/** 绘制的线的颜色，默认：#25deff */
-	lineColor: string;
-	/** 绘制的字体颜色，默认：#000000 */
-	textColor: string;
-	/** 绘制的字体大小(px)，默认：22px */
-	fontSize: number;
-	/** 绘制的圆的半径，默认：50 */
-	circleRadius: number;
-}
 class Progress {
 	#config: ProgressParamConfig = {
 		/**

package/src/TryCatch.ts

@@ -1,15 +1,7 @@
+import type { UtilsTryCatchConfig, UtilsTryCatchType } from "./types/TryCatch";
 import { Utils } from "./Utils";
 
-export declare interface UtilsTryCatchConfig {
-	log: boolean;
-}
-/** tryCatch */
-export declare interface UtilsTryCatchType {
-	run: UtilsTryCatchType;
-	config: UtilsTryCatchType;
-	error: UtilsTryCatchType;
-}
-const TryCatch = function (...args: any) {
+export const TryCatch = function (...args: any) {
 	/* 定义变量和函数 */
 	let callbackFunction = null;
 	let context = null;
@@ -103,5 +95,3 @@ const TryCatch = function (...args: any) {
 
 	return TryCatchCore;
 };
-
-export { TryCatch };

package/src/Utils.ts

@@ -11,41 +11,17 @@ import { Log } from "./Log";
 import { Progress } from "./Progress";
 import { TryCatch } from "./TryCatch";
 import { UtilsDictionary } from "./Dictionary";
-import type { DOMUtils_EventType } from "./Event";
-import type { Vue2Object } from "./VueObject";
-import type { UtilsAjaxHookResult } from "./AjaxHookerType";
+import type { DOMUtils_EventType } from "./types/Event";
+import type { UtilsAjaxHookResult } from "./types/ajaxHooker";
 import { GenerateUUID } from "./UtilsCommon";
-import { WindowApi, type UtilsWindowApiOption } from "./WindowApi";
+import { WindowApi } from "./WindowApi";
 import { Vue } from "./Vue";
-
-export declare var unsafeWindow: Window & typeof globalThis;
-
-export type JSTypeMap = {
-	string: string;
-	number: number;
-	boolean: boolean;
-	object: object;
-	symbol: symbol;
-	bigint: bigint;
-	undefined: undefined;
-	null: null;
-};
-
-export type JSTypeNames = keyof JSTypeMap;
-
-export type ArgsType<T extends JSTypeNames[]> = {
-	[I in keyof T]: JSTypeMap[T[I]];
-};
-
-export declare interface UtilsOwnObject<V extends any> {
-	[key: string]: V | UtilsOwnObject<V>;
-}
-export declare interface AnyObject {
-	[key: string]: any | AnyObject;
-	toString(): string;
-}
-
-export declare interface Vue2Context extends Vue2Object {}
+import {
+	type ArgsType,
+	type JSTypeNames,
+	type UtilsOwnObject,
+} from "./types/global";
+import type { UtilsWindowApiOption } from "./types/WindowApi";
 
 class Utils {
 	private windowApi: WindowApi;
@@ -53,7 +29,7 @@ class Utils {
 		this.windowApi = new WindowApi(option);
 	}
 	/** 版本号 */
-	version = "2024.10.19";
+	version = "2024.10.28";
 
 	/**
 	 * 在页面中增加style元素，如果html节点存在子节点，添加子节点第一个，反之，添加到html节点的子节点最后一个
@@ -291,37 +267,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 {
@@ -503,7 +480,7 @@ class Utils {
 	dispatchEvent(
 		element: HTMLElement | Document,
 		eventName: DOMUtils_EventType | DOMUtils_EventType[],
-		details?: UtilsOwnObject<any>
+		details?: any
 	): void;
 	/**
 	 * 主动触发事件
@@ -518,12 +495,12 @@ class Utils {
 	dispatchEvent(
 		element: HTMLElement | Document,
 		eventName: string,
-		details?: UtilsOwnObject<any>
+		details?: any
 	): void;
 	dispatchEvent(
 		element: HTMLElement | Document,
 		eventName: DOMUtils_EventType | DOMUtils_EventType[] | string,
-		details?: UtilsOwnObject<any>
+		details?: any
 	) {
 		let eventNameList: string[] = [];
 		if (typeof eventName === "string") {
@@ -3509,7 +3486,8 @@ class Utils {
 			offSetX: number,
 			offSetY: number
 		) {
-			let win = unsafeWindow || window;
+			// @ts-ignore
+			let win = typeof unsafeWindow === "undefined" ? globalThis : unsafeWindow;
 			let mouseEvent =
 				UtilsContext.windowApi.document.createEvent("MouseEvents");
 			mouseEvent.initMouseEvent(

package/src/UtilsGMCookie.ts

@@ -1,61 +1,12 @@
+import type {
+	UtilsGMCookieDeleteOptions,
+	UtilsGMCookieListOptions,
+	UtilsGMCookieResult,
+	UtilsGMCookieSetOptions,
+	WindowApiOption,
+} from "./types/UtilsGMCookie";
 import { Utils } from "./Utils";
 
-declare interface UtilsGMCookieResult {
-	/** 为 window.location.hostname */
-	domain: string;
-	expirationDate: null;
-	hostOnly: true;
-	httpOnly: false;
-	name: string;
-	path: "/";
-	sameSite: "unspecified";
-	secure: true;
-	session: false;
-	value: string;
-}
-
-declare interface UtilsGMCookieListOptions {
-	/** 默认为当前的url */
-	url: string;
-	/** 默认为当前的域名(window.location.hostname) */
-	domain: string;
-	/** 需要检索的Cookie的名字 */
-	name: string | RegExp;
-	/** 需要检索的Cookie的路径，默认为"/" */
-	path: string;
-}
-
-declare interface UtilsGMCookieSetOptions {
-	/** 默认为当前的url */
-	url?: string;
-	/** 默认为当前的域名(window.location.hostname) */
-	domain?: string;
-	/** 需要检索的Cookie的名字 */
-	name?: string;
-	/** 需要检索的Cookie的路径，默认为"/" */
-	path?: string;
-	/** 值 */
-	value?: string | number;
-	/** 确保Cookie只在通过安全协议（如HTTPS）的情况下传输 */
-	secure?: boolean;
-	/** 是否防止JavaScript代码访问Cookie */
-	httpOnly?: boolean;
-	/**  Cookie过期时间，默认为30天 */
-	expirationDate?: number;
-}
-
-declare interface UtilsGMCookieDeleteOptions {
-	/** 默认为当前的url */
-	url: string;
-	/** 需要检索的Cookie的名字 */
-	name: string;
-}
-
-interface WindowApiOption {
-	window: Window & typeof globalThis;
-	document: Document;
-}
-
 class UtilsGMCookie {
 	private windowApi = {
 		window: window,

package/src/UtilsGMMenu.ts

@@ -1,83 +1,10 @@
+import type {
+	UtilsGMMenuConstructorOptions,
+	UtilsGMMenuOption,
+	UtilsGMMenuOptionData,
+} from "./types/UtilsGMMenu";
 import { Utils } from "./Utils";
 
-declare interface UtilsGMMenuClickCallBackData {
-	/** 菜单键名 */
-	key: string;
-	/** 是否启用 */
-	enable: boolean;
-	/** 点击前的enable值 */
-	oldEnable: boolean;
-	/** 触发的事件 */
-	event: MouseEvent | KeyboardEvent;
-	/** 将enable值写入本地的回调，设置参数false就不保存到本地 */
-	storeValue(enable: boolean): void;
-}
-
-declare interface UtilsGMMenuOption {
-	/** 菜单的本地键key，不可重复，会覆盖 */
-	key: string;
-	/** 菜单的文本 */
-	text: string;
-	/** （可选）菜单的开启状态，默认为false */
-	enable?: boolean;
-	/** （可选）使用条件：TamperMonkey版本>5.0，如果id和已注册的菜单id相同，可修改当前已注册菜单的options */
-	id?: number;
-	/** （可选）An optional access key. Please see the description below. Either options or accessKey can be specified. */
-	accessKey?: string;
-	/** （可选）自动关闭菜单，可不设置 */
-	autoClose?: boolean;
-	/** 使用条件：TamperMonkey版本>5.0，使用菜单项的鼠标悬浮上的工具提示*/
-	title?: string;
-	/** （可选）点击菜单后自动刷新网页，默认为true */
-	autoReload?: boolean;
-	/** 菜单的显示文本，未设置的话则自动根据enable在前面加上图标 */
-	showText(text: string, enable: boolean): string;
-	/** 点击菜单的回调 */
-	callback(data: UtilsGMMenuClickCallBackData): void;
-	/** 是否允许菜单进行存储值，默认true允许 */
-	isStoreValue?: boolean;
-}
-
-declare interface UtilsGMMenuHandledOption extends UtilsGMMenuOption {
-	/**
-	 * 删除该菜单
-	 */
-	deleteMenu(): void;
-}
-
-declare interface UtilsGMMenuOptionData {
-	/**
-	 * 菜单id
-	 */
-	id?: number;
-	/**
-	 * 菜单配置
-	 */
-	data: UtilsGMMenuOption;
-	/**
-	 * 处理后的菜单配置
-	 * 对autoReload进行处理，如果未赋值，按默认的true赋值
-	 * 对isStoreValue进行处理，如果未赋值，按默认的true赋值
-	 * 新增一个deleteMenu
-	 */
-	handleData: UtilsGMMenuHandledOption;
-}
-
-declare interface UtilsGMMenuConstructorOptions {
-	/** （可选）配置*/
-	data?: UtilsGMMenuOption[];
-	/** （可选）全局菜单点击菜单后自动刷新网页，默认为true */
-	autoReload?: boolean;
-	/**  油猴函数 @grant GM_getValue */
-	GM_getValue: any;
-	/**  油猴函数 @grant GM_setValue */
-	GM_setValue: any;
-	/**  油猴函数 @grant GM_registerMenuCommand */
-	GM_registerMenuCommand: any;
-	/**  油猴函数 @grant GM_unregisterMenuCommand */
-	GM_unregisterMenuCommand: any;
-}
-
 class GMMenu {
 	private GM_Api = {
 		/**

package/src/WindowApi.ts

@@ -1,15 +1,6 @@
-/**
- * 配置类型
- */
-export type UtilsWindowApiOption = {
-	document: Document;
-	window: Window & typeof globalThis;
-	globalThis: typeof globalThis | Window;
-	self: Window & typeof globalThis;
-	top: Window;
-};
+import type { UtilsWindowApiOption } from "./types/WindowApi";
 
-export class WindowApi {
+class WindowApi {
 	/** 默认的配置 */
 	private defaultApi: UtilsWindowApiOption = {
 		document: document,
@@ -42,3 +33,5 @@ export class WindowApi {
 		return this.api.top;
 	}
 }
+
+export { WindowApi };

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,
 							});

package/src/types/Event.d.ts

@@ -0,0 +1,189 @@
+/**
+ * 鼠标事件
+ * + https://blog.csdn.net/weixin_68658847/article/details/126939879
+ */
+
+declare interface DOMUtils_MouseEvent {
+	click: MouseEvent | PointerEvent;
+	contextmenu: MouseEvent | PointerEvent;
+	dblclick: MouseEvent | PointerEvent;
+	mousedown: MouseEvent | PointerEvent;
+	mouseenter: MouseEvent | PointerEvent;
+	mouseleave: MouseEvent | PointerEvent;
+	mousemove: MouseEvent | PointerEvent;
+	mouseover: MouseEvent | PointerEvent;
+	mouseout: MouseEvent | PointerEvent;
+	mouseup: MouseEvent | PointerEvent;
+}
+declare type DOMUtils_MouseEventType = keyof DOMUtils_MouseEvent;
+/**
+ * 鼠标事件
+ */
+declare interface DOMUtils_KeyboardEvent {
+	keydown: KeyboardEvent;
+	keypress: KeyboardEvent;
+	keyup: KeyboardEvent;
+}
+declare type DOMUtils_KeyboardEventType = keyof DOMUtils_KeyboardEvent;
+/**
+ * 框架/对象事件
+ */
+declare interface DOMUtils_Frame_Object_Event {
+	abort: Event;
+	beforeunload: Event;
+	error: Event;
+	hashchange: Event;
+	load: Event;
+	pageshow: Event;
+	pagehide: Event;
+	resize: Event;
+	scroll: Event;
+	unload: Event;
+}
+declare type DOMUtils_Frame_Object_EventType =
+	keyof DOMUtils_Frame_Object_Event;
+/**
+ * 表单事件
+ */
+declare interface DOMUtils_FormEvent {
+	blur: Event;
+	change: Event;
+	focus: Event;
+	focusin: Event;
+	focusout: Event;
+	input: Event;
+	reset: Event;
+	search: Event;
+}
+declare type DOMUtils_FormEventType = keyof DOMUtils_FormEvent;
+
+/**
+ * 剪贴板事件
+ */
+declare interface DOMUtils_ClipboardEvent {
+	copy: ClipboardEvent;
+	cut: ClipboardEvent;
+	paste: ClipboardEvent;
+}
+declare type DOMUtils_ClipboardEventType = keyof DOMUtils_ClipboardEvent;
+
+/**
+ * 打印事件
+ */
+declare interface DOMUtils_PrintEvent {
+	afterprint: Event;
+	beforeprint: Event;
+}
+declare type DOMUtils_PrintEventType = keyof DOMUtils_PrintEvent;
+
+/**
+ * 拖动事件
+ */
+declare interface DOMUtils_DragEvent {
+	drag: DragEvent;
+	dragend: DragEvent;
+	dragenter: DragEvent;
+	dragleave: DragEvent;
+	dragover: DragEvent;
+	dragstart: DragEvent;
+	drop: DragEvent;
+}
+declare type DOMUtils_DragEventType = keyof DOMUtils_DragEvent;
+
+/**
+ * 多媒体（Media）事件
+ */
+declare interface DOMUtils_MediaEvent {
+	abort: Event;
+	canplay: Event;
+	canplaythrough: Event;
+	durationchange: Event;
+	emptied: Event;
+	ended: Event;
+	error: Event;
+	loadeddata: Event;
+	loadedmetadata: Event;
+	loadstart: Event;
+	pause: Event;
+	play: Event;
+	playing: Event;
+	progress: Event;
+	ratechange: Event;
+	seeked: Event;
+	seeking: Event;
+	stalled: Event;
+	suspend: Event;
+	timeupdate: Event;
+	volumechange: Event;
+	waiting: Event;
+}
+declare type DOMUtils_MediaEventType = keyof DOMUtils_MediaEvent;
+
+/**
+ * 动画事件
+ */
+declare interface DOMUtils_AnimationEvent {
+	animationend: AnimationEvent;
+	animationiteration: AnimationEvent;
+	animationstart: AnimationEvent;
+}
+declare type DOMUtils_AnimationEventType = keyof DOMUtils_AnimationEvent;
+
+/**
+ * 过渡事件
+ */
+declare interface DOMUtils_TransitionEvent {
+	transitionend: TransitionEvent;
+}
+declare type DOMUtils_TransitionEventType = keyof DOMUtils_TransitionEvent;
+
+/**
+ * 触摸事件
+ */
+declare interface DOMUtils_TouchEvent {
+	touchstart: TouchEvent;
+	touchmove: TouchEvent;
+	touchend: TouchEvent;
+	touchcancel: TouchEvent;
+	touchenter: TouchEvent;
+	touchleave: TouchEvent;
+}
+declare type DOMUtils_TouchEventType = keyof DOMUtils_TouchEvent;
+/**
+ * 其它事件
+ */
+declare interface DOMUtils_OtherEvent {
+	message: Event;
+	online: Event;
+	offline: Event;
+	popstate: Event;
+	show: Event;
+	storage: Event;
+	toggle: Event;
+	wheel: Event;
+	propertychange: Event;
+	fullscreenchange: Event;
+	DOMContentLoaded: Event;
+}
+declare type DOMUtils_OtherEventType = keyof DOMUtils_OtherEvent;
+
+/**
+ * 全部事件
+ */
+export declare type DOMUtils_Event = DOMUtils_MouseEvent &
+	DOMUtils_KeyboardEvent &
+	DOMUtils_Frame_Object_Event &
+	DOMUtils_FormEvent &
+	DOMUtils_ClipboardEvent &
+	DOMUtils_PrintEvent &
+	DOMUtils_DragEvent &
+	DOMUtils_MediaEvent &
+	DOMUtils_AnimationEvent &
+	DOMUtils_TransitionEvent &
+	DOMUtils_TouchEvent &
+	DOMUtils_OtherEvent;
+
+/**
+ * 事件类型
+ */
+export declare type DOMUtils_EventType = keyof DOMUtils_Event;