@whitesev/utils 1.7.0 → 1.9.0

package/dist/index.umd.js

@@ -1569,14 +1569,23 @@
              * @private
              */
             beforeRequestCallBack(details) {
-                if (details.allowInterceptConfig) {
-                    // 首先配置得存在，不然默认允许拦截
-                    if (typeof details.allowInterceptConfig.beforeRequest === "boolean" &&
-                        !details.allowInterceptConfig.beforeRequest) {
-                        // 设置了禁止拦截
+                if (typeof details.allowInterceptConfig === "boolean") {
+                    if (!details.allowInterceptConfig) {
+                        // 不允许拦截
                         return details;
                     }
                 }
+                else {
+                    if (details.allowInterceptConfig != null) {
+                        // 配置存在
+                        // 细分处理是否拦截
+                        if (typeof details.allowInterceptConfig.beforeRequest === "boolean" &&
+                            !details.allowInterceptConfig.beforeRequest) {
+                            // 设置了禁止拦截
+                            return details;
+                        }
+                    }
+                }
                 for (let index = 0; index < this.$config.configList.length; index++) {
                     let item = this.$config.configList[index];
                     if (typeof item.fn === "function") {
@@ -1638,15 +1647,24 @@
              * @param details 请求的配置
              */
             successResponseCallBack(response, details) {
-                if (details.allowInterceptConfig) {
-                    // 首先配置得存在，不然默认允许拦截
-                    if (typeof details.allowInterceptConfig.afterResponseSuccess ===
-                        "boolean" &&
-                        !details.allowInterceptConfig.afterResponseSuccess) {
-                        // 设置了禁止拦截
+                if (typeof details.allowInterceptConfig === "boolean") {
+                    if (!details.allowInterceptConfig) {
+                        // 不允许拦截
                         return details;
                     }
                 }
+                else {
+                    if (details.allowInterceptConfig != null) {
+                        // 配置存在
+                        // 细分处理是否拦截
+                        if (typeof details.allowInterceptConfig.afterResponseSuccess ===
+                            "boolean" &&
+                            !details.allowInterceptConfig.afterResponseSuccess) {
+                            // 设置了禁止拦截
+                            return details;
+                        }
+                    }
+                }
                 for (let index = 0; index < this.$config.configList.length; index++) {
                     let item = this.$config.configList[index];
                     if (typeof item.successFn === "function") {
@@ -1660,17 +1678,28 @@
             /**
              * 失败的回调
              * @param data 配置
+             * @returns
+             * 返回null|undefined就是拦截掉了
              */
             errorResponseCallBack(data) {
-                if (data.details.allowInterceptConfig) {
-                    // 首先配置得存在，不然默认允许拦截
-                    if (typeof data.details.allowInterceptConfig.afterResponseError ===
-                        "boolean" &&
-                        !data.details.allowInterceptConfig.afterResponseError) {
-                        // 设置了禁止拦截
+                if (typeof data.details.allowInterceptConfig === "boolean") {
+                    if (!data.details.allowInterceptConfig) {
+                        // 不允许拦截
                         return data;
                     }
                 }
+                else {
+                    if (data.details.allowInterceptConfig != null) {
+                        // 配置存在
+                        // 细分处理是否拦截
+                        if (typeof data.details.allowInterceptConfig.afterResponseError ===
+                            "boolean" &&
+                            !data.details.allowInterceptConfig.afterResponseError) {
+                            // 设置了禁止拦截
+                            return data;
+                        }
+                    }
+                }
                 for (let index = 0; index < this.$config.configList.length; index++) {
                     let item = this.$config.configList[index];
                     if (typeof item.errorFn === "function") {
@@ -1741,10 +1770,11 @@
             /**
              * 获取请求配置
              * @param method 当前请求方法，默认get
-             * @param resolve promise回调
              * @param details 请求配置
+             * @param resolve promise回调
+             * @param reject 抛出错误回调
              */
-            getDetails(method, resolve, details) {
+            getDetails(method, details, resolve, reject) {
                 let that = this;
                 let result = {
                     url: details.url || this.context.#defaultDetails.url,
@@ -1770,10 +1800,10 @@
                     user: details.user || this.context.#defaultDetails.user,
                     password: details.password || this.context.#defaultDetails.password,
                     onabort(...args) {
-                        that.context.HttpxCallBack.onAbort(details, resolve, args);
+                        that.context.HttpxCallBack.onAbort(details, resolve, reject, args);
                     },
                     onerror(...args) {
-                        that.context.HttpxCallBack.onError(details, resolve, args);
+                        that.context.HttpxCallBack.onError(details, resolve, reject, args);
                     },
                     onloadstart(...args) {
                         that.context.HttpxCallBack.onLoadStart(details, args);
@@ -1785,10 +1815,10 @@
                         that.context.HttpxCallBack.onReadyStateChange(details, args);
                     },
                     ontimeout(...args) {
-                        that.context.HttpxCallBack.onTimeout(details, resolve, args);
+                        that.context.HttpxCallBack.onTimeout(details, resolve, reject, args);
                     },
                     onload(...args) {
-                        that.context.HttpxCallBack.onLoad(details, resolve, args);
+                        that.context.HttpxCallBack.onLoad(details, resolve, reject, args);
                     },
                 };
                 if (typeof this.context.GM_Api.xmlHttpRequest !== "function") {
@@ -1918,9 +1948,10 @@
              * onabort请求被取消-触发
              * @param details 配置
              * @param resolve 回调
+             * @param reject 抛出错误
              * @param argumentsList 参数列表
              */
-            onAbort(details, resolve, argumentsList) {
+            onAbort(details, resolve, reject, argumentsList) {
                 if ("onabort" in details) {
                     details.onabort.apply(this, argumentsList);
                 }
@@ -1933,6 +1964,7 @@
                     response: null,
                     details: details,
                 }) == null) {
+                    // reject(new TypeError("response is intercept with onabort"));
                     return;
                 }
                 resolve({
@@ -1946,9 +1978,10 @@
              * onerror请求异常-触发
              * @param details 配置
              * @param resolve 回调
+             * @param reject 抛出错误
              * @param argumentsList 响应的参数列表
              */
-            onError(details, resolve, argumentsList) {
+            onError(details, resolve, reject, argumentsList) {
                 if ("onerror" in details) {
                     details.onerror.apply(this, argumentsList);
                 }
@@ -1965,6 +1998,7 @@
                     response: response,
                     details: details,
                 }) == null) {
+                    // reject(new TypeError("response is intercept with onerror"));
                     return;
                 }
                 resolve({
@@ -1979,9 +2013,10 @@
              * ontimeout请求超时-触发
              * @param details 配置
              * @param resolve 回调
+             * @param reject 抛出错误
              * @param argumentsList 参数列表
              */
-            onTimeout(details, resolve, argumentsList) {
+            onTimeout(details, resolve, reject, argumentsList) {
                 if ("ontimeout" in details) {
                     details.ontimeout.apply(this, argumentsList);
                 }
@@ -1994,6 +2029,7 @@
                     response: (argumentsList || [null])[0],
                     details: details,
                 }) == null) {
+                    // reject(new TypeError("response is intercept with ontimeout"));
                     return;
                 }
                 resolve({
@@ -2020,9 +2056,10 @@
              * onload加载完毕-触发
              * @param details 请求的配置
              * @param resolve 回调
+             * @param reject 抛出错误
              * @param argumentsList 参数列表
              */
-            onLoad(details, resolve, argumentsList) {
+            onLoad(details, resolve, reject, argumentsList) {
                 /* X浏览器会因为设置了responseType导致不返回responseText */
                 let Response = argumentsList[0];
                 /* responseText为空，response不为空的情况 */
@@ -2077,6 +2114,7 @@
                 /* 状态码2xx都是成功的 */
                 if (Math.floor(Response.status / 100) === 2) {
                     if (this.context.HttpxResponseHook.successResponseCallBack(Response, details) == null) {
+                        // reject(new TypeError("response is intercept with onloada"));
                         return;
                     }
                     resolve({
@@ -2088,7 +2126,7 @@
                     });
                 }
                 else {
-                    this.context.HttpxCallBack.onError(details, resolve, argumentsList);
+                    this.context.HttpxCallBack.onError(details, resolve, reject, argumentsList);
                 }
             },
             /**
@@ -2399,8 +2437,8 @@
         async get(...args) {
             let that = this;
             let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
-            return new Promise((resolve) => {
-                let requestDetails = that.HttpxRequestDetails.getDetails("get", resolve, details);
+            return new Promise((resolve, reject) => {
+                let requestDetails = that.HttpxRequestDetails.getDetails("GET", details, resolve, reject);
                 Reflect.deleteProperty(requestDetails, "onprogress");
                 requestDetails = that.HttpxRequestDetails.handle(requestDetails);
                 that.HttpxRequest.request(requestDetails);
@@ -2412,8 +2450,8 @@
         async post(...args) {
             let that = this;
             let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
-            return new Promise((resolve) => {
-                let requestDetails = that.HttpxRequestDetails.getDetails("post", resolve, details);
+            return new Promise((resolve, reject) => {
+                let requestDetails = that.HttpxRequestDetails.getDetails("POST", details, resolve, reject);
                 requestDetails = that.HttpxRequestDetails.handle(requestDetails);
                 that.HttpxRequest.request(requestDetails);
             });
@@ -2424,8 +2462,8 @@
         async head(...args) {
             let that = this;
             let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
-            return new Promise((resolve) => {
-                let requestDetails = that.HttpxRequestDetails.getDetails("head", resolve, details);
+            return new Promise((resolve, reject) => {
+                let requestDetails = that.HttpxRequestDetails.getDetails("HEAD", details, resolve, reject);
                 Reflect.deleteProperty(requestDetails, "onprogress");
                 requestDetails = that.HttpxRequestDetails.handle(requestDetails);
                 that.HttpxRequest.request(requestDetails);
@@ -2437,8 +2475,8 @@
         async options(...args) {
             let that = this;
             let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
-            return new Promise((resolve) => {
-                let requestDetails = that.HttpxRequestDetails.getDetails("options", resolve, details);
+            return new Promise((resolve, reject) => {
+                let requestDetails = that.HttpxRequestDetails.getDetails("OPTIONS", details, resolve, reject);
                 Reflect.deleteProperty(requestDetails, "onprogress");
                 requestDetails = that.HttpxRequestDetails.handle(requestDetails);
                 that.HttpxRequest.request(requestDetails);
@@ -2450,8 +2488,8 @@
         async delete(...args) {
             let that = this;
             let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
-            return new Promise((resolve) => {
-                let requestDetails = that.HttpxRequestDetails.getDetails("delete", resolve, details);
+            return new Promise((resolve, reject) => {
+                let requestDetails = that.HttpxRequestDetails.getDetails("DELETE", details, resolve, reject);
                 Reflect.deleteProperty(requestDetails, "onprogress");
                 requestDetails = that.HttpxRequestDetails.handle(requestDetails);
                 that.HttpxRequest.request(requestDetails);
@@ -2463,8 +2501,8 @@
         async put(...args) {
             let that = this;
             let details = this.HttpxRequestDetails.handleBeforeRequestDetails(...args);
-            return new Promise((resolve) => {
-                let requestDetails = that.HttpxRequestDetails.getDetails("put", resolve, details);
+            return new Promise((resolve, reject) => {
+                let requestDetails = that.HttpxRequestDetails.getDetails("PUT", details, resolve, reject);
                 requestDetails = that.HttpxRequestDetails.handle(requestDetails);
                 that.HttpxRequest.request(requestDetails);
             });
@@ -3439,7 +3477,7 @@
             UtilsCore.init(option);
         }
         /** 版本号 */
-        version = "2024.6.16";
+        version = "2024.7.20";
         addStyle(cssText) {
             if (typeof cssText !== "string") {
                 throw new Error("Utils.addStyle 参数cssText 必须为String类型");
@@ -4133,21 +4171,31 @@
             }
         }
         getMaxZIndex(deviation = 1) {
-            let nodeIndexList = [];
             deviation = Number.isNaN(deviation) ? 1 : deviation;
-            document.querySelectorAll("*").forEach((element) => {
+            // 最大值2147483647
+            let maxZIndex = Math.pow(2, 31) - 1;
+            // 比较值2000000000
+            let maxZIndexCompare = 2 * Math.pow(10, 9);
+            // 当前页面最大的z-index
+            let zIndex = 0;
+            document.querySelectorAll("*").forEach((element, index) => {
                 let nodeStyle = window.getComputedStyle(element);
                 /* 不对position为static和display为none的元素进行获取它们的z-index */
                 if (nodeStyle.position !== "static" && nodeStyle.display !== "none") {
-                    nodeIndexList = nodeIndexList.concat(parseInt(nodeStyle.zIndex));
+                    let nodeZIndex = parseInt(nodeStyle.zIndex);
+                    if (!isNaN(nodeZIndex)) {
+                        if (nodeZIndex > zIndex) {
+                            zIndex = nodeZIndex;
+                        }
+                    }
                 }
             });
-            /* 过滤非Boolean类型 */
-            nodeIndexList = nodeIndexList.filter(Boolean);
-            let currentMaxZIndex = nodeIndexList.length
-                ? Math.max(...nodeIndexList)
-                : 0;
-            return currentMaxZIndex + deviation;
+            zIndex += deviation;
+            if (zIndex >= maxZIndexCompare) {
+                // 最好不要超过最大值
+                zIndex = maxZIndex;
+            }
+            return zIndex;
         }
         getMinValue(...args) {
             let result = [...args];