@whitesev/pops 4.2.2 → 4.2.3

package/dist/types/src/utils/PopsUtils.d.ts

@@ -178,7 +178,7 @@ declare class PopsUtils {
         x: number;
         y: number;
     }>>, deviation?: number): {
-        /** 处理了偏移量后的z-index值 */
+        /** 处理了偏移量和阈值比较后的z-index值 */
         zIndex: number;
         /** 原始z-index值 */
         originZIndex: number;
@@ -200,7 +200,7 @@ declare class PopsUtils {
      * Utils.getMaxZIndexNodeInfoFromPoint(20);
      */
     getMaxZIndexNodeInfoFromPoint(deviation: IFunction<number>): {
-        /** 处理了偏移量后的z-index值 */
+        /** 处理了偏移量和阈值比较后的z-index值 */
         zIndex: number;
         /** 原始z-index值 */
         originZIndex: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whitesev/pops",
-  "version": "4.2.2",
+  "version": "4.2.3",
   "description": "弹窗库，包含了alert、confirm、prompt、drawer、folder、loading、iframe、panel、tooltip、searchSuggestion、rightClickMenu组件",
   "keywords": [
     "ScriptCat",
@@ -57,8 +57,8 @@
     "eslint-plugin-compat": "^6.0.2",
     "eslint-plugin-prettier": "^5.5.4",
     "globals": "^16.5.0",
-    "oxfmt": "^0.36.0",
-    "oxlint": "1.51.0",
+    "oxfmt": "^0.37.0",
+    "oxlint": "1.52.0",
     "rollup": "^4.54.0",
     "rollup-plugin-clear": "^2.0.7",
     "rollup-plugin-import-css": "^4.1.2",

package/src/utils/PopsInstanceUtils.ts

@@ -8,8 +8,8 @@ export const PopsInstanceUtils = {
    * 获取pops所有弹窗中的最大的z-index
    * @param deviation
    */
-  getPopsMaxZIndex(deviation: number = 1) {
-    deviation = Number.isNaN(deviation) ? 1 : deviation;
+  getPopsMaxZIndex(deviation: number = 10) {
+    deviation = Number.isNaN(deviation) ? 10 : deviation;
     // 最大值 2147483647
     // const browserMaxZIndex = Math.pow(2, 31) - 1;
     // 比较值 2000000000
@@ -25,8 +25,7 @@ export const PopsInstanceUtils = {
         const inst = instData[index];
         // 不对position为static和display为none的元素进行获取它们的z-index
         const $elList = [inst.$anim, inst.$pops, inst.$mask].filter((it) => it instanceof HTMLElement);
-        const nodeZIndexInfoList = popsUtils.getMaxZIndexNodeInfoFromPoint($elList);
-        const maxNodeZIndexInfo = nodeZIndexInfoList[0];
+        const maxNodeZIndexInfo = popsUtils.getMaxZIndexNodeInfoFromPoint($elList)[0];
         if (maxNodeZIndexInfo) {
           const nodeZIndex = maxNodeZIndexInfo.zIndex;
           if (nodeZIndex > zIndex) {

package/src/utils/PopsUtils.ts

@@ -436,7 +436,7 @@ class PopsUtils {
     $el?: IFunction<IArray<HTMLElement> | IArray<{ x: number; y: number }>>,
     deviation?: number
   ): {
-    /** 处理了偏移量后的z-index值 */
+    /** 处理了偏移量和阈值比较后的z-index值 */
     zIndex: number;
     /** 原始z-index值 */
     originZIndex: number;
@@ -458,7 +458,7 @@ class PopsUtils {
    * Utils.getMaxZIndexNodeInfoFromPoint(20);
    */
   getMaxZIndexNodeInfoFromPoint(deviation: IFunction<number>): {
-    /** 处理了偏移量后的z-index值 */
+    /** 处理了偏移量和阈值比较后的z-index值 */
     zIndex: number;
     /** 原始z-index值 */
     originZIndex: number;
@@ -475,7 +475,7 @@ class PopsUtils {
     $el?: IFunction<IArray<HTMLElement> | number | IArray<{ x: number; y: number }>>,
     deviation?: number
   ): {
-    /** 处理了偏移量后的z-index值 */
+    /** 处理了偏移量和阈值比较后的z-index值 */
     zIndex: number;
     /** 原始z-index值 */
     originZIndex: number;
@@ -498,6 +498,10 @@ class PopsUtils {
     if (typeof deviation !== "number" || Number.isNaN(deviation)) {
       deviation = 10;
     }
+    // 最大值 2147483647
+    // const maxZIndex = Math.pow(2, 31) - 1;
+    // 比较值 2000000000
+    const maxZIndexCompare = 2 * Math.pow(10, 9);
     /** 坐标偏移 */
     const positionDistance = 10;
     const defaultCalcPostion: {
@@ -592,9 +596,14 @@ class PopsUtils {
             left: maxRect.left,
           };
         }
+        const calcZIndex = zIndex + deviation;
+        if (calcZIndex >= maxZIndexCompare) {
+          // 不要超过最大值
+          return;
+        }
         return {
           /** 计算偏移量后的z-index值 */
-          zIndex: zIndex + deviation,
+          zIndex: calcZIndex,
           /** 获取到的最大的z-index值 */
           originZIndex: zIndex,
           /** 拥有最大z-index的元素 */