@whitesev/pops 1.5.3 → 1.5.4

package/dist/types/src/components/rightClickMenu/indexType.d.ts

@@ -62,7 +62,7 @@ export interface PopsRightClickMenuDetails {
     /**
      * 弹窗的显示层级，默认10000
      */
-    zIndex?: number;
+    zIndex?: number | (() => number);
     /**
      * 是否阻止默认contextmenu事件
      */

package/dist/types/src/components/searchSuggestion/indexType.d.ts

@@ -71,7 +71,7 @@ export interface PopsSearchSuggestionDetails<T = any> {
     /**
      * 层级，默认10000
      */
-    zIndex?: 10000;
+    zIndex?: number | (() => number);
     /**
      * 搜索中的提示
      */

package/dist/types/src/components/tooltip/indexType.d.ts

@@ -39,7 +39,7 @@ export interface PopsToolTipDetails {
     /**
      * z-index，默认10000
      */
-    zIndex?: number;
+    zIndex?: number | (() => number);
     /**
      * 是否唯一，默认false
      */

package/dist/types/src/handler/PopsElementHandler.d.ts

@@ -14,8 +14,9 @@ export declare const PopsElementHandler: {
      * @param config
      * @param html
      * @param bottomBtnHTML
+     * @param zIndex
      */
-    getAnimHTML(guid: string, type: PopsTypeSupportAnim, config: PopsSupportAnim[keyof PopsSupportAnim], html?: string, bottomBtnHTML?: string): string;
+    getAnimHTML(guid: string, type: PopsTypeSupportAnim, config: PopsSupportAnim[keyof PopsSupportAnim], html: string | undefined, bottomBtnHTML: string | undefined, zIndex: number): string;
     /**
      * 获取顶部按钮层HTML
      * @param type

package/dist/types/src/handler/PopsHandler.d.ts

@@ -207,6 +207,11 @@ export declare const PopsHandler: {
         type: any;
         text: string;
     }, event: MouseEvent | PointerEvent) => void): void;
+    /**
+     * 把配置的z-index配置转为数字
+     * @param zIndex
+     */
+    handleZIndex(zIndex: number | (() => number)): number;
     /**
      * 处理config.only
      * @param type 当前弹窗类型

package/dist/types/src/types/components.d.ts

@@ -170,7 +170,7 @@ export interface PopsCommonConfig {
 	/**
 	 * z-index显示层级，默认10000
 	 */
-	zIndex?: number;
+	zIndex?: number | (() => number);
 	/**
 	 * 遮罩层
 	 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whitesev/pops",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "弹窗库",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
@@ -45,6 +45,7 @@
     "typescript": "^5.4.5"
   },
   "scripts": {
-    "build": "rollup --config"
+    "build": "rollup --config",
+    "build:all": "rollup --config"
   }
 }

package/src/Pops.ts

@@ -80,7 +80,7 @@ class Pops {
 	/** 配置 */
 	config = {
 		/** 版本号 */
-		version: "2024.9.9",
+		version: "2024.9.10",
 		cssText: {
 			/** 主CSS */
 			index: indexCSS,

package/src/components/alert/index.ts

@@ -83,7 +83,9 @@ export class PopsAlert {
 		const PopsType: PopsMode = "alert";
 		config = PopsHandler.handleOnly(PopsType, config);
 
-		let maskHTML = PopsElementHandler.getMaskHTML(guid, config.zIndex);
+		// 先把z-index提取出来
+		let zIndex = PopsHandler.handleZIndex(config.zIndex);
+		let maskHTML = PopsElementHandler.getMaskHTML(guid, zIndex);
 		let headerBtnHTML = PopsElementHandler.getHeaderBtnHTML(PopsType, config);
 		let bottomBtnHTML = PopsElementHandler.getBottomBtnHTML(PopsType, config);
 		let { headerStyle, headerPStyle } = PopsElementHandler.getHeaderStyle(
@@ -98,7 +100,7 @@ export class PopsAlert {
 			guid,
 			PopsType,
 			config,
-			`
+			/*html*/ `
 			<div 
 				class="pops-alert-title"
 				style="text-align: ${config.title.position};
@@ -118,7 +120,8 @@ export class PopsAlert {
 				}
 			</div>
 			${bottomBtnHTML}`,
-			bottomBtnHTML
+			bottomBtnHTML,
+			zIndex
 		);
 		/**
 		 * 弹窗的主元素，包括动画层

package/src/components/confirm/index.ts

@@ -117,7 +117,9 @@ export class PopsConfirm {
 
 		config = PopsHandler.handleOnly(PopsType, config);
 
-		let maskHTML = PopsElementHandler.getMaskHTML(guid, config.zIndex);
+		// 先把z-index提取出来
+		let zIndex = PopsHandler.handleZIndex(config.zIndex);
+		let maskHTML = PopsElementHandler.getMaskHTML(guid, zIndex);
 
 		let headerBtnHTML = PopsElementHandler.getHeaderBtnHTML(PopsType, config);
 		let bottomBtnHTML = PopsElementHandler.getBottomBtnHTML(PopsType, config);
@@ -133,7 +135,7 @@ export class PopsConfirm {
 			guid,
 			PopsType,
 			config,
-			`
+			/*html*/ `
             <div class="pops-confirm-title" style="text-align: ${
 							config.title.position
 						};${headerStyle}">
@@ -154,7 +156,8 @@ export class PopsConfirm {
                         </div>
                         ${bottomBtnHTML}
             `,
-			bottomBtnHTML
+			bottomBtnHTML,
+			zIndex
 		);
 		/**
 		 * 弹窗的主元素，包括动画层

package/src/components/drawer/index.ts

@@ -112,7 +112,9 @@ export class PopsDrawer {
 
 		config = PopsHandler.handleOnly(PopsType, config);
 
-		let maskHTML = PopsElementHandler.getMaskHTML(guid, config.zIndex);
+		// 先把z-index提取出来
+		let zIndex = PopsHandler.handleZIndex(config.zIndex);
+		let maskHTML = PopsElementHandler.getMaskHTML(guid, zIndex);
 
 		let headerBtnHTML = PopsElementHandler.getHeaderBtnHTML(PopsType, config);
 		let bottomBtnHTML = PopsElementHandler.getBottomBtnHTML(PopsType, config);
@@ -128,7 +130,7 @@ export class PopsDrawer {
 			guid,
 			PopsType,
 			config,
-			`
+			/*html*/ `
             ${
 							config.title.enable
 								? `
@@ -159,7 +161,8 @@ export class PopsDrawer {
 
             ${bottomBtnHTML}
             `,
-			bottomBtnHTML
+			bottomBtnHTML,
+			zIndex
 		);
 		/**
 		 * 弹窗的主元素，包括动画层

package/src/components/folder/index.ts

@@ -217,7 +217,10 @@ export class PopsFolder {
 
 		config = PopsHandler.handleOnly(PopsType, config);
 
-		let maskHTML = PopsElementHandler.getMaskHTML(guid, config.zIndex);
+		// 先把z-index提取出来
+		let zIndex = PopsHandler.handleZIndex(config.zIndex);
+		let maskHTML = PopsElementHandler.getMaskHTML(guid, zIndex);
+
 		let headerBtnHTML = PopsElementHandler.getHeaderBtnHTML(PopsType, config);
 		let bottomBtnHTML = PopsElementHandler.getBottomBtnHTML(
 			PopsType,
@@ -348,7 +351,8 @@ export class PopsFolder {
             </div>
             ${bottomBtnHTML}
             `,
-			bottomBtnHTML
+			bottomBtnHTML,
+			zIndex
 		);
 		/**
 		 * 弹窗的主元素，包括动画层

package/src/components/iframe/index.ts

@@ -87,12 +87,11 @@ export class PopsIframe {
 			config.animation != null && (config as any).animation != ""
 				? "position:absolute;"
 				: "";
-		let maskHTML = PopsElementHandler.getMaskHTML(
-			guid,
 
-			config.zIndex,
-			maskExtraStyle
-		);
+		// 先把z-index提取出来
+		let zIndex = PopsHandler.handleZIndex(config.zIndex);
+		let maskHTML = PopsElementHandler.getMaskHTML(guid, zIndex, maskExtraStyle);
+
 		let headerBtnHTML = PopsElementHandler.getHeaderBtnHTML(PopsType, config);
 		let iframeLoadingHTML = '<div class="pops-loading"></div>';
 		let titleText =
@@ -105,7 +104,7 @@ export class PopsIframe {
 			guid,
 			PopsType,
 			config,
-			`
+			/*html*/ `
             <div 
                 class="pops-iframe-title"
                 style="text-align: ${config.title.position};${headerStyle}"
@@ -131,7 +130,8 @@ export class PopsIframe {
                 </div>
                 ${config.loading.enable ? iframeLoadingHTML : ""}
             `,
-			""
+			"",
+			zIndex
 		);
 		/**
 		 * 弹窗的主元素，包括动画层
@@ -362,7 +362,11 @@ export class PopsIframe {
 			headerCloseBtnElement,
 			"click",
 			(event) => {
-				PopsInstanceUtils.removeInstance([pops.config.layer.iframe], guid, false);
+				PopsInstanceUtils.removeInstance(
+					[pops.config.layer.iframe],
+					guid,
+					false
+				);
 				setTimeout(() => {
 					let allIsMinElementList: HTMLElement[] = [];
 					pops.config.layer.iframe.forEach((item) => {

package/src/components/loading/index.ts

@@ -37,7 +37,11 @@ export class PopsLoading {
 		const PopsType = "loading";
 
 		config = PopsHandler.handleOnly(PopsType, config);
-		let maskHTML = PopsElementHandler.getMaskHTML(guid, config.zIndex);
+
+		// 先把z-index提取出来
+		let zIndex = PopsHandler.handleZIndex(config.zIndex);
+		let maskHTML = PopsElementHandler.getMaskHTML(guid, zIndex);
+
 		let { contentPStyle } = PopsElementHandler.getContentStyle(
 			"loading",
 			config
@@ -46,7 +50,7 @@ export class PopsLoading {
 			guid,
 			PopsType,
 			config,
-			`
+			/*html*/ `
             <div class="pops-loading-content">
                 ${
 									config.addIndexCSS
@@ -64,7 +68,8 @@ export class PopsLoading {
             <p pops style="${contentPStyle}">${config.content.text}</p>
             </div>
             `,
-			""
+			"",
+			zIndex
 		);
 
 		/**

package/src/components/panel/index.ts

@@ -346,7 +346,11 @@ export class PopsPanel {
 		let guid = popsUtils.getRandomGUID();
 		const PopsType = "panel";
 		config = PopsHandler.handleOnly(PopsType, config);
-		let maskHTML = PopsElementHandler.getMaskHTML(guid, config.zIndex);
+
+		// 先把z-index提取出来
+		let zIndex = PopsHandler.handleZIndex(config.zIndex);
+		let maskHTML = PopsElementHandler.getMaskHTML(guid, zIndex);
+
 		let headerBtnHTML = PopsElementHandler.getHeaderBtnHTML(PopsType, config);
 		let { headerStyle, headerPStyle } = PopsElementHandler.getHeaderStyle(
 			PopsType,
@@ -357,7 +361,7 @@ export class PopsPanel {
 			guid,
 			PopsType,
 			config,
-			`
+			/*html*/ `
 			<div 
 				class="pops-${PopsType}-title"
 				style="text-align: ${config.title.position};
@@ -378,7 +382,8 @@ export class PopsPanel {
 					<ul></ul>
 				</section>
 			</div>`,
-			""
+			"",
+			zIndex
 		);
 		/**
 		 * 弹窗的主元素，包括动画层

package/src/components/prompt/index.ts

@@ -123,7 +123,9 @@ export class PopsPrompt {
 
 		config = PopsHandler.handleOnly(PopsType, config);
 
-		let maskHTML = PopsElementHandler.getMaskHTML(guid, config.zIndex);
+		// 先把z-index提取出来
+		let zIndex = PopsHandler.handleZIndex(config.zIndex);
+		let maskHTML = PopsElementHandler.getMaskHTML(guid, zIndex);
 
 		let headerBtnHTML = PopsElementHandler.getHeaderBtnHTML(PopsType, config);
 		let bottomBtnHTML = PopsElementHandler.getBottomBtnHTML(PopsType, config);
@@ -139,7 +141,7 @@ export class PopsPrompt {
 			guid,
 			PopsType,
 			config,
-			`
+			/*html*/ `
             <div class="pops-prompt-title" style="text-align: ${
 							config.title.position
 						};${headerStyle}">
@@ -163,9 +165,10 @@ export class PopsPrompt {
 								  '">'
 						}
             </div>
-        ${bottomBtnHTML}
+        	${bottomBtnHTML}
             `,
-			bottomBtnHTML
+			bottomBtnHTML,
+			zIndex
 		);
 		/**
 		 * 弹窗的主元素，包括动画层

package/src/components/rightClickMenu/index.ts

@@ -355,7 +355,7 @@ export class PopsRightClickMenu {
 			 * @param isChildren 是否是rightClickMenu的某一项的子菜单
 			 */
 			getMenuContainerElement(zIndex: number, isChildren: boolean) {
-				let menuElement = popsUtils.parseTextToDOM(`
+				let menuElement = popsUtils.parseTextToDOM(/*html*/ `
 				<div class="pops-${PopsType}" ${isChildren ? 'is-children="true"' : ""}>
 				<style type="text/css" data-from="pops-${PopsType}">
 				.pops-${PopsType} *{
@@ -443,6 +443,12 @@ export class PopsRightClickMenu {
 				}
 				return menuElement;
 			},
+			/**
+			 * 动态获取配的z-index
+			 */
+			getMenuZIndex() {
+				return PopsHandler.handleZIndex(config.zIndex);
+			},
 			/**
 			 * 获取left、top偏移
 			 * @param menuElement 菜单元素
@@ -483,7 +489,10 @@ export class PopsRightClickMenu {
 				menuEvent: PointerEvent,
 				_config_: PopsRightClickMenuDataDetails[]
 			) {
-				let menuElement = this.getMenuContainerElement(config.zIndex, false);
+				let menuElement = this.getMenuContainerElement(
+					this.getMenuZIndex(),
+					false
+				);
 				(menuElement as any)["__menuData__"] = {
 					child: [],
 				};
@@ -539,7 +548,10 @@ export class PopsRightClickMenu {
 				rootElement: HTMLDivElement,
 				targetLiElement: HTMLLIElement
 			) {
-				let menuElement = this.getMenuContainerElement(config.zIndex, true);
+				let menuElement = this.getMenuContainerElement(
+					this.getMenuZIndex(),
+					true
+				);
 				(menuElement as any)["__menuData__"] = {
 					parent: targetLiElement,
 					root: rootElement,

package/src/components/rightClickMenu/indexType.ts

@@ -68,7 +68,7 @@ export interface PopsRightClickMenuDetails {
 	/**
 	 * 弹窗的显示层级，默认10000
 	 */
-	zIndex?: number;
+	zIndex?: number | (() => number);
 	/**
 	 * 是否阻止默认contextmenu事件
 	 */

package/src/components/searchSuggestion/index.ts

@@ -144,7 +144,7 @@ export class PopsSearchSuggestion {
 							}
 							ul.pops-${PopsType}-search-suggestion-hint{
 								position: ${config.isAbsolute ? "absolute" : "fixed"};
-								z-index: ${config.zIndex};
+								z-index: ${PopsHandler.handleZIndex(config.zIndex)};
 								width: 0;
 								left: 0;
 								max-height: ${config.maxHeight};

package/src/components/searchSuggestion/indexType.ts

@@ -75,7 +75,7 @@ export interface PopsSearchSuggestionDetails<T = any> {
 	/**
 	 * 层级，默认10000
 	 */
-	zIndex?: 10000;
+	zIndex?: number | (() => number);
 	/**
 	 * 搜索中的提示
 	 */

package/src/components/tooltip/index.ts

@@ -69,7 +69,9 @@ export class PopsTooltip {
 			}
 			_toolTipElement_.setAttribute("data-guid", guid);
 
-			_toolTipElement_.style.zIndex = config.zIndex.toString();
+			_toolTipElement_.style.zIndex = PopsHandler.handleZIndex(
+				config.zIndex
+			).toString();
 			_toolTipElement_.innerHTML = `<div style="text-align: center;">${getContent()}</div>`;
 			/* 箭头元素 */
 			let _toolTipArrowHTML_ = '<div class="pops-tip-arrow"></div>';

package/src/components/tooltip/indexType.ts

@@ -40,7 +40,7 @@ export interface PopsToolTipDetails {
 	/**
 	 * z-index，默认10000
 	 */
-	zIndex?: number;
+	zIndex?: number | (() => number);
 	/**
 	 * 是否唯一，默认false
 	 */

package/src/handler/PopsElementHandler.ts

@@ -24,6 +24,9 @@ export const PopsElementHandler = {
 	 */
 	getMaskHTML(guid: string, zIndex: number = 101, style = ""): string {
 		zIndex = zIndex - 100;
+		if (style.startsWith(";")) {
+			style = style.replace(";", "");
+		}
 		return `<div class="pops-mask" data-guid="${guid}" style="z-index:${zIndex};${style}"></div>`;
 	},
 	/**
@@ -33,21 +36,23 @@ export const PopsElementHandler = {
 	 * @param config
 	 * @param html
 	 * @param bottomBtnHTML
+	 * @param zIndex
 	 */
 	getAnimHTML(
 		guid: string,
 		type: PopsTypeSupportAnim,
 		config: PopsSupportAnim[keyof PopsSupportAnim],
 		html = "",
-		bottomBtnHTML = ""
+		bottomBtnHTML = "",
+		zIndex: number
 	) {
 		let __config = config as PopsAlertDetails;
 		let popsAnimStyle = "";
 		let popsStyle = "";
 		let popsPosition = __config.position || "";
 		if (config.zIndex != null) {
-			popsAnimStyle += `z-index: ${config.zIndex};`;
-			popsStyle += `z-index: ${config.zIndex};`;
+			popsAnimStyle += `z-index: ${zIndex};`;
+			popsStyle += `z-index: ${zIndex};`;
 		}
 		if (__config.width != null) {
 			popsStyle += `width: ${__config.width};`;
@@ -56,26 +61,27 @@ export const PopsElementHandler = {
 			popsStyle += `height: ${__config.height};`;
 		}
 		let hasBottomBtn = bottomBtnHTML.trim() === "" ? false : true;
-		return `<div 
-                    class="pops-anim"
-                    anim="${__config.animation || ""}"
-                    style="${popsAnimStyle};"
-                    data-guid="${guid}">
+		return /*html*/ `
+		<div 
+			class="pops-anim"
+			anim="${__config.animation || ""}"
+			style="${popsAnimStyle};"
+			data-guid="${guid}">
             ${
 							config.style != null
 								? `<style tyle="text/css">${config.style}</style>`
 								: ""
 						}
-                    <div
-                        class="pops ${config.class || ""}"
-                        data-bottom-btn="${hasBottomBtn}"
-                        type-value="${type}"
-                        style="${popsStyle}"
-                        position="${popsPosition}"
-                        data-guid="${guid}">
-                        ${html}
-                    </div>
-                </div>`;
+			<div
+				class="pops ${config.class || ""}"
+				data-bottom-btn="${hasBottomBtn}"
+				type-value="${type}"
+				style="${popsStyle}"
+				position="${popsPosition}"
+				data-guid="${guid}">
+				${html}
+			</div>
+		</div>`;
 	},
 	/**
 	 * 获取顶部按钮层HTML

package/src/handler/PopsHandler.ts

@@ -605,6 +605,17 @@ export const PopsHandler = {
 			}
 		);
 	},
+	/**
+	 * 把配置的z-index配置转为数字
+	 * @param zIndex
+	 */
+	handleZIndex(zIndex: number | (() => number)): number {
+		if (typeof zIndex === "function") {
+			return zIndex();
+		} else {
+			return zIndex;
+		}
+	},
 	/**
 	 * 处理config.only
 	 * @param type 当前弹窗类型
@@ -641,10 +652,22 @@ export const PopsHandler = {
 				);
 			}
 		} else {
-			const { zIndex: maxZIndex } = PopsInstanceUtils.getPopsMaxZIndex(
-				config.zIndex + 100
-			);
-			config.zIndex = maxZIndex;
+			// 对配置进行处理
+			// 选择配置的z-index和已有的pops实例的最大z-index值
+			if (typeof config.zIndex === "function") {
+				let originZIndexFn = config.zIndex;
+				config.zIndex = () => {
+					const { zIndex: maxZIndex } = PopsInstanceUtils.getPopsMaxZIndex(
+						PopsHandler.handleZIndex(originZIndexFn) + 100
+					);
+					return maxZIndex;
+				};
+			}else{
+				const { zIndex: maxZIndex } = PopsInstanceUtils.getPopsMaxZIndex(
+					PopsHandler.handleZIndex(config.zIndex) + 100
+				);
+				config.zIndex = maxZIndex;
+			}
 		}
 		return config;
 	},

package/src/types/components.d.ts

@@ -170,7 +170,7 @@ export interface PopsCommonConfig {
 	/**
 	 * z-index显示层级，默认10000
 	 */
-	zIndex?: number;
+	zIndex?: number | (() => number);
 	/**
 	 * 遮罩层
 	 */

package/src/utils/PopsUtils.ts

@@ -130,8 +130,10 @@ class PopsUtils {
 		} else {
 			for (const targetKeyName in target) {
 				if (targetKeyName in source) {
-					let targetValue = (target as any)[targetKeyName];
-					let sourceValue = (source as any)[targetKeyName];
+					// @ts-ignore
+					let targetValue = target[targetKeyName];
+					// @ts-ignore
+					let sourceValue = source[targetKeyName];
 					if (
 						typeof sourceValue === "object" &&
 						sourceValue != null &&
@@ -139,7 +141,8 @@ class PopsUtils {
 						Object.keys(sourceValue).length
 					) {
 						/* 源端的值是object类型，且不是元素节点 */
-						(target as any)[targetKeyName] = UtilsContext.assign(
+						// @ts-ignore
+						target[targetKeyName] = UtilsContext.assign(
 							targetValue,
 							sourceValue,
 							isAdd
@@ -147,7 +150,8 @@ class PopsUtils {
 						continue;
 					}
 					/* 直接赋值 */
-					(target as any)[targetKeyName] = sourceValue;
+					// @ts-ignore
+					target[targetKeyName] = sourceValue;
 				}
 			}
 		}