@whitesev/pops 1.5.3 → 1.5.4

package/dist/index.system.js

@@ -1527,17 +1527,21 @@ System.register('pops', [], (function (exports) {
                     else {
                         for (const targetKeyName in target) {
                             if (targetKeyName in source) {
+                                // @ts-ignore
                                 let targetValue = target[targetKeyName];
+                                // @ts-ignore
                                 let sourceValue = source[targetKeyName];
                                 if (typeof sourceValue === "object" &&
                                     sourceValue != null &&
                                     !UtilsContext.isDOM(sourceValue) &&
                                     Object.keys(sourceValue).length) {
                                     /* 源端的值是object类型，且不是元素节点 */
+                                    // @ts-ignore
                                     target[targetKeyName] = UtilsContext.assign(targetValue, sourceValue, isAdd);
                                     continue;
                                 }
                                 /* 直接赋值 */
+                                // @ts-ignore
                                 target[targetKeyName] = sourceValue;
                             }
                         }
@@ -3555,6 +3559,9 @@ System.register('pops', [], (function (exports) {
                  */
                 getMaskHTML(guid, zIndex = 101, style = "") {
                     zIndex = zIndex - 100;
+                    if (style.startsWith(";")) {
+                        style = style.replace(";", "");
+                    }
                     return `<div class="pops-mask" data-guid="${guid}" style="z-index:${zIndex};${style}"></div>`;
                 },
                 /**
@@ -3564,15 +3571,16 @@ System.register('pops', [], (function (exports) {
                  * @param config
                  * @param html
                  * @param bottomBtnHTML
+                 * @param zIndex
                  */
-                getAnimHTML(guid, type, config, html = "", bottomBtnHTML = "") {
+                getAnimHTML(guid, type, config, html = "", bottomBtnHTML = "", zIndex) {
                     let __config = config;
                     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};`;
@@ -3581,24 +3589,25 @@ System.register('pops', [], (function (exports) {
                         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
@@ -4208,6 +4217,18 @@ System.register('pops', [], (function (exports) {
                         capture: true,
                     });
                 },
+                /**
+                 * 把配置的z-index配置转为数字
+                 * @param zIndex
+                 */
+                handleZIndex(zIndex) {
+                    if (typeof zIndex === "function") {
+                        return zIndex();
+                    }
+                    else {
+                        return zIndex;
+                    }
+                },
                 /**
                  * 处理config.only
                  * @param type 当前弹窗类型
@@ -4233,8 +4254,19 @@ System.register('pops', [], (function (exports) {
                         }
                     }
                     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;
                 },
@@ -4322,12 +4354,15 @@ System.register('pops', [], (function (exports) {
                     // 设置当前类型
                     const PopsType = "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(PopsType, config);
                     let { contentStyle, contentPStyle } = PopsElementHandler.getContentStyle(PopsType, config);
-                    let animHTML = PopsElementHandler.getAnimHTML(guid, PopsType, config, `
+                    let animHTML = PopsElementHandler.getAnimHTML(guid, PopsType, config, 
+                    /*html*/ `
 			<div 
 				class="pops-alert-title"
 				style="text-align: ${config.title.position};
@@ -4342,7 +4377,7 @@ System.register('pops', [], (function (exports) {
             ? config.content.text
             : `<p pops style="${contentPStyle}">${config.content.text}</p>`}
 			</div>
-			${bottomBtnHTML}`, bottomBtnHTML);
+			${bottomBtnHTML}`, bottomBtnHTML, zIndex);
                     /**
                      * 弹窗的主元素，包括动画层
                      */
@@ -4504,12 +4539,15 @@ System.register('pops', [], (function (exports) {
                     // 设置当前类型
                     const PopsType = "confirm";
                     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(PopsType, config);
                     let { contentStyle, contentPStyle } = PopsElementHandler.getContentStyle(PopsType, config);
-                    let animHTML = PopsElementHandler.getAnimHTML(guid, PopsType, config, `
+                    let animHTML = PopsElementHandler.getAnimHTML(guid, PopsType, config, 
+                    /*html*/ `
             <div class="pops-confirm-title" style="text-align: ${config.title.position};${headerStyle}">
                             ${config.title.html
             ? config.title.text
@@ -4523,7 +4561,7 @@ System.register('pops', [], (function (exports) {
                 
                         </div>
                         ${bottomBtnHTML}
-            `, bottomBtnHTML);
+            `, bottomBtnHTML, zIndex);
                     /**
                      * 弹窗的主元素，包括动画层
                      */
@@ -4692,12 +4730,15 @@ System.register('pops', [], (function (exports) {
                     let guid = popsUtils.getRandomGUID();
                     const PopsType = "prompt";
                     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(PopsType, config);
                     let { contentPStyle } = PopsElementHandler.getContentStyle(PopsType, config);
-                    let animHTML = PopsElementHandler.getAnimHTML(guid, PopsType, config, `
+                    let animHTML = PopsElementHandler.getAnimHTML(guid, PopsType, config, 
+                    /*html*/ `
             <div class="pops-prompt-title" style="text-align: ${config.title.position};${headerStyle}">
             ${config.title.html
             ? config.title.text
@@ -4715,8 +4756,8 @@ System.register('pops', [], (function (exports) {
                 (config.content.password ? "password" : "text") +
                 '">'}
             </div>
-        ${bottomBtnHTML}
-            `, bottomBtnHTML);
+        	${bottomBtnHTML}
+            `, bottomBtnHTML, zIndex);
                     /**
                      * 弹窗的主元素，包括动画层
                      */
@@ -4813,9 +4854,12 @@ System.register('pops', [], (function (exports) {
                     let guid = popsUtils.getRandomGUID();
                     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);
-                    let animHTML = PopsElementHandler.getAnimHTML(guid, PopsType, config, `
+                    let animHTML = PopsElementHandler.getAnimHTML(guid, PopsType, config, 
+                    /*html*/ `
             <div class="pops-loading-content">
                 ${config.addIndexCSS
             ? `
@@ -4830,7 +4874,7 @@ System.register('pops', [], (function (exports) {
             ${config.style != null ? `<style>${config.style}</style>` : ""}
             <p pops style="${contentPStyle}">${config.content.text}</p>
             </div>
-            `, "");
+            `, "", zIndex);
                     /**
                      * 弹窗的主元素，包括动画层
                      */
@@ -4946,12 +4990,15 @@ System.register('pops', [], (function (exports) {
                     let maskExtraStyle = config.animation != null && config.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 = config.title.text.trim() !== "" ? config.title.text : config.url;
                     let { headerStyle, headerPStyle } = PopsElementHandler.getHeaderStyle(PopsType, config);
-                    let animHTML = PopsElementHandler.getAnimHTML(guid, PopsType, config, `
+                    let animHTML = PopsElementHandler.getAnimHTML(guid, PopsType, config, 
+                    /*html*/ `
             <div 
                 class="pops-iframe-title"
                 style="text-align: ${config.title.position};${headerStyle}"
@@ -4972,7 +5019,7 @@ System.register('pops', [], (function (exports) {
                 </iframe>
                 </div>
                 ${config.loading.enable ? iframeLoadingHTML : ""}
-            `, "");
+            `, "", zIndex);
                     /**
                      * 弹窗的主元素，包括动画层
                      */
@@ -5204,7 +5251,7 @@ System.register('pops', [], (function (exports) {
                             popsDOMUtils.addClassName(_toolTipElement_, config.className);
                         }
                         _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>';
@@ -5521,12 +5568,15 @@ System.register('pops', [], (function (exports) {
                     let guid = popsUtils.getRandomGUID();
                     const PopsType = "drawer";
                     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(PopsType, config);
                     let { contentStyle, contentPStyle } = PopsElementHandler.getContentStyle(PopsType, config);
-                    let animHTML = PopsElementHandler.getAnimHTML(guid, PopsType, config, `
+                    let animHTML = PopsElementHandler.getAnimHTML(guid, PopsType, config, 
+                    /*html*/ `
             ${config.title.enable
             ? `
             <div class="pops-${PopsType}-title" style="${headerStyle}">
@@ -5550,7 +5600,7 @@ System.register('pops', [], (function (exports) {
             </div>
 
             ${bottomBtnHTML}
-            `, bottomBtnHTML);
+            `, bottomBtnHTML, zIndex);
                     /**
                      * 弹窗的主元素，包括动画层
                      */
@@ -5908,7 +5958,9 @@ System.register('pops', [], (function (exports) {
                     let guid = popsUtils.getRandomGUID();
                     const PopsType = "folder";
                     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(PopsType, config);
@@ -6019,7 +6071,7 @@ System.register('pops', [], (function (exports) {
                 </div>
             </div>
             ${bottomBtnHTML}
-            `, bottomBtnHTML);
+            `, bottomBtnHTML, zIndex);
                     /**
                      * 弹窗的主元素，包括动画层
                      */
@@ -7010,10 +7062,13 @@ System.register('pops', [], (function (exports) {
                     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, config);
-                    let animHTML = PopsElementHandler.getAnimHTML(guid, PopsType, config, `
+                    let animHTML = PopsElementHandler.getAnimHTML(guid, PopsType, config, 
+                    /*html*/ `
 			<div 
 				class="pops-${PopsType}-title"
 				style="text-align: ${config.title.position};
@@ -7031,7 +7086,7 @@ System.register('pops', [], (function (exports) {
 					<ul class="pops-panel-container-header-ul"></ul>
 					<ul></ul>
 				</section>
-			</div>`, "");
+			</div>`, "", zIndex);
                     /**
                      * 弹窗的主元素，包括动画层
                      */
@@ -9122,7 +9177,7 @@ System.register('pops', [], (function (exports) {
                          * @param isChildren 是否是rightClickMenu的某一项的子菜单
                          */
                         getMenuContainerElement(zIndex, isChildren) {
-                            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} *{
@@ -9210,6 +9265,12 @@ System.register('pops', [], (function (exports) {
                             }
                             return menuElement;
                         },
+                        /**
+                         * 动态获取配的z-index
+                         */
+                        getMenuZIndex() {
+                            return PopsHandler.handleZIndex(config.zIndex);
+                        },
                         /**
                          * 获取left、top偏移
                          * @param menuElement 菜单元素
@@ -9244,7 +9305,7 @@ System.register('pops', [], (function (exports) {
                          * @param _config_
                          */
                         showMenu(menuEvent, _config_) {
-                            let menuElement = this.getMenuContainerElement(config.zIndex, false);
+                            let menuElement = this.getMenuContainerElement(this.getMenuZIndex(), false);
                             menuElement["__menuData__"] = {
                                 child: [],
                             };
@@ -9282,7 +9343,7 @@ System.register('pops', [], (function (exports) {
                          * @param targetLiElement 父li项元素
                          */
                         showClildMenu(menuEvent, posInfo, _config_, rootElement, targetLiElement) {
-                            let menuElement = this.getMenuContainerElement(config.zIndex, true);
+                            let menuElement = this.getMenuContainerElement(this.getMenuZIndex(), true);
                             menuElement["__menuData__"] = {
                                 parent: targetLiElement,
                                 root: rootElement,
@@ -9548,7 +9609,7 @@ System.register('pops', [], (function (exports) {
 							}
 							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};
@@ -9985,7 +10046,7 @@ System.register('pops', [], (function (exports) {
                 /** 配置 */
                 config = {
                     /** 版本号 */
-                    version: "2024.9.9",
+                    version: "2024.9.10",
                     cssText: {
                         /** 主CSS */
                         index: indexCSS,