@whitesev/pops 1.9.0 → 1.9.1

package/dist/index.esm.js

@@ -1743,10 +1743,9 @@ const PopsInstanceUtils = {
     getPopsMaxZIndex(deviation = 1) {
         deviation = Number.isNaN(deviation) ? 1 : deviation;
         // 最大值 2147483647
-        // 最大值 2147483647
-        // const maxZIndex = Math.pow(2, 31) - 1;
+        // const browserMaxZIndex = Math.pow(2, 31) - 1;
         // 比较值 2000000000
-        const maxZIndexCompare = 2 * Math.pow(10, 9);
+        const maxZIndex = 2 * Math.pow(10, 9);
         // 当前页面最大的z-index
         let zIndex = 0;
         // 当前的最大z-index的元素，调试使用
@@ -1776,17 +1775,18 @@ const PopsInstanceUtils = {
             }
         });
         zIndex += deviation;
-        if (zIndex >= maxZIndexCompare) {
-            // 最好不要超过最大值
-            zIndex = maxZIndexCompare;
+        let isOverMaxZIndex = zIndex >= maxZIndex;
+        if (isOverMaxZIndex) {
+            // 超出z-index最大值
+            zIndex = maxZIndex;
         }
-        return { zIndex: zIndex, animElement: maxZIndexNode };
+        return { zIndex: zIndex, animElement: maxZIndexNode, isOverMaxZIndex };
     },
     /**
      * 获取页面中最大的z-index
      * @param deviation 获取最大的z-index值的偏移，默认是+1
      * @example
-     * Utils.getMaxZIndex();
+     * getMaxZIndex();
      * > 1001
      **/
     getMaxZIndex(deviation = 1) {
@@ -3144,17 +3144,11 @@ const PopsHandler = {
         else {
             // 对配置进行处理
             // 选择配置的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;
-            }
+            let originZIndex = config.zIndex;
+            config.zIndex = () => {
+                const { zIndex: maxZIndex } = PopsInstanceUtils.getPopsMaxZIndex(PopsHandler.handleZIndex(originZIndex) + 100);
+                return maxZIndex;
+            };
         }
         return config;
     },
@@ -3191,14 +3185,14 @@ const PopsAlertConfig = () => {
                 iconIsLoading: false,
                 text: "确定",
                 type: "primary",
-                callback: function (event) {
-                    event.close();
+                callback: function (details) {
+                    details.close();
                 },
             },
             close: {
                 enable: true,
-                callback: function (event) {
-                    event.close();
+                callback: function (details) {
+                    details.close();
                 },
             },
         },
@@ -3215,7 +3209,7 @@ const PopsAlertConfig = () => {
                 toClose: false,
                 toHide: false,
             },
-            clickCallBack: void 0,
+            clickCallBack: null,
         },
         drag: false,
         dragLimit: true,
@@ -3357,8 +3351,8 @@ const PopsConfirmConfig = () => {
                 iconIsLoading: false,
                 text: "确定",
                 type: "primary",
-                callback(event) {
-                    event.close();
+                callback(detail) {
+                    detail.close();
                 },
             },
             cancel: {
@@ -3369,8 +3363,8 @@ const PopsConfirmConfig = () => {
                 iconIsLoading: false,
                 text: "关闭",
                 type: "default",
-                callback(event) {
-                    event.close();
+                callback(detail) {
+                    detail.close();
                 },
             },
             other: {
@@ -3381,14 +3375,14 @@ const PopsConfirmConfig = () => {
                 iconIsLoading: false,
                 text: "其它按钮",
                 type: "default",
-                callback(event) {
-                    event.close();
+                callback(detail) {
+                    detail.close();
                 },
             },
             close: {
                 enable: true,
-                callback(event) {
-                    event.close();
+                callback(detail) {
+                    detail.close();
                 },
             },
         },
@@ -3405,7 +3399,7 @@ const PopsConfirmConfig = () => {
                 toClose: false,
                 toHide: false,
             },
-            clickCallBack: void 0,
+            clickCallBack: null,
         },
         drag: false,
         dragLimit: true,
@@ -3553,9 +3547,8 @@ const PopsPromptConfig = () => {
                 iconIsLoading: false,
                 text: "确定",
                 type: "success",
-                callback(event) {
-                    console.log(event);
-                    event.close();
+                callback(detail) {
+                    detail.close();
                 },
             },
             cancel: {
@@ -3566,9 +3559,8 @@ const PopsPromptConfig = () => {
                 iconIsLoading: false,
                 text: "关闭",
                 type: "default",
-                callback(event) {
-                    console.log(event);
-                    event.close();
+                callback(detail) {
+                    detail.close();
                 },
             },
             other: {
@@ -3579,16 +3571,14 @@ const PopsPromptConfig = () => {
                 iconIsLoading: false,
                 text: "其它按钮",
                 type: "default",
-                callback(event) {
-                    console.log(event);
-                    event.close();
+                callback(detail) {
+                    detail.close();
                 },
             },
             close: {
                 enable: true,
-                callback(event) {
-                    console.log(event);
-                    event.close();
+                callback(detail) {
+                    detail.close();
                 },
             },
         },
@@ -3605,7 +3595,7 @@ const PopsPromptConfig = () => {
                 toClose: false,
                 toHide: false,
             },
-            clickCallBack: void 0,
+            clickCallBack: null,
         },
         drag: false,
         dragLimit: true,
@@ -3752,7 +3742,7 @@ const PopsLoadingConfig = () => {
                 toClose: false,
                 toHide: false,
             },
-            clickCallBack: void 0,
+            clickCallBack: null,
         },
         animation: "pops-anim-fadein-zoom",
         forbiddenScroll: false,
@@ -3853,7 +3843,7 @@ const PopsIframeConfig = () => {
                 toClose: false,
                 toHide: false,
             },
-            clickCallBack: void 0,
+            clickCallBack: null,
         },
         animation: "pops-anim-fadein-zoom",
         position: "center",
@@ -4136,12 +4126,17 @@ const PopsDrawerConfig = () => {
             position: "center",
             text: "默认标题",
             html: false,
+            style: "",
         },
         content: {
             text: "默认内容",
             html: false,
+            style: "",
         },
         btn: {
+            merge: false,
+            mergeReverse: false,
+            reverse: false,
             position: "flex-end",
             ok: {
                 enable: true,
@@ -4151,8 +4146,8 @@ const PopsDrawerConfig = () => {
                 iconIsLoading: false,
                 text: "确定",
                 type: "primary",
-                callback(event) {
-                    event.close();
+                callback(detail) {
+                    detail.close();
                 },
             },
             cancel: {
@@ -4163,8 +4158,8 @@ const PopsDrawerConfig = () => {
                 iconIsLoading: false,
                 text: "关闭",
                 type: "default",
-                callback(event) {
-                    event.close();
+                callback(detail) {
+                    detail.close();
                 },
             },
             other: {
@@ -4175,14 +4170,14 @@ const PopsDrawerConfig = () => {
                 iconIsLoading: false,
                 text: "其它按钮",
                 type: "default",
-                callback(event) {
-                    event.close();
+                callback(detail) {
+                    detail.close();
                 },
             },
             close: {
                 enable: true,
-                callback(event) {
-                    event.close();
+                callback(detail) {
+                    detail.close();
                 },
             },
         },
@@ -4192,7 +4187,7 @@ const PopsDrawerConfig = () => {
                 toClose: true,
                 toHide: false,
             },
-            clickCallBack: void 0,
+            clickCallBack: null,
         },
         class: "",
         zIndex: 10000,
@@ -4460,8 +4455,8 @@ const PopsFolderConfig = () => {
                 iconIsLoading: false,
                 text: "确定",
                 type: "primary",
-                callback(event) {
-                    event.close();
+                callback(detail) {
+                    detail.close();
                 },
             },
             cancel: {
@@ -4472,8 +4467,8 @@ const PopsFolderConfig = () => {
                 iconIsLoading: false,
                 text: "关闭",
                 type: "default",
-                callback(event) {
-                    event.close();
+                callback(detail) {
+                    detail.close();
                 },
             },
             other: {
@@ -4484,14 +4479,14 @@ const PopsFolderConfig = () => {
                 iconIsLoading: false,
                 text: "其它按钮",
                 type: "default",
-                callback(event) {
-                    event.close();
+                callback(detail) {
+                    detail.close();
                 },
             },
             close: {
                 enable: true,
-                callback(event) {
-                    event.close();
+                callback(detail) {
+                    detail.close();
                 },
             },
         },
@@ -4508,7 +4503,7 @@ const PopsFolderConfig = () => {
                 toClose: false,
                 toHide: false,
             },
-            clickCallBack: void 0,
+            clickCallBack: null,
         },
         drag: false,
         dragLimit: true,
@@ -4618,6 +4613,7 @@ class PopsFolder {
             Folder_ICON[keyName] = Folder_ICON.apk;
         });
         if (details?.folder) {
+            // @ts-ignore
             config.folder = details.folder;
         }
         let guid = popsUtils.getRandomGUID();
@@ -5359,6 +5355,9 @@ const PopsPanelConfig = () => {
                                 className: "panel-switch",
                                 text: "switch",
                                 type: "switch",
+                                // @ts-ignore
+                                props: {},
+                                disabled: false,
                                 attributes: [],
                                 getValue() {
                                     return true;
@@ -5371,6 +5370,8 @@ const PopsPanelConfig = () => {
                                 className: "panel-slider",
                                 text: "slider",
                                 type: "slider",
+                                // @ts-ignore
+                                props: {},
                                 attributes: [],
                                 getValue() {
                                     return 50;
@@ -5385,6 +5386,8 @@ const PopsPanelConfig = () => {
                                 className: "panel-button",
                                 text: "button",
                                 type: "button",
+                                // @ts-ignore
+                                props: {},
                                 attributes: [],
                                 buttonIcon: "eleme",
                                 buttonIconIsLoading: true,
@@ -5397,6 +5400,8 @@ const PopsPanelConfig = () => {
                             {
                                 className: "panel-button",
                                 text: "button",
+                                // @ts-ignore
+                                props: {},
                                 type: "button",
                                 attributes: [],
                                 buttonIcon: "chromeFilled",
@@ -5412,6 +5417,8 @@ const PopsPanelConfig = () => {
                                 text: "button",
                                 type: "button",
                                 attributes: [],
+                                // @ts-ignore
+                                props: {},
                                 buttonIcon: "upload",
                                 buttonIconIsLoading: false,
                                 buttonType: "info",
@@ -5440,6 +5447,8 @@ const PopsPanelConfig = () => {
                         className: "panel-input",
                         text: "input",
                         type: "input",
+                        // @ts-ignore
+                        props: {},
                         attributes: [],
                         getValue() {
                             return "50";
@@ -5453,6 +5462,8 @@ const PopsPanelConfig = () => {
                         className: "panel-input-password",
                         text: "input-password",
                         type: "input",
+                        // @ts-ignore
+                        props: {},
                         attributes: [],
                         getValue() {
                             return "123456";
@@ -5467,6 +5478,8 @@ const PopsPanelConfig = () => {
                         className: "panel-textarea",
                         text: "textarea",
                         type: "textarea",
+                        // @ts-ignore
+                        props: {},
                         attributes: [],
                         getValue() {
                             return "50";
@@ -5480,6 +5493,8 @@ const PopsPanelConfig = () => {
                         className: "panel-select",
                         text: "select",
                         type: "select",
+                        // @ts-ignore
+                        props: {},
                         attributes: [],
                         getValue() {
                             return 50;
@@ -5491,14 +5506,23 @@ const PopsPanelConfig = () => {
                             {
                                 value: "all",
                                 text: "所有",
+                                disable() {
+                                    return false;
+                                },
                             },
                             {
                                 value: "text",
                                 text: "文本",
+                                disable() {
+                                    return false;
+                                },
                             },
                             {
                                 value: "html",
                                 text: "超文本",
+                                disable() {
+                                    return false;
+                                },
                             },
                         ],
                     },
@@ -5506,6 +5530,8 @@ const PopsPanelConfig = () => {
                         className: "panel-select-multiple",
                         type: "select-multiple",
                         text: "select-multiple",
+                        // @ts-ignore
+                        props: {},
                         attributes: [],
                         placeholder: "请至少选择一个选项",
                         getValue() {
@@ -5524,22 +5550,42 @@ const PopsPanelConfig = () => {
                             {
                                 value: "select-1",
                                 text: "单选1",
+                                isHTML: false,
+                                disable() {
+                                    return false;
+                                },
                             },
                             {
                                 value: "select-2",
                                 text: "单选2",
+                                isHTML: false,
+                                disable() {
+                                    return false;
+                                },
                             },
                             {
                                 value: "select-3",
                                 text: "单选3",
+                                isHTML: false,
+                                disable() {
+                                    return false;
+                                },
                             },
                             {
                                 value: "select-4",
                                 text: "单选4",
+                                isHTML: false,
+                                disable() {
+                                    return false;
+                                },
                             },
                             {
                                 value: "select-5",
                                 text: "单选5",
+                                isHTML: false,
+                                disable() {
+                                    return false;
+                                },
                             },
                         ],
                     },
@@ -5571,6 +5617,8 @@ const PopsPanelConfig = () => {
                                                 className: "panel-switch",
                                                 text: "switch",
                                                 type: "switch",
+                                                // @ts-ignore
+                                                props: {},
                                                 attributes: [],
                                                 getValue() {
                                                     return true;
@@ -5582,6 +5630,8 @@ const PopsPanelConfig = () => {
                                             {
                                                 className: "panel-slider",
                                                 text: "slider",
+                                                // @ts-ignore
+                                                props: {},
                                                 type: "slider",
                                                 attributes: [],
                                                 getValue() {
@@ -5596,6 +5646,8 @@ const PopsPanelConfig = () => {
                                             {
                                                 className: "panel-button",
                                                 text: "button",
+                                                // @ts-ignore
+                                                props: {},
                                                 type: "button",
                                                 attributes: [],
                                                 buttonIcon: "eleme",
@@ -5610,6 +5662,8 @@ const PopsPanelConfig = () => {
                                                 className: "panel-button",
                                                 text: "button",
                                                 type: "button",
+                                                // @ts-ignore
+                                                props: {},
                                                 attributes: [],
                                                 buttonIcon: "chromeFilled",
                                                 buttonIconIsLoading: true,
@@ -5622,6 +5676,8 @@ const PopsPanelConfig = () => {
                                             {
                                                 className: "panel-button",
                                                 text: "button",
+                                                // @ts-ignore
+                                                props: {},
                                                 type: "button",
                                                 attributes: [],
                                                 buttonIcon: "upload",
@@ -5649,6 +5705,8 @@ const PopsPanelConfig = () => {
                             {
                                 className: "panel-switch",
                                 text: "switch",
+                                // @ts-ignore
+                                props: {},
                                 type: "switch",
                                 attributes: [],
                                 getValue() {
@@ -5677,7 +5735,7 @@ const PopsPanelConfig = () => {
                 toClose: false,
                 toHide: false,
             },
-            clickCallBack: void 0,
+            clickCallBack: null,
         },
         class: "",
         mobileClassName: "pops-panel-is-mobile",
@@ -8316,6 +8374,7 @@ const rightClickMenuConfig = () => {
                 icon: pops.config.iconSVG.search,
                 iconIsLoading: false,
                 text: "搜索",
+                item: [],
                 callback(clickEvent, contextMenuEvent, liElement) {
                     console.log("点击：" + this.text, [
                         clickEvent,
@@ -8328,6 +8387,7 @@ const rightClickMenuConfig = () => {
                 icon: pops.config.iconSVG.documentCopy,
                 iconIsLoading: false,
                 text: "复制",
+                item: [],
                 callback(clickEvent, contextMenuEvent, liElement) {
                     console.log("点击：" + this.text, [
                         clickEvent,
@@ -8340,6 +8400,7 @@ const rightClickMenuConfig = () => {
                 icon: pops.config.iconSVG.delete,
                 text: "删除",
                 iconIsLoading: false,
+                item: [],
                 callback(clickEvent, contextMenuEvent, liElement) {
                     console.log("点击：" + this.text, [
                         clickEvent,
@@ -8352,6 +8413,7 @@ const rightClickMenuConfig = () => {
                 icon: pops.config.iconSVG.loading,
                 iconIsLoading: true,
                 text: "加载",
+                item: [],
                 callback(clickEvent, contextMenuEvent, liElement) {
                     console.log("点击：" + this.text, [
                         clickEvent,
@@ -8378,6 +8440,7 @@ const rightClickMenuConfig = () => {
                         icon: "",
                         iconIsLoading: false,
                         text: "处理文件",
+                        item: [],
                         callback(clickEvent, contextMenuEvent, liElement) {
                             console.log("点击：" + this.text, [
                                 clickEvent,
@@ -8402,6 +8465,7 @@ const rightClickMenuConfig = () => {
                                 icon: pops.config.iconSVG.view,
                                 iconIsLoading: false,
                                 text: "查看",
+                                item: [],
                                 callback(clickEvent, contextMenuEvent, liElement) {
                                     console.log("点击：" + this.text, [
                                         clickEvent,
@@ -8441,6 +8505,7 @@ class PopsRightClickMenu {
             throw "config.target 不能为空";
         }
         if (details.data) {
+            // @ts-ignore
             config.data = details.data;
         }
         let guid = popsUtils.getRandomGUID();
@@ -9449,8 +9514,8 @@ class PopsSearchSuggestion {
 }
 
 const PopsTooltipConfig = () => {
+    // @ts-ignore
     return {
-        // @ts-ignore
         target: null,
         content: "默认文字",
         position: "top",
@@ -9470,6 +9535,8 @@ const PopsTooltipConfig = () => {
         showAfterCallBack() { },
         closeBeforeCallBack() { },
         closeAfterCallBack() { },
+        delayCloseTime: 100,
+        showArrow: true,
         arrowDistance: 12.5,
         otherDistance: 0,
         style: "",
@@ -9544,6 +9611,10 @@ class ToolTip {
             });
             $toolTipContainer.appendChild(cssNode);
         }
+        // 处理是否显示箭头元素
+        if (!this.$data.config.showArrow) {
+            $toolTipArrow.remove();
+        }
         return {
             $toolTipContainer: $toolTipContainer,
             $toolTipArrow: $toolTipArrow,
@@ -9583,12 +9654,12 @@ class ToolTip {
         this.$el.$toolTip.style.setProperty("z-index", zIndex.toString());
     }
     /**
-     * 获取 提示框的位置
+     * 计算 提示框的位置
      * @param targetElement 目标元素
      * @param arrowDistance 箭头和目标元素的距离
      * @param otherDistance 其它位置的偏移
      */
-    getPosition(targetElement, arrowDistance, otherDistance) {
+    calcToolTipPosition(targetElement, arrowDistance, otherDistance) {
         let offsetInfo = popsDOMUtils.offset(targetElement, !this.$data.config.isFixed);
         // 目标 宽
         let targetElement_width = offsetInfo.width;
@@ -9637,7 +9708,7 @@ class ToolTip {
      * 动态修改tooltip的位置
      */
     changePosition() {
-        let positionInfo = this.getPosition(this.$data.config.target, this.$data.config.arrowDistance, this.$data.config.otherDistance);
+        let positionInfo = this.calcToolTipPosition(this.$data.config.target, this.$data.config.arrowDistance, this.$data.config.otherDistance);
         let positionKey = this.$data.config.position.toUpperCase();
         let positionDetail = positionInfo[positionKey];
         if (positionDetail) {
@@ -9766,8 +9837,8 @@ class ToolTip {
         // 其它的如Touch事件不做处理
         if (event && event instanceof MouseEvent) {
             let $target = event.composedPath()[0];
-            // 如果是子元素触发的话，忽视
-            if ($target != this.$data.config.target) {
+            // 如果是目标元素的子元素/tooltip元素的子元素触发的话，那就不管
+            if ($target != this.$data.config.target && $target != this.$el.$toolTip) {
                 return;
             }
         }
@@ -9785,6 +9856,10 @@ class ToolTip {
         let timeId = setTimeout(() => {
             // 设置属性触发关闭动画
             this.clearCloseTimeoutId(eventType, timeId);
+            if (this.$el.$toolTip == null) {
+                // 已清除了
+                return;
+            }
             this.$el.$toolTip.setAttribute("data-motion", this.$el.$toolTip
                 .getAttribute("data-motion")
                 .replace("fadeIn", "fadeOut"));
@@ -9850,7 +9925,10 @@ class ToolTip {
      * 鼠标|触摸进入事件
      */
     toolTipMouseEnterEvent() {
-        this.$el.$toolTip.style.animationPlayState = "paused";
+        this.clearCloseTimeoutId("MouseEvent");
+        this.clearCloseTimeoutId("TouchEvent");
+        // 重置动画状态
+        // this.$el.$toolTip.style.animationPlayState = "paused";
         // if (parseInt(getComputedStyle(toolTipElement)) > 0.5) {
         // toolTipElement.style.animationPlayState = "paused";
         // }
@@ -9872,8 +9950,9 @@ class ToolTip {
     /**
      * 鼠标|触摸离开事件
      */
-    toolTipMouseLeaveEvent() {
-        this.$el.$toolTip.style.animationPlayState = "running";
+    toolTipMouseLeaveEvent(event) {
+        this.close(event);
+        // this.$el.$toolTip.style.animationPlayState = "running";
     }
     /**
      * 监听鼠标|触摸离开事件
@@ -9929,7 +10008,7 @@ class Pops {
     /** 配置 */
     config = {
         /** 版本号 */
-        version: "2024.11.3",
+        version: "2024.11.21",
         cssText: {
             /** 主CSS */
             index: indexCSS,