@whitesev/pops 1.5.2 → 1.5.4

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;
 				}
 			}
 		}