@whitesev/utils 2.3.7 → 2.3.8

package/dist/index.amd.js

@@ -2682,6 +2682,10 @@ define((function () { 'use strict';
                 code: 401,
                 msg: "操作失败",
             },
+            empty: {
+                code: 201,
+                msg: "操作成功，但是没有数据",
+            },
             openFailed: { code: 91001, msg: "打开数据库失败" },
             saveFailed: { code: 91002, msg: "保存数据失败" },
             getFailed: { code: 91003, msg: "获取数据失败" },
@@ -2870,11 +2874,11 @@ define((function () { 'use strict';
                             /* 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,
+                                    code: that.#statusCode.empty.code,
+                                    msg: that.#statusCode.empty.msg,
                                     data: data,
                                     event: event,
                                     result: result,
@@ -2882,10 +2886,10 @@ define((function () { 'use strict';
                             }
                             else {
                                 resolve({
-                                    success: false,
-                                    code: that.#statusCode.operationFailed.code,
-                                    msg: that.#statusCode.operationFailed.msg,
-                                    data: void 0,
+                                    success: true,
+                                    code: that.#statusCode.operationSuccess.code,
+                                    msg: that.#statusCode.operationSuccess.msg,
+                                    data: data,
                                     event: event,
                                     result: result,
                                 });
@@ -4099,22 +4103,33 @@ define((function () { 'use strict';
             if (!UtilsContext.isDOM(element)) {
                 throw new Error("Utils.checkUserClickInNode 参数 targetNode 必须为 Element|Node 类型");
             }
-            let mouseClickPosX = Number(window.event.clientX.toString()); /* 鼠标相对屏幕横坐标 */
-            let mouseClickPosY = Number(window.event.clientY.toString()); /* 鼠标相对屏幕纵坐标 */
-            let elementPosXLeft = Number(element.getBoundingClientRect().left); /* 要检测的元素的相对屏幕的横坐标最左边 */
-            let elementPosXRight = Number(element.getBoundingClientRect().right); /* 要检测的元素的相对屏幕的横坐标最右边 */
-            let elementPosYTop = Number(element.getBoundingClientRect().top); /* 要检测的元素的相对屏幕的纵坐标最上边 */
-            let elementPosYBottom = Number(element.getBoundingClientRect().bottom); /* 要检测的元素的相对屏幕的纵坐标最下边 */
-            let clickNodeHTML = this.windowApi.window.event.target
-                .innerHTML;
-            if (mouseClickPosX >= elementPosXLeft &&
-                mouseClickPosX <= elementPosXRight &&
-                mouseClickPosY >= elementPosYTop &&
-                mouseClickPosY <= elementPosYBottom) {
+            let clickEvent = UtilsContext.windowApi.window.event;
+            let touchEvent = UtilsContext.windowApi.window.event;
+            let $click = clickEvent?.composedPath()?.[0];
+            // 点击的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.getBoundingClientRect();
+            if (clickPosX >= elementPosXLeft &&
+                clickPosX <= elementPosXRight &&
+                clickPosY >= elementPosYTop &&
+                clickPosY <= elementPosYBottom) {
                 return true;
             }
-            else if (clickNodeHTML &&
-                element.innerHTML.includes(clickNodeHTML)) {
+            else if (($click && element.contains($click)) || $click == element) {
                 /* 这种情况是应对在界面中隐藏的元素，getBoundingClientRect获取的都是0 */
                 return true;
             }