@whitesev/utils 2.1.0 → 2.1.2

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

@@ -12,7 +12,7 @@ import { UtilsDictionary } from "./Dictionary";
 import type { DOMUtils_EventType } from "./Event";
 import type { Vue2Object } from "./VueObject";
 import type { UtilsAjaxHookResult } from "./AjaxHookerType";
-import { type UtilsWindowApiOption } from "./UtilsWindowApi";
+import { type UtilsWindowApiOption } from "./WindowApi";
 export declare var unsafeWindow: Window & typeof globalThis;
 export type JSTypeMap = {
     string: string;
@@ -1361,7 +1361,7 @@ declare class Utils {
      * Utils.sortListByProperty([{"time":"2022-1-1"},{"time":"2022-2-2"}],(item)=>{return item["time"]},false)
      * > [{time: '2022-1-1'},{time: '2022-2-2'}]
      **/
-    sortListByProperty<T extends any[] | NodeList>(data: T, getPropertyValueFunc: string | ((value: T) => any), sortByDesc?: boolean): T;
+    sortListByProperty<T extends any>(data: T[], getPropertyValueFunc: string | ((value: T) => any), sortByDesc?: boolean): T[];
     /**
      * 字符串转正则，用于把字符串中不规范的字符进行转义
      * @param targetString 需要进行转换的字符串

package/dist/types/src/{UtilsWindowApi.d.ts → WindowApi.d.ts}

@@ -8,7 +8,7 @@ export type UtilsWindowApiOption = {
     self: Window & typeof globalThis;
     top: Window;
 };
-export declare class UtilsWindowApi {
+export declare class WindowApi {
     /** 默认的配置 */
     private defaultApi;
     /** 使用的配置 */

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

@@ -22,11 +22,14 @@ declare class indexedDB {
      * @param key 数据key
      * @param value 数据值
      */
-    save(key: string, value: any): Promise<{
+    save<T extends any>(key: string, value: T): Promise<{
         success: boolean;
         code: number;
         msg: string;
-        event?: Event;
+        event?: {
+            srcElement: IDBRequest<T>;
+            target: IDBRequest<T>;
+        } & Event;
     }>;
     /**
      * 根据key获取值
@@ -37,8 +40,14 @@ declare class indexedDB {
         code: number;
         msg: string;
         data: T;
-        event?: Event;
-        result?: any;
+        event?: {
+            srcElement: IDBRequest<T>;
+            target: IDBRequest<T>;
+        } & Event;
+        result?: {
+            key: string;
+            value: T;
+        };
     }>;
     /**
      * 正则获取数据
@@ -49,7 +58,10 @@ declare class indexedDB {
         code: number;
         msg: string;
         data: T[];
-        event?: Event;
+        event?: {
+            srcElement: IDBRequest<T>;
+            target: IDBRequest<T>;
+        } & Event;
     }>;
     /**
      * 删除数据
@@ -59,7 +71,10 @@ declare class indexedDB {
         success: boolean;
         code: number;
         msg: string;
-        event?: Event;
+        event?: {
+            srcElement: IDBRequest;
+            target: IDBRequest;
+        } & Event;
     }>;
     /**
      * 删除所有数据

package/package.json

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

package/src/Utils.ts

@@ -15,7 +15,7 @@ import type { DOMUtils_EventType } from "./Event";
 import type { Vue2Object } from "./VueObject";
 import type { UtilsAjaxHookResult } from "./AjaxHookerType";
 import { GenerateUUID } from "./UtilsCommon";
-import { UtilsWindowApi, type UtilsWindowApiOption } from "./UtilsWindowApi";
+import { WindowApi, type UtilsWindowApiOption } from "./WindowApi";
 
 export declare var unsafeWindow: Window & typeof globalThis;
 
@@ -47,12 +47,12 @@ export declare interface AnyObject {
 export declare interface Vue2Context extends Vue2Object {}
 
 class Utils {
-	private windowApi: UtilsWindowApi;
+	private windowApi: WindowApi;
 	constructor(option?: UtilsWindowApiOption) {
-		this.windowApi = new UtilsWindowApi(option);
+		this.windowApi = new WindowApi(option);
 	}
 	/** 版本号 */
-	version = "2024.7.20";
+	version = "2024.7.24";
 
 	/**
 	 * 在页面中增加style元素，如果html节点存在子节点，添加子节点第一个，反之，添加到html节点的子节点最后一个
@@ -3602,16 +3602,16 @@ class Utils {
 	 * Utils.sortListByProperty([{"time":"2022-1-1"},{"time":"2022-2-2"}],(item)=>{return item["time"]},false)
 	 * > [{time: '2022-1-1'},{time: '2022-2-2'}]
 	 **/
-	sortListByProperty<T extends any[] | NodeList>(
-		data: T,
+	sortListByProperty<T extends any>(
+		data: T[],
 		getPropertyValueFunc: string | ((value: T) => any),
 		sortByDesc?: boolean
-	): T;
-	sortListByProperty<T extends any[] | NodeList>(
-		data: T,
+	): T[];
+	sortListByProperty<T extends any>(
+		data: T[],
 		getPropertyValueFunc: string | ((value: T) => any),
 		sortByDesc: boolean = true
-	): T {
+	): T[] {
 		let UtilsContext = this;
 		if (
 			typeof getPropertyValueFunc !== "function" &&
@@ -3702,7 +3702,10 @@ class Utils {
 		}
 		if (Array.isArray(data)) {
 			data.sort(sortFunc);
-		} else if (data instanceof NodeList || UtilsContext.isJQuery(data)) {
+		} else if (
+			(data as any) instanceof NodeList ||
+			UtilsContext.isJQuery(data)
+		) {
 			sortNodeFunc(data as any, getDataFunc as any);
 			result = (getDataFunc as any)();
 		} else {

package/src/{UtilsWindowApi.ts → WindowApi.ts}

@@ -9,7 +9,7 @@ export type UtilsWindowApiOption = {
 	top: Window;
 };
 
-export class UtilsWindowApi {
+export class WindowApi {
 	/** 默认的配置 */
 	private defaultApi: UtilsWindowApiOption = {
 		document: document,

package/src/indexedDB.ts

@@ -130,15 +130,18 @@ class indexedDB {
 	 * @param key 数据key
 	 * @param value 数据值
 	 */
-	async save(
+	async save<T extends any>(
 		key: string,
-		value: any
+		value: T
 	): Promise<{
 		success: boolean;
 		code: number;
 		msg: string;
 
-		event?: Event;
+		event?: {
+			srcElement: IDBRequest<T>;
+			target: IDBRequest<T>;
+		} & Event;
 	}> {
 		let that = this;
 		return new Promise((resolve) => {
@@ -157,10 +160,8 @@ class indexedDB {
 				} else {
 					idbStore = idbStore as IDBObjectStore;
 					let request = idbStore.put(inData);
-					request.onsuccess = function (event: Event) {
+					request.onsuccess = function (event: any) {
 						/* 保存成功有success 字段 */
-						// @ts-ignore
-						let target = event.target as IDBRequest;
 						resolve({
 							success: true,
 							code: that.#errorCode.success.code,
@@ -169,9 +170,7 @@ class indexedDB {
 							event: event,
 						});
 					};
-					request.onerror = function (event: Event) {
-						// @ts-ignore
-						let target = event.target as IDBRequest;
+					request.onerror = function (event: any) {
 						resolve({
 							success: false,
 
@@ -197,13 +196,19 @@ class indexedDB {
 		msg: string;
 		data: T;
 
-		event?: Event;
-		result?: any;
+		event?: {
+			srcElement: IDBRequest<T>;
+			target: IDBRequest<T>;
+		} & Event;
+		result?: {
+			key: string;
+			value: T;
+		};
 	}> {
 		let that = this;
 		return new Promise((resolve) => {
-			let dbName = that.#dbName;
-			that.open(function (idbStore, success) {
+			let dbName = this.#dbName;
+			this.open(function (idbStore, success) {
 				/* 判断返回的数据中是否有error字段 */
 				if (!success) {
 					resolve({
@@ -272,7 +277,10 @@ class indexedDB {
 		msg: string;
 		data: T[];
 
-		event?: Event;
+		event?: {
+			srcElement: IDBRequest<T>;
+			target: IDBRequest<T>;
+		} & Event;
 	}> {
 		let list: T[] = [];
 		let that = this;
@@ -338,7 +346,10 @@ class indexedDB {
 		code: number;
 		msg: string;
 
-		event?: Event;
+		event?: {
+			srcElement: IDBRequest;
+			target: IDBRequest;
+		} & Event;
 	}> {
 		let that = this;
 		return new Promise((resolve) => {