@whitesev/pops 1.9.0 → 1.9.1

package/dist/index.amd.js

@@ -1745,10 +1745,9 @@ define((function () { 'use strict';
         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的元素，调试使用
@@ -1778,17 +1777,18 @@ define((function () { 'use strict';
                 }
             });
             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) {
@@ -3146,17 +3146,11 @@ define((function () { 'use strict';
             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;
         },
@@ -3193,14 +3187,14 @@ define((function () { 'use strict';
                     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();
                     },
                 },
             },
@@ -3217,7 +3211,7 @@ define((function () { 'use strict';
                     toClose: false,
                     toHide: false,
                 },
-                clickCallBack: void 0,
+                clickCallBack: null,
             },
             drag: false,
             dragLimit: true,
@@ -3359,8 +3353,8 @@ define((function () { 'use strict';
                     iconIsLoading: false,
                     text: "确定",
                     type: "primary",
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 cancel: {
@@ -3371,8 +3365,8 @@ define((function () { 'use strict';
                     iconIsLoading: false,
                     text: "关闭",
                     type: "default",
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 other: {
@@ -3383,14 +3377,14 @@ define((function () { 'use strict';
                     iconIsLoading: false,
                     text: "其它按钮",
                     type: "default",
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 close: {
                     enable: true,
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
             },
@@ -3407,7 +3401,7 @@ define((function () { 'use strict';
                     toClose: false,
                     toHide: false,
                 },
-                clickCallBack: void 0,
+                clickCallBack: null,
             },
             drag: false,
             dragLimit: true,
@@ -3555,9 +3549,8 @@ define((function () { 'use strict';
                     iconIsLoading: false,
                     text: "确定",
                     type: "success",
-                    callback(event) {
-                        console.log(event);
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 cancel: {
@@ -3568,9 +3561,8 @@ define((function () { 'use strict';
                     iconIsLoading: false,
                     text: "关闭",
                     type: "default",
-                    callback(event) {
-                        console.log(event);
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 other: {
@@ -3581,16 +3573,14 @@ define((function () { 'use strict';
                     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();
                     },
                 },
             },
@@ -3607,7 +3597,7 @@ define((function () { 'use strict';
                     toClose: false,
                     toHide: false,
                 },
-                clickCallBack: void 0,
+                clickCallBack: null,
             },
             drag: false,
             dragLimit: true,
@@ -3754,7 +3744,7 @@ define((function () { 'use strict';
                     toClose: false,
                     toHide: false,
                 },
-                clickCallBack: void 0,
+                clickCallBack: null,
             },
             animation: "pops-anim-fadein-zoom",
             forbiddenScroll: false,
@@ -3855,7 +3845,7 @@ define((function () { 'use strict';
                     toClose: false,
                     toHide: false,
                 },
-                clickCallBack: void 0,
+                clickCallBack: null,
             },
             animation: "pops-anim-fadein-zoom",
             position: "center",
@@ -4138,12 +4128,17 @@ define((function () { 'use strict';
                 position: "center",
                 text: "默认标题",
                 html: false,
+                style: "",
             },
             content: {
                 text: "默认内容",
                 html: false,
+                style: "",
             },
             btn: {
+                merge: false,
+                mergeReverse: false,
+                reverse: false,
                 position: "flex-end",
                 ok: {
                     enable: true,
@@ -4153,8 +4148,8 @@ define((function () { 'use strict';
                     iconIsLoading: false,
                     text: "确定",
                     type: "primary",
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 cancel: {
@@ -4165,8 +4160,8 @@ define((function () { 'use strict';
                     iconIsLoading: false,
                     text: "关闭",
                     type: "default",
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 other: {
@@ -4177,14 +4172,14 @@ define((function () { 'use strict';
                     iconIsLoading: false,
                     text: "其它按钮",
                     type: "default",
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 close: {
                     enable: true,
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
             },
@@ -4194,7 +4189,7 @@ define((function () { 'use strict';
                     toClose: true,
                     toHide: false,
                 },
-                clickCallBack: void 0,
+                clickCallBack: null,
             },
             class: "",
             zIndex: 10000,
@@ -4462,8 +4457,8 @@ define((function () { 'use strict';
                     iconIsLoading: false,
                     text: "确定",
                     type: "primary",
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 cancel: {
@@ -4474,8 +4469,8 @@ define((function () { 'use strict';
                     iconIsLoading: false,
                     text: "关闭",
                     type: "default",
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 other: {
@@ -4486,14 +4481,14 @@ define((function () { 'use strict';
                     iconIsLoading: false,
                     text: "其它按钮",
                     type: "default",
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 close: {
                     enable: true,
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
             },
@@ -4510,7 +4505,7 @@ define((function () { 'use strict';
                     toClose: false,
                     toHide: false,
                 },
-                clickCallBack: void 0,
+                clickCallBack: null,
             },
             drag: false,
             dragLimit: true,
@@ -4620,6 +4615,7 @@ define((function () { 'use strict';
                 Folder_ICON[keyName] = Folder_ICON.apk;
             });
             if (details?.folder) {
+                // @ts-ignore
                 config.folder = details.folder;
             }
             let guid = popsUtils.getRandomGUID();
@@ -5361,6 +5357,9 @@ define((function () { 'use strict';
                                     className: "panel-switch",
                                     text: "switch",
                                     type: "switch",
+                                    // @ts-ignore
+                                    props: {},
+                                    disabled: false,
                                     attributes: [],
                                     getValue() {
                                         return true;
@@ -5373,6 +5372,8 @@ define((function () { 'use strict';
                                     className: "panel-slider",
                                     text: "slider",
                                     type: "slider",
+                                    // @ts-ignore
+                                    props: {},
                                     attributes: [],
                                     getValue() {
                                         return 50;
@@ -5387,6 +5388,8 @@ define((function () { 'use strict';
                                     className: "panel-button",
                                     text: "button",
                                     type: "button",
+                                    // @ts-ignore
+                                    props: {},
                                     attributes: [],
                                     buttonIcon: "eleme",
                                     buttonIconIsLoading: true,
@@ -5399,6 +5402,8 @@ define((function () { 'use strict';
                                 {
                                     className: "panel-button",
                                     text: "button",
+                                    // @ts-ignore
+                                    props: {},
                                     type: "button",
                                     attributes: [],
                                     buttonIcon: "chromeFilled",
@@ -5414,6 +5419,8 @@ define((function () { 'use strict';
                                     text: "button",
                                     type: "button",
                                     attributes: [],
+                                    // @ts-ignore
+                                    props: {},
                                     buttonIcon: "upload",
                                     buttonIconIsLoading: false,
                                     buttonType: "info",
@@ -5442,6 +5449,8 @@ define((function () { 'use strict';
                             className: "panel-input",
                             text: "input",
                             type: "input",
+                            // @ts-ignore
+                            props: {},
                             attributes: [],
                             getValue() {
                                 return "50";
@@ -5455,6 +5464,8 @@ define((function () { 'use strict';
                             className: "panel-input-password",
                             text: "input-password",
                             type: "input",
+                            // @ts-ignore
+                            props: {},
                             attributes: [],
                             getValue() {
                                 return "123456";
@@ -5469,6 +5480,8 @@ define((function () { 'use strict';
                             className: "panel-textarea",
                             text: "textarea",
                             type: "textarea",
+                            // @ts-ignore
+                            props: {},
                             attributes: [],
                             getValue() {
                                 return "50";
@@ -5482,6 +5495,8 @@ define((function () { 'use strict';
                             className: "panel-select",
                             text: "select",
                             type: "select",
+                            // @ts-ignore
+                            props: {},
                             attributes: [],
                             getValue() {
                                 return 50;
@@ -5493,14 +5508,23 @@ define((function () { 'use strict';
                                 {
                                     value: "all",
                                     text: "所有",
+                                    disable() {
+                                        return false;
+                                    },
                                 },
                                 {
                                     value: "text",
                                     text: "文本",
+                                    disable() {
+                                        return false;
+                                    },
                                 },
                                 {
                                     value: "html",
                                     text: "超文本",
+                                    disable() {
+                                        return false;
+                                    },
                                 },
                             ],
                         },
@@ -5508,6 +5532,8 @@ define((function () { 'use strict';
                             className: "panel-select-multiple",
                             type: "select-multiple",
                             text: "select-multiple",
+                            // @ts-ignore
+                            props: {},
                             attributes: [],
                             placeholder: "请至少选择一个选项",
                             getValue() {
@@ -5526,22 +5552,42 @@ define((function () { 'use strict';
                                 {
                                     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;
+                                    },
                                 },
                             ],
                         },
@@ -5573,6 +5619,8 @@ define((function () { 'use strict';
                                                     className: "panel-switch",
                                                     text: "switch",
                                                     type: "switch",
+                                                    // @ts-ignore
+                                                    props: {},
                                                     attributes: [],
                                                     getValue() {
                                                         return true;
@@ -5584,6 +5632,8 @@ define((function () { 'use strict';
                                                 {
                                                     className: "panel-slider",
                                                     text: "slider",
+                                                    // @ts-ignore
+                                                    props: {},
                                                     type: "slider",
                                                     attributes: [],
                                                     getValue() {
@@ -5598,6 +5648,8 @@ define((function () { 'use strict';
                                                 {
                                                     className: "panel-button",
                                                     text: "button",
+                                                    // @ts-ignore
+                                                    props: {},
                                                     type: "button",
                                                     attributes: [],
                                                     buttonIcon: "eleme",
@@ -5612,6 +5664,8 @@ define((function () { 'use strict';
                                                     className: "panel-button",
                                                     text: "button",
                                                     type: "button",
+                                                    // @ts-ignore
+                                                    props: {},
                                                     attributes: [],
                                                     buttonIcon: "chromeFilled",
                                                     buttonIconIsLoading: true,
@@ -5624,6 +5678,8 @@ define((function () { 'use strict';
                                                 {
                                                     className: "panel-button",
                                                     text: "button",
+                                                    // @ts-ignore
+                                                    props: {},
                                                     type: "button",
                                                     attributes: [],
                                                     buttonIcon: "upload",
@@ -5651,6 +5707,8 @@ define((function () { 'use strict';
                                 {
                                     className: "panel-switch",
                                     text: "switch",
+                                    // @ts-ignore
+                                    props: {},
                                     type: "switch",
                                     attributes: [],
                                     getValue() {
@@ -5679,7 +5737,7 @@ define((function () { 'use strict';
                     toClose: false,
                     toHide: false,
                 },
-                clickCallBack: void 0,
+                clickCallBack: null,
             },
             class: "",
             mobileClassName: "pops-panel-is-mobile",
@@ -8318,6 +8376,7 @@ define((function () { 'use strict';
                     icon: pops.config.iconSVG.search,
                     iconIsLoading: false,
                     text: "搜索",
+                    item: [],
                     callback(clickEvent, contextMenuEvent, liElement) {
                         console.log("点击：" + this.text, [
                             clickEvent,
@@ -8330,6 +8389,7 @@ define((function () { 'use strict';
                     icon: pops.config.iconSVG.documentCopy,
                     iconIsLoading: false,
                     text: "复制",
+                    item: [],
                     callback(clickEvent, contextMenuEvent, liElement) {
                         console.log("点击：" + this.text, [
                             clickEvent,
@@ -8342,6 +8402,7 @@ define((function () { 'use strict';
                     icon: pops.config.iconSVG.delete,
                     text: "删除",
                     iconIsLoading: false,
+                    item: [],
                     callback(clickEvent, contextMenuEvent, liElement) {
                         console.log("点击：" + this.text, [
                             clickEvent,
@@ -8354,6 +8415,7 @@ define((function () { 'use strict';
                     icon: pops.config.iconSVG.loading,
                     iconIsLoading: true,
                     text: "加载",
+                    item: [],
                     callback(clickEvent, contextMenuEvent, liElement) {
                         console.log("点击：" + this.text, [
                             clickEvent,
@@ -8380,6 +8442,7 @@ define((function () { 'use strict';
                             icon: "",
                             iconIsLoading: false,
                             text: "处理文件",
+                            item: [],
                             callback(clickEvent, contextMenuEvent, liElement) {
                                 console.log("点击：" + this.text, [
                                     clickEvent,
@@ -8404,6 +8467,7 @@ define((function () { 'use strict';
                                     icon: pops.config.iconSVG.view,
                                     iconIsLoading: false,
                                     text: "查看",
+                                    item: [],
                                     callback(clickEvent, contextMenuEvent, liElement) {
                                         console.log("点击：" + this.text, [
                                             clickEvent,
@@ -8443,6 +8507,7 @@ define((function () { 'use strict';
                 throw "config.target 不能为空";
             }
             if (details.data) {
+                // @ts-ignore
                 config.data = details.data;
             }
             let guid = popsUtils.getRandomGUID();
@@ -9451,8 +9516,8 @@ define((function () { 'use strict';
     }
 
     const PopsTooltipConfig = () => {
+        // @ts-ignore
         return {
-            // @ts-ignore
             target: null,
             content: "默认文字",
             position: "top",
@@ -9472,6 +9537,8 @@ define((function () { 'use strict';
             showAfterCallBack() { },
             closeBeforeCallBack() { },
             closeAfterCallBack() { },
+            delayCloseTime: 100,
+            showArrow: true,
             arrowDistance: 12.5,
             otherDistance: 0,
             style: "",
@@ -9546,6 +9613,10 @@ define((function () { 'use strict';
                 });
                 $toolTipContainer.appendChild(cssNode);
             }
+            // 处理是否显示箭头元素
+            if (!this.$data.config.showArrow) {
+                $toolTipArrow.remove();
+            }
             return {
                 $toolTipContainer: $toolTipContainer,
                 $toolTipArrow: $toolTipArrow,
@@ -9585,12 +9656,12 @@ define((function () { 'use strict';
             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;
@@ -9639,7 +9710,7 @@ define((function () { 'use strict';
          * 动态修改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) {
@@ -9768,8 +9839,8 @@ define((function () { 'use strict';
             // 其它的如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;
                 }
             }
@@ -9787,6 +9858,10 @@ define((function () { 'use strict';
             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"));
@@ -9852,7 +9927,10 @@ define((function () { 'use strict';
          * 鼠标|触摸进入事件
          */
         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";
             // }
@@ -9874,8 +9952,9 @@ define((function () { 'use strict';
         /**
          * 鼠标|触摸离开事件
          */
-        toolTipMouseLeaveEvent() {
-            this.$el.$toolTip.style.animationPlayState = "running";
+        toolTipMouseLeaveEvent(event) {
+            this.close(event);
+            // this.$el.$toolTip.style.animationPlayState = "running";
         }
         /**
          * 监听鼠标|触摸离开事件
@@ -9931,7 +10010,7 @@ define((function () { 'use strict';
         /** 配置 */
         config = {
             /** 版本号 */
-            version: "2024.11.3",
+            version: "2024.11.21",
             cssText: {
                 /** 主CSS */
                 index: indexCSS,