@whitesev/utils 2.1.3 → 2.1.5

package/dist/index.umd.js

@@ -2526,22 +2526,22 @@
         #db = {};
         // @ts-ignore
         #store = null;
-        #errorCode = {
-            /* 错误码 */
-            success: {
+        /** 状态码 */
+        #statusCode = {
+            operationSuccess: {
                 code: 200,
                 msg: "操作成功",
             },
-            error: {
+            operationFailed: {
                 code: 401,
                 msg: "操作失败",
             },
-            open: { code: 91001, msg: "打开数据库失败" },
-            save: { code: 91002, msg: "保存数据失败" },
-            get: { code: 91003, msg: "获取数据失败" },
-            delete: { code: 91004, msg: "删除数据失败" },
-            deleteAll: { code: 91005, msg: "清空数据库失败" },
-            regexpGet: { code: 91006, msg: "正则获取数据失败" },
+            openFailed: { code: 91001, msg: "打开数据库失败" },
+            saveFailed: { code: 91002, msg: "保存数据失败" },
+            getFailed: { code: 91003, msg: "获取数据失败" },
+            deleteFailed: { code: 91004, msg: "删除数据失败" },
+            deleteAllFailed: { code: 91005, msg: "清空数据库失败" },
+            regexpGetFailed: { code: 91006, msg: "正则获取数据失败" },
         };
         /**
          * @param dbName 数据存储名，默认为：default_db
@@ -2582,11 +2582,11 @@
                 /* 如果缓存中没有，则进行数据库的创建或打开，提高效率 */
                 let request = that.#indexedDB.open(dbName, that.#dbVersion);
                 request.onerror = function (event) {
-                    callback({
-                        code: that.#errorCode.open.code,
-                        msg: that.#errorCode.open.msg,
+                    callback(null, {
+                        code: that.#statusCode.openFailed.code,
+                        msg: that.#statusCode.openFailed.msg,
                         event: event,
-                    }, false);
+                    });
                 };
                 request.onsuccess = function (event) {
                     if (!that.#db[dbName]) {
@@ -2594,7 +2594,7 @@
                         that.#db[dbName] = target.result;
                     }
                     let store = that.createStore(dbName);
-                    callback(store, true);
+                    callback(store);
                 };
                 request.onupgradeneeded = function (event) {
                     let target = event.target;
@@ -2603,14 +2603,14 @@
                         keyPath: "key",
                     });
                     store.transaction.oncomplete = function (event) {
-                        callback(store, true);
+                        callback(store);
                     };
                 };
             }
             else {
                 /* 如果缓存中已经打开了数据库，就直接使用 */
-                let store = that.createStore(dbName);
-                callback(store, true);
+                let store = this.createStore(dbName);
+                callback(store);
             }
         }
         /**
@@ -2621,36 +2621,35 @@
         async save(key, value) {
             let that = this;
             return new Promise((resolve) => {
-                let dbName = that.#dbName;
+                let dbName = this.#dbName;
                 let inData = {
                     key: key,
                     value: value,
                 };
-                that.open(function (idbStore, success) {
-                    if (!success) {
+                this.open(function (idbStore) {
+                    if (idbStore == null) {
                         resolve({
                             success: false,
-                            code: that.#errorCode.save.code,
-                            msg: that.#errorCode.save.msg,
+                            code: that.#statusCode.saveFailed.code,
+                            msg: that.#statusCode.saveFailed.msg,
                         });
                     }
                     else {
-                        idbStore = idbStore;
                         let request = idbStore.put(inData);
                         request.onsuccess = function (event) {
                             /* 保存成功有success 字段 */
                             resolve({
                                 success: true,
-                                code: that.#errorCode.success.code,
-                                msg: that.#errorCode.success.msg,
+                                code: that.#statusCode.operationSuccess.code,
+                                msg: that.#statusCode.operationSuccess.msg,
                                 event: event,
                             });
                         };
                         request.onerror = function (event) {
                             resolve({
                                 success: false,
-                                code: that.#errorCode.save.code,
-                                msg: that.#errorCode.save.msg,
+                                code: that.#statusCode.saveFailed.code,
+                                msg: that.#statusCode.saveFailed.msg,
                                 event: event,
                             });
                         };
@@ -2666,33 +2665,32 @@
             let that = this;
             return new Promise((resolve) => {
                 let dbName = this.#dbName;
-                this.open(function (idbStore, success) {
+                this.open(function (idbStore) {
                     /* 判断返回的数据中是否有error字段 */
-                    if (!success) {
+                    if (idbStore == null) {
                         resolve({
                             success: false,
-                            code: that.#errorCode.get.code,
-                            msg: that.#errorCode.get.msg,
+                            code: that.#statusCode.getFailed.code,
+                            msg: that.#statusCode.getFailed.msg,
                         });
                     }
                     else {
-                        idbStore = idbStore;
                         let request = idbStore.get(key);
                         request.onsuccess = function (event) {
                             /* result 返回的是 {key: string, value: any} */
                             /* 键值对存储 */
                             resolve({
                                 success: true,
-                                code: that.#errorCode.success.code,
-                                msg: that.#errorCode.success.msg,
+                                code: that.#statusCode.operationSuccess.code,
+                                msg: that.#statusCode.operationSuccess.msg,
                                 event: event,
                             });
                         };
                         request.onerror = function (event) {
                             resolve({
                                 success: false,
-                                code: that.#errorCode.get.code,
-                                msg: that.#errorCode.get.msg,
+                                code: that.#statusCode.getFailed.code,
+                                msg: that.#statusCode.getFailed.msg,
                                 event: event,
                             });
                         };
@@ -2708,18 +2706,17 @@
             let that = this;
             return new Promise((resolve) => {
                 let dbName = this.#dbName;
-                this.open(function (idbStore, success) {
+                this.open(function (idbStore) {
                     /* 判断返回的数据中是否有error字段 */
-                    if (!success) {
+                    if (idbStore == null) {
                         resolve({
                             success: false,
-                            code: that.#errorCode.get.code,
-                            msg: that.#errorCode.get.msg,
+                            code: that.#statusCode.getFailed.code,
+                            msg: that.#statusCode.getFailed.msg,
                             data: void 0,
                         });
                     }
                     else {
-                        idbStore = idbStore;
                         let request = idbStore.get(key);
                         request.onsuccess = function (event) {
                             let target = event.target;
@@ -2730,8 +2727,8 @@
                             if (data) {
                                 resolve({
                                     success: true,
-                                    code: that.#errorCode.success.code,
-                                    msg: that.#errorCode.success.msg,
+                                    code: that.#statusCode.operationSuccess.code,
+                                    msg: that.#statusCode.operationSuccess.msg,
                                     data: data,
                                     event: event,
                                     result: result,
@@ -2740,8 +2737,8 @@
                             else {
                                 resolve({
                                     success: false,
-                                    code: that.#errorCode.error.code,
-                                    msg: that.#errorCode.error.msg,
+                                    code: that.#statusCode.operationFailed.code,
+                                    msg: that.#statusCode.operationFailed.msg,
                                     data: void 0,
                                     event: event,
                                     result: result,
@@ -2749,12 +2746,10 @@
                             }
                         };
                         request.onerror = function (event) {
-                            // @ts-ignore
-                            event.target;
                             resolve({
                                 success: false,
-                                code: that.#errorCode.get.code,
-                                msg: that.#errorCode.get.msg,
+                                code: that.#statusCode.getFailed.code,
+                                msg: that.#statusCode.getFailed.msg,
                                 data: void 0,
                                 event: event,
                             });
@@ -2773,18 +2768,17 @@
             return new Promise((resolve) => {
                 /* 正则查询 */
                 let dbName = that.#dbName;
-                that.open(function (idbStore, success) {
+                this.open(function (idbStore) {
                     /* 判断返回的数据中是否有error字段 */
-                    if (!success) {
+                    if (idbStore == null) {
                         resolve({
                             success: false,
-                            code: that.#errorCode.regexpGet.code,
-                            msg: that.#errorCode.regexpGet.msg,
+                            code: that.#statusCode.regexpGetFailed.code,
+                            msg: that.#statusCode.regexpGetFailed.msg,
                             data: [],
                         });
                     }
                     else {
-                        idbStore = idbStore;
                         let request = idbStore.getAll();
                         request.onsuccess = function (event) {
                             let target = event.target;
@@ -2802,19 +2796,17 @@
                             }
                             resolve({
                                 success: true,
-                                code: that.#errorCode.success.code,
-                                msg: that.#errorCode.success.msg,
+                                code: that.#statusCode.operationSuccess.code,
+                                msg: that.#statusCode.operationSuccess.msg,
                                 data: list,
                                 event: event,
                             });
                         };
                         request.onerror = function (event) {
-                            // @ts-ignore
-                            event.target;
                             resolve({
                                 success: false,
-                                code: that.#errorCode.get.code,
-                                msg: that.#errorCode.get.msg,
+                                code: that.#statusCode.getFailed.code,
+                                msg: that.#statusCode.getFailed.msg,
                                 data: [],
                                 event: event,
                             });
@@ -2832,44 +2824,30 @@
             return new Promise((resolve) => {
                 /* 根据key删除某条数据 */
                 let dbName = that.#dbName;
-                that.open(function (idbStore, success) {
-                    if (!success) {
+                this.open(function (idbStore) {
+                    if (idbStore == null) {
                         resolve({
                             success: false,
-                            code: that.#errorCode.delete.code,
-                            msg: that.#errorCode.delete.msg,
+                            code: that.#statusCode.deleteFailed.code,
+                            msg: that.#statusCode.deleteFailed.msg,
                         });
                     }
                     else {
-                        idbStore = idbStore;
-                        let request = idbStore.get(key);
+                        // 删除键
+                        let request = idbStore.delete(key);
                         request.onsuccess = function (event) {
-                            let target = event.target;
-                            let recode = target.result;
-                            if (recode) {
-                                /* 成功 */
-                                request = idbStore.delete(key);
-                                resolve({
-                                    success: true,
-                                    code: that.#errorCode.success.code,
-                                    msg: that.#errorCode.success.msg,
-                                });
-                            }
-                            else {
-                                resolve({
-                                    success: false,
-                                    code: that.#errorCode.error.code,
-                                    msg: that.#errorCode.error.msg,
-                                });
-                            }
+                            resolve({
+                                success: true,
+                                code: that.#statusCode.operationSuccess.code,
+                                msg: that.#statusCode.operationSuccess.msg,
+                                event: event,
+                            });
                         };
                         request.onerror = function (event) {
-                            // @ts-ignore
-                            event.target;
                             resolve({
                                 success: false,
-                                code: that.#errorCode.delete.code,
-                                msg: that.#errorCode.delete.msg,
+                                code: that.#statusCode.deleteFailed.code,
+                                msg: that.#statusCode.deleteFailed.msg,
                                 event: event,
                             });
                         };
@@ -2885,22 +2863,33 @@
             return new Promise((resolve) => {
                 /* 清空数据库 */
                 let dbName = that.#dbName;
-                that.open(function (idbStore, success) {
-                    if (!success) {
+                this.open(function (idbStore) {
+                    if (idbStore == null) {
                         resolve({
                             success: false,
-                            code: that.#errorCode.deleteAll.code,
-                            msg: that.#errorCode.deleteAll.msg,
+                            code: that.#statusCode.deleteAllFailed.code,
+                            msg: that.#statusCode.deleteAllFailed.msg,
                         });
                     }
                     else {
-                        idbStore = idbStore;
-                        idbStore.clear();
-                        resolve({
-                            success: true,
-                            code: that.#errorCode.success.code,
-                            msg: that.#errorCode.success.msg,
-                        });
+                        // 清空
+                        let operateResult = idbStore.clear();
+                        operateResult.onsuccess = function (event) {
+                            resolve({
+                                success: true,
+                                code: that.#statusCode.operationSuccess.code,
+                                msg: that.#statusCode.operationSuccess.msg,
+                                event: event,
+                            });
+                        };
+                        operateResult.onerror = function (event) {
+                            resolve({
+                                success: false,
+                                code: that.#statusCode.deleteAllFailed.code,
+                                msg: that.#statusCode.deleteAllFailed.msg,
+                                event: event,
+                            });
+                        };
                     }
                 }, dbName);
             });
@@ -5044,7 +5033,7 @@
             });
             return result;
         }
-        listenKeyboard(target, eventName = "keypress", callback) {
+        listenKeyboard(target, eventName = "keypress", callback, options) {
             if (typeof target !== "object" ||
                 (typeof target["addEventListener"] !== "function" &&
                     typeof target["removeEventListener"] !== "function")) {
@@ -5070,7 +5059,7 @@
                     callback(keyName, keyValue.toString(), otherCodeList, event);
                 }
             };
-            target.addEventListener(eventName, keyEvent);
+            target.addEventListener(eventName, keyEvent, options);
             return {
                 removeListen() {
                     target.removeEventListener(eventName, keyEvent);