@whitesev/utils 1.7.0 → 1.9.0

package/dist/index.system.js

@@ -1568,14 +1568,23 @@ System.register('Utils', [], (function (exports) {
                      * @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") {
@@ -1637,15 +1646,24 @@ System.register('Utils', [], (function (exports) {
                      * @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") {
@@ -1659,17 +1677,28 @@ System.register('Utils', [], (function (exports) {
                     /**
                      * 失败的回调
                      * @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") {
@@ -1740,10 +1769,11 @@ System.register('Utils', [], (function (exports) {
                     /**
                      * 获取请求配置
                      * @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,
@@ -1769,10 +1799,10 @@ System.register('Utils', [], (function (exports) {
                             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);
@@ -1784,10 +1814,10 @@ System.register('Utils', [], (function (exports) {
                                 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") {
@@ -1917,9 +1947,10 @@ System.register('Utils', [], (function (exports) {
                      * 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);
                         }
@@ -1932,6 +1963,7 @@ System.register('Utils', [], (function (exports) {
                             response: null,
                             details: details,
                         }) == null) {
+                            // reject(new TypeError("response is intercept with onabort"));
                             return;
                         }
                         resolve({
@@ -1945,9 +1977,10 @@ System.register('Utils', [], (function (exports) {
                      * 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);
                         }
@@ -1964,6 +1997,7 @@ System.register('Utils', [], (function (exports) {
                             response: response,
                             details: details,
                         }) == null) {
+                            // reject(new TypeError("response is intercept with onerror"));
                             return;
                         }
                         resolve({
@@ -1978,9 +2012,10 @@ System.register('Utils', [], (function (exports) {
                      * 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);
                         }
@@ -1993,6 +2028,7 @@ System.register('Utils', [], (function (exports) {
                             response: (argumentsList || [null])[0],
                             details: details,
                         }) == null) {
+                            // reject(new TypeError("response is intercept with ontimeout"));
                             return;
                         }
                         resolve({
@@ -2019,9 +2055,10 @@ System.register('Utils', [], (function (exports) {
                      * 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不为空的情况 */
@@ -2076,6 +2113,7 @@ System.register('Utils', [], (function (exports) {
                         /* 状态码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({
@@ -2087,7 +2125,7 @@ System.register('Utils', [], (function (exports) {
                             });
                         }
                         else {
-                            this.context.HttpxCallBack.onError(details, resolve, argumentsList);
+                            this.context.HttpxCallBack.onError(details, resolve, reject, argumentsList);
                         }
                     },
                     /**
@@ -2398,8 +2436,8 @@ System.register('Utils', [], (function (exports) {
                 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);
@@ -2411,8 +2449,8 @@ System.register('Utils', [], (function (exports) {
                 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);
                     });
@@ -2423,8 +2461,8 @@ System.register('Utils', [], (function (exports) {
                 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);
@@ -2436,8 +2474,8 @@ System.register('Utils', [], (function (exports) {
                 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);
@@ -2449,8 +2487,8 @@ System.register('Utils', [], (function (exports) {
                 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);
@@ -2462,8 +2500,8 @@ System.register('Utils', [], (function (exports) {
                 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);
                     });
@@ -3438,7 +3476,7 @@ System.register('Utils', [], (function (exports) {
                     UtilsCore.init(option);
                 }
                 /** 版本号 */
-                version = "2024.6.16";
+                version = "2024.7.20";
                 addStyle(cssText) {
                     if (typeof cssText !== "string") {
                         throw new Error("Utils.addStyle 参数cssText 必须为String类型");
@@ -4132,21 +4170,31 @@ System.register('Utils', [], (function (exports) {
                     }
                 }
                 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];