@whitesev/utils 2.1.1 → 2.1.3

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

@@ -22,11 +22,27 @@ 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;
+    }>;
+    /**
+     * 判断是否存在该数据
+     * @param key 数据key
+     */
+    has(key: string): Promise<{
+        success: boolean;
+        code: number;
+        msg: string;
+        event?: {
+            srcElement: IDBRequest;
+            target: IDBRequest;
+        } & Event;
     }>;
     /**
      * 根据key获取值
@@ -37,29 +53,41 @@ 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;
+        };
     }>;
     /**
      * 正则获取数据
-     * @param key 数据键
+     * @param key 数据key，可以是正则
      */
-    regexpGet<T extends any>(key: string): Promise<{
+    regexpGet<T extends any>(key: string | RegExp): Promise<{
         success: boolean;
         code: number;
         msg: string;
         data: T[];
-        event?: Event;
+        event?: {
+            srcElement: IDBRequest<T>;
+            target: IDBRequest<T>;
+        } & Event;
     }>;
     /**
      * 删除数据
-     * @param {string} key 数据键
+     * @param key 数据key
      */
     delete(key: string): Promise<{
         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.1",
+  "version": "2.1.3",
   "description": "一个常用的工具库",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

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,
 
@@ -185,6 +184,55 @@ class indexedDB {
 		});
 	}
 
+	/**
+	 * 判断是否存在该数据
+	 * @param key 数据key
+	 */
+	async has(key: string): Promise<{
+		success: boolean;
+		code: number;
+		msg: string;
+		event?: {
+			srcElement: IDBRequest;
+			target: IDBRequest;
+		} & Event;
+	}> {
+		let that = this;
+		return new Promise((resolve) => {
+			let dbName = this.#dbName;
+			this.open(function (idbStore, success) {
+				/* 判断返回的数据中是否有error字段 */
+				if (!success) {
+					resolve({
+						success: false,
+						code: that.#errorCode.get.code,
+						msg: that.#errorCode.get.msg,
+					});
+				} else {
+					idbStore = idbStore as IDBObjectStore;
+					let request = idbStore.get(key);
+					request.onsuccess = function (event: any) {
+						/* result 返回的是 {key: string, value: any} */
+						/* 键值对存储 */
+						resolve({
+							success: true,
+							code: that.#errorCode.success.code,
+							msg: that.#errorCode.success.msg,
+							event: event,
+						});
+					};
+					request.onerror = function (event: any) {
+						resolve({
+							success: false,
+							code: that.#errorCode.get.code,
+							msg: that.#errorCode.get.msg,
+							event: event,
+						});
+					};
+				}
+			}, dbName);
+		});
+	}
 	/**
 	 * 根据key获取值
 	 * @param key 数据key
@@ -197,13 +245,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({
@@ -217,10 +271,15 @@ class indexedDB {
 					let request = idbStore.get(key);
 					request.onsuccess = function (event: any) {
 						let target = event.target as IDBRequest;
-						let result = target.result;
+						let result = target.result as
+							| {
+									key: string;
+									value: T;
+							  }
+							| undefined;
 						/* result 返回的是 {key: string, value: any} */
 						/* 键值对存储 */
-						let data: T = result ? result.value : void 0;
+						let data = result ? result.value : void 0;
 						if (data) {
 							resolve({
 								success: true,
@@ -262,17 +321,20 @@ class indexedDB {
 
 	/**
 	 * 正则获取数据
-	 * @param key 数据键
+	 * @param key 数据key，可以是正则
 	 */
 	async regexpGet<T extends any>(
-		key: string
+		key: string | RegExp
 	): Promise<{
 		success: boolean;
 		code: number;
 		msg: string;
 		data: T[];
 
-		event?: Event;
+		event?: {
+			srcElement: IDBRequest<T>;
+			target: IDBRequest<T>;
+		} & Event;
 	}> {
 		let list: T[] = [];
 		let that = this;
@@ -292,14 +354,18 @@ class indexedDB {
 					idbStore = idbStore as IDBObjectStore;
 					let request = idbStore.getAll();
 					request.onsuccess = function (event: any) {
-						let target = event.target as IDBRequest;
+						let target = event.target as IDBRequest<
+							{ key: string; value: T }[]
+						>;
 						let result = target.result;
 						if (result.length !== 0) {
-							result.forEach((item: any, index: any) => {
-								if (item["key"].match(key)) {
-									let concatList = item["value"];
-									concatList["key"] = item["key"];
-									list = [...list, concatList];
+							result.forEach((dataItem, index) => {
+								// 当前项的key
+								let __key = dataItem["key"];
+								// 当前项的value
+								let __value = dataItem["value"];
+								if (__key.match(key)) {
+									list = list.concat(__value);
 								}
 							});
 						}
@@ -331,14 +397,17 @@ class indexedDB {
 
 	/**
 	 * 删除数据
-	 * @param {string} key 数据键
+	 * @param key 数据key
 	 */
 	async delete(key: string): Promise<{
 		success: boolean;
 		code: number;
 		msg: string;
 
-		event?: Event;
+		event?: {
+			srcElement: IDBRequest;
+			target: IDBRequest;
+		} & Event;
 	}> {
 		let that = this;
 		return new Promise((resolve) => {