@whitesev/utils 1.6.1 → 1.8.0

package/dist/index.system.js

@@ -1568,11 +1568,13 @@ System.register('Utils', [], (function (exports) {
                      * @private
                      */
                     beforeRequestCallBack(details) {
-                        if (!details.allowInterceptConfig) {
-                            return details;
-                        }
-                        if (!details.allowInterceptConfig.beforeRequest) {
-                            return details;
+                        if (details.allowInterceptConfig) {
+                            // 首先配置得存在，不然默认允许拦截
+                            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];
@@ -1635,11 +1637,14 @@ System.register('Utils', [], (function (exports) {
                      * @param details 请求的配置
                      */
                     successResponseCallBack(response, details) {
-                        if (!details.allowInterceptConfig) {
-                            return details;
-                        }
-                        if (!details.allowInterceptConfig.afterResponseSuccess) {
-                            return details;
+                        if (details.allowInterceptConfig) {
+                            // 首先配置得存在，不然默认允许拦截
+                            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];
@@ -1656,11 +1661,14 @@ System.register('Utils', [], (function (exports) {
                      * @param data 配置
                      */
                     errorResponseCallBack(data) {
-                        if (!data.details.allowInterceptConfig) {
-                            return data;
-                        }
-                        if (!data.details.allowInterceptConfig.afterResponseError) {
-                            return data;
+                        if (data.details.allowInterceptConfig) {
+                            // 首先配置得存在，不然默认允许拦截
+                            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];
@@ -3281,14 +3289,14 @@ System.register('Utils', [], (function (exports) {
             };
 
             class UtilsDictionary {
-                items = {};
+                #items = {};
                 constructor() { }
                 /**
                  * 检查是否有某一个键
                  * @param key 键
                  */
                 has(key) {
-                    return this.items.hasOwnProperty(key);
+                    return this.#items.hasOwnProperty(key);
                 }
                 /**
                  * 检查已有的键中是否以xx开头
@@ -3312,7 +3320,7 @@ System.register('Utils', [], (function (exports) {
                     let result = null;
                     for (const keyName of allKeys) {
                         if (keyName.startsWith(key)) {
-                            result = this.items[keyName];
+                            result = this.#items[keyName];
                             break;
                         }
                     }
@@ -3327,7 +3335,7 @@ System.register('Utils', [], (function (exports) {
                     if (key === void 0) {
                         throw new Error("Utils.Dictionary().set 参数 key 不能为空");
                     }
-                    this.items[key] = val;
+                    this.#items[key] = val;
                 }
                 /**
                  * 删除某一个键
@@ -3335,7 +3343,7 @@ System.register('Utils', [], (function (exports) {
                  */
                 delete(key) {
                     if (this.has(key)) {
-                        Reflect.deleteProperty(this.items, key);
+                        Reflect.deleteProperty(this.#items, key);
                         return true;
                     }
                     return false;
@@ -3363,8 +3371,8 @@ System.register('Utils', [], (function (exports) {
                  * 清空字典
                  */
                 clear() {
-                    this.items = void 0;
-                    this.items = {};
+                    this.#items = void 0;
+                    this.#items = {};
                 }
                 /**
                  * 获取字典的长度
@@ -3382,14 +3390,14 @@ System.register('Utils', [], (function (exports) {
                  * 返回字典本身
                  */
                 getItems() {
-                    return this.items;
+                    return this.#items;
                 }
                 /**
                  * 合并另一个字典
                  * @param data 需要合并的字典
                  */
                 concat(data) {
-                    this.items = utils.assign(this.items, data.getItems());
+                    this.#items = utils.assign(this.#items, data.getItems());
                 }
                 forEach(callbackfn) {
                     for (const key in this.getItems()) {
@@ -3430,7 +3438,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类型");
@@ -4124,21 +4132,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];