@whitesev/pops 1.8.9 → 1.9.1

package/dist/index.iife.js

@@ -1667,6 +1667,8 @@ var pops = (function () {
         /**
          * 获取页面中最大的z-index的元素信息
          * @param deviation 获取最大的z-index值的偏移，默认是+1
+         * @param node 进行判断的元素，默认是document
+         * @param ignoreCallBack 执行元素处理时调用的函数，返回false可忽略不想要处理的元素
          * @example
          * Utils.getMaxZIndexNodeInfo();
          * > {
@@ -1674,11 +1676,11 @@ var pops = (function () {
          *   zIndex: 1001
          * }
          **/
-        getMaxZIndexNodeInfo(deviation = 1) {
+        getMaxZIndexNodeInfo(deviation = 1, target = PopsCore.document, ignoreCallBack) {
             deviation = Number.isNaN(deviation) ? 1 : deviation;
-            // 最大值2147483647
-            const maxZIndex = Math.pow(2, 31) - 1;
-            // 比较值2000000000
+            // 最大值 2147483647
+            // const maxZIndex = Math.pow(2, 31) - 1;
+            // 比较值 2000000000
             const maxZIndexCompare = 2 * Math.pow(10, 9);
             // 当前页面最大的z-index
             let zIndex = 0;
@@ -1698,6 +1700,12 @@ var pops = (function () {
              * @param $ele
              */
             function queryMaxZIndex($ele) {
+                if (typeof ignoreCallBack === "function") {
+                    let ignoreResult = ignoreCallBack($ele);
+                    if (typeof ignoreResult === "boolean" && !ignoreResult) {
+                        return;
+                    }
+                }
                 /** 元素的样式 */
                 const nodeStyle = PopsCore.window.getComputedStyle($ele);
                 /* 不对position为static和display为none的元素进行获取它们的z-index */
@@ -1718,48 +1726,47 @@ var pops = (function () {
                     }
                 }
             }
-            PopsCore.document.querySelectorAll("*").forEach(($ele, index) => {
+            target.querySelectorAll("*").forEach(($ele, index) => {
                 queryMaxZIndex($ele);
             });
             zIndex += deviation;
             if (zIndex >= maxZIndexCompare) {
                 // 最好不要超过最大值
-                zIndex = maxZIndex;
+                zIndex = maxZIndexCompare;
             }
             return {
                 node: maxZIndexNode,
                 zIndex: zIndex,
             };
         },
-        /**
-         * 获取页面中最大的z-index
-         * @param deviation 获取最大的z-index值的偏移，默认是+1
-         * @example
-         * Utils.getMaxZIndex();
-         * > 1001
-         **/
-        getMaxZIndex(deviation = 1) {
-            return this.getMaxZIndexNodeInfo(deviation).zIndex;
-        },
         /**
          * 获取pops所有弹窗中的最大的z-index
          * @param deviation
          */
         getPopsMaxZIndex(deviation = 1) {
             deviation = Number.isNaN(deviation) ? 1 : deviation;
-            // 最大值2147483647
-            let maxZIndex = Math.pow(2, 31) - 1;
+            // 最大值 2147483647
+            // const browserMaxZIndex = Math.pow(2, 31) - 1;
+            // 比较值 2000000000
+            const maxZIndex = 2 * Math.pow(10, 9);
             // 当前页面最大的z-index
             let zIndex = 0;
             // 当前的最大z-index的元素，调试使用
             let maxZIndexNode = null;
+            /**
+             * 元素是否可见
+             * @param $css
+             */
+            function isVisibleNode($css) {
+                return $css.position !== "static" && $css.display !== "none";
+            }
             Object.keys(pops.config.layer).forEach((layerName) => {
                 let layerList = pops.config.layer[layerName];
                 for (let index = 0; index < layerList.length; index++) {
                     const layer = layerList[index];
                     let nodeStyle = window.getComputedStyle(layer.animElement);
                     /* 不对position为static和display为none的元素进行获取它们的z-index */
-                    if (nodeStyle.position !== "static" && nodeStyle.display !== "none") {
+                    if (isVisibleNode(nodeStyle)) {
                         let nodeZIndex = parseInt(nodeStyle.zIndex);
                         if (!isNaN(nodeZIndex)) {
                             if (nodeZIndex > zIndex) {
@@ -1771,13 +1778,22 @@ var pops = (function () {
                 }
             });
             zIndex += deviation;
-            // 用于比较的值2000000000，大于该值就取该值
-            let maxZIndexCompare = 2 * Math.pow(10, 9);
-            if (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
+         * getMaxZIndex();
+         * > 1001
+         **/
+        getMaxZIndex(deviation = 1) {
+            return this.getMaxZIndexNodeInfo(deviation).zIndex;
         },
         /**
          * 获取CSS Rule
@@ -2762,6 +2778,8 @@ var pops = (function () {
         },
         /**
          * 处理遮罩层
+         *
+         * + 设置遮罩层的点击事件
          * @param details 传递的配置
          */
         handleMask(details = {}) {
@@ -2795,22 +2813,29 @@ var pops = (function () {
                 }
                 return false;
             }
-            function isAnimElement(element) {
-                return Boolean(element?.localName?.toLowerCase() === "div" &&
-                    element.className &&
-                    element.className === "pops-anim" &&
-                    element.hasAttribute("anim"));
-            }
+            // 判断是否启用了遮罩层点击动作
             if (details.config.mask.clickEvent.toClose ||
                 details.config.mask.clickEvent.toHide) {
+                /**
+                 * 判断点击的元素是否是动画层的元素
+                 * @param element
+                 * @returns
+                 */
+                function isAnimElement(element) {
+                    return Boolean(element?.localName?.toLowerCase() === "div" &&
+                        element.className &&
+                        element.className === "pops-anim" &&
+                        element.hasAttribute("anim"));
+                }
                 /* 判断按下的元素是否是pops-anim */
                 popsDOMUtils.on(details.animElement, ["touchstart", "mousedown"], void 0, (event) => {
-                    isMaskClick = isAnimElement(event.composedPath()[0]);
+                    let $click = event.composedPath()[0];
+                    isMaskClick = isAnimElement($click);
                 });
                 /* 如果有动画层，在动画层上监听点击事件 */
                 popsDOMUtils.on(details.animElement, "click", void 0, (event) => {
-                    if (isAnimElement(event.composedPath()[0]) &&
-                        isMaskClick) {
+                    let $click = event.composedPath()[0];
+                    if (isAnimElement($click) && isMaskClick) {
                         return clickEvent(event);
                     }
                 });
@@ -2825,7 +2850,7 @@ var pops = (function () {
         },
         /**
          * 处理获取元素
-         * @param {HTMLDivElement} animElement
+         * @param animElement
          * @param type
          */
         handleQueryElement(animElement, type) {
@@ -3122,17 +3147,11 @@ var pops = (function () {
             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;
         },
@@ -3169,14 +3188,14 @@ var pops = (function () {
                     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();
                     },
                 },
             },
@@ -3193,7 +3212,7 @@ var pops = (function () {
                     toClose: false,
                     toHide: false,
                 },
-                clickCallBack: void 0,
+                clickCallBack: null,
             },
             drag: false,
             dragLimit: true,
@@ -3335,8 +3354,8 @@ var pops = (function () {
                     iconIsLoading: false,
                     text: "确定",
                     type: "primary",
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 cancel: {
@@ -3347,8 +3366,8 @@ var pops = (function () {
                     iconIsLoading: false,
                     text: "关闭",
                     type: "default",
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 other: {
@@ -3359,14 +3378,14 @@ var pops = (function () {
                     iconIsLoading: false,
                     text: "其它按钮",
                     type: "default",
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 close: {
                     enable: true,
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
             },
@@ -3383,7 +3402,7 @@ var pops = (function () {
                     toClose: false,
                     toHide: false,
                 },
-                clickCallBack: void 0,
+                clickCallBack: null,
             },
             drag: false,
             dragLimit: true,
@@ -3531,9 +3550,8 @@ var pops = (function () {
                     iconIsLoading: false,
                     text: "确定",
                     type: "success",
-                    callback(event) {
-                        console.log(event);
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 cancel: {
@@ -3544,9 +3562,8 @@ var pops = (function () {
                     iconIsLoading: false,
                     text: "关闭",
                     type: "default",
-                    callback(event) {
-                        console.log(event);
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 other: {
@@ -3557,16 +3574,14 @@ var pops = (function () {
                     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();
                     },
                 },
             },
@@ -3583,7 +3598,7 @@ var pops = (function () {
                     toClose: false,
                     toHide: false,
                 },
-                clickCallBack: void 0,
+                clickCallBack: null,
             },
             drag: false,
             dragLimit: true,
@@ -3730,7 +3745,7 @@ var pops = (function () {
                     toClose: false,
                     toHide: false,
                 },
-                clickCallBack: void 0,
+                clickCallBack: null,
             },
             animation: "pops-anim-fadein-zoom",
             forbiddenScroll: false,
@@ -3831,7 +3846,7 @@ var pops = (function () {
                     toClose: false,
                     toHide: false,
                 },
-                clickCallBack: void 0,
+                clickCallBack: null,
             },
             animation: "pops-anim-fadein-zoom",
             position: "center",
@@ -4114,12 +4129,17 @@ var pops = (function () {
                 position: "center",
                 text: "默认标题",
                 html: false,
+                style: "",
             },
             content: {
                 text: "默认内容",
                 html: false,
+                style: "",
             },
             btn: {
+                merge: false,
+                mergeReverse: false,
+                reverse: false,
                 position: "flex-end",
                 ok: {
                     enable: true,
@@ -4129,8 +4149,8 @@ var pops = (function () {
                     iconIsLoading: false,
                     text: "确定",
                     type: "primary",
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 cancel: {
@@ -4141,8 +4161,8 @@ var pops = (function () {
                     iconIsLoading: false,
                     text: "关闭",
                     type: "default",
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 other: {
@@ -4153,14 +4173,14 @@ var pops = (function () {
                     iconIsLoading: false,
                     text: "其它按钮",
                     type: "default",
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 close: {
                     enable: true,
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
             },
@@ -4170,7 +4190,7 @@ var pops = (function () {
                     toClose: true,
                     toHide: false,
                 },
-                clickCallBack: void 0,
+                clickCallBack: null,
             },
             class: "",
             zIndex: 10000,
@@ -4438,8 +4458,8 @@ var pops = (function () {
                     iconIsLoading: false,
                     text: "确定",
                     type: "primary",
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 cancel: {
@@ -4450,8 +4470,8 @@ var pops = (function () {
                     iconIsLoading: false,
                     text: "关闭",
                     type: "default",
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 other: {
@@ -4462,14 +4482,14 @@ var pops = (function () {
                     iconIsLoading: false,
                     text: "其它按钮",
                     type: "default",
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
                 close: {
                     enable: true,
-                    callback(event) {
-                        event.close();
+                    callback(detail) {
+                        detail.close();
                     },
                 },
             },
@@ -4486,7 +4506,7 @@ var pops = (function () {
                     toClose: false,
                     toHide: false,
                 },
-                clickCallBack: void 0,
+                clickCallBack: null,
             },
             drag: false,
             dragLimit: true,
@@ -4596,6 +4616,7 @@ var pops = (function () {
                 Folder_ICON[keyName] = Folder_ICON.apk;
             });
             if (details?.folder) {
+                // @ts-ignore
                 config.folder = details.folder;
             }
             let guid = popsUtils.getRandomGUID();
@@ -5337,6 +5358,9 @@ var pops = (function () {
                                     className: "panel-switch",
                                     text: "switch",
                                     type: "switch",
+                                    // @ts-ignore
+                                    props: {},
+                                    disabled: false,
                                     attributes: [],
                                     getValue() {
                                         return true;
@@ -5349,6 +5373,8 @@ var pops = (function () {
                                     className: "panel-slider",
                                     text: "slider",
                                     type: "slider",
+                                    // @ts-ignore
+                                    props: {},
                                     attributes: [],
                                     getValue() {
                                         return 50;
@@ -5363,6 +5389,8 @@ var pops = (function () {
                                     className: "panel-button",
                                     text: "button",
                                     type: "button",
+                                    // @ts-ignore
+                                    props: {},
                                     attributes: [],
                                     buttonIcon: "eleme",
                                     buttonIconIsLoading: true,
@@ -5375,6 +5403,8 @@ var pops = (function () {
                                 {
                                     className: "panel-button",
                                     text: "button",
+                                    // @ts-ignore
+                                    props: {},
                                     type: "button",
                                     attributes: [],
                                     buttonIcon: "chromeFilled",
@@ -5390,6 +5420,8 @@ var pops = (function () {
                                     text: "button",
                                     type: "button",
                                     attributes: [],
+                                    // @ts-ignore
+                                    props: {},
                                     buttonIcon: "upload",
                                     buttonIconIsLoading: false,
                                     buttonType: "info",
@@ -5418,6 +5450,8 @@ var pops = (function () {
                             className: "panel-input",
                             text: "input",
                             type: "input",
+                            // @ts-ignore
+                            props: {},
                             attributes: [],
                             getValue() {
                                 return "50";
@@ -5431,6 +5465,8 @@ var pops = (function () {
                             className: "panel-input-password",
                             text: "input-password",
                             type: "input",
+                            // @ts-ignore
+                            props: {},
                             attributes: [],
                             getValue() {
                                 return "123456";
@@ -5445,6 +5481,8 @@ var pops = (function () {
                             className: "panel-textarea",
                             text: "textarea",
                             type: "textarea",
+                            // @ts-ignore
+                            props: {},
                             attributes: [],
                             getValue() {
                                 return "50";
@@ -5458,6 +5496,8 @@ var pops = (function () {
                             className: "panel-select",
                             text: "select",
                             type: "select",
+                            // @ts-ignore
+                            props: {},
                             attributes: [],
                             getValue() {
                                 return 50;
@@ -5469,14 +5509,23 @@ var pops = (function () {
                                 {
                                     value: "all",
                                     text: "所有",
+                                    disable() {
+                                        return false;
+                                    },
                                 },
                                 {
                                     value: "text",
                                     text: "文本",
+                                    disable() {
+                                        return false;
+                                    },
                                 },
                                 {
                                     value: "html",
                                     text: "超文本",
+                                    disable() {
+                                        return false;
+                                    },
                                 },
                             ],
                         },
@@ -5484,6 +5533,8 @@ var pops = (function () {
                             className: "panel-select-multiple",
                             type: "select-multiple",
                             text: "select-multiple",
+                            // @ts-ignore
+                            props: {},
                             attributes: [],
                             placeholder: "请至少选择一个选项",
                             getValue() {
@@ -5502,22 +5553,42 @@ var pops = (function () {
                                 {
                                     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;
+                                    },
                                 },
                             ],
                         },
@@ -5549,6 +5620,8 @@ var pops = (function () {
                                                     className: "panel-switch",
                                                     text: "switch",
                                                     type: "switch",
+                                                    // @ts-ignore
+                                                    props: {},
                                                     attributes: [],
                                                     getValue() {
                                                         return true;
@@ -5560,6 +5633,8 @@ var pops = (function () {
                                                 {
                                                     className: "panel-slider",
                                                     text: "slider",
+                                                    // @ts-ignore
+                                                    props: {},
                                                     type: "slider",
                                                     attributes: [],
                                                     getValue() {
@@ -5574,6 +5649,8 @@ var pops = (function () {
                                                 {
                                                     className: "panel-button",
                                                     text: "button",
+                                                    // @ts-ignore
+                                                    props: {},
                                                     type: "button",
                                                     attributes: [],
                                                     buttonIcon: "eleme",
@@ -5588,6 +5665,8 @@ var pops = (function () {
                                                     className: "panel-button",
                                                     text: "button",
                                                     type: "button",
+                                                    // @ts-ignore
+                                                    props: {},
                                                     attributes: [],
                                                     buttonIcon: "chromeFilled",
                                                     buttonIconIsLoading: true,
@@ -5600,6 +5679,8 @@ var pops = (function () {
                                                 {
                                                     className: "panel-button",
                                                     text: "button",
+                                                    // @ts-ignore
+                                                    props: {},
                                                     type: "button",
                                                     attributes: [],
                                                     buttonIcon: "upload",
@@ -5627,6 +5708,8 @@ var pops = (function () {
                                 {
                                     className: "panel-switch",
                                     text: "switch",
+                                    // @ts-ignore
+                                    props: {},
                                     type: "switch",
                                     attributes: [],
                                     getValue() {
@@ -5655,7 +5738,7 @@ var pops = (function () {
                     toClose: false,
                     toHide: false,
                 },
-                clickCallBack: void 0,
+                clickCallBack: null,
             },
             class: "",
             mobileClassName: "pops-panel-is-mobile",
@@ -8224,25 +8307,25 @@ var pops = (function () {
             /**
              * 已创建的元素列表
              */
-            let elementList = [$anim];
+            let isCreatedElementList = [$anim];
             /* 遮罩层元素 */
             if (config.mask.enable) {
-                let _handleMask_ = PopsHandler.handleMask({
+                let { maskElement } = PopsHandler.handleMask({
                     type: PopsType,
                     guid: guid,
                     config: config,
                     animElement: $anim,
                     maskHTML: maskHTML,
                 });
-                $mask = _handleMask_.maskElement;
-                elementList.push($mask);
+                $mask = maskElement;
+                isCreatedElementList.push($mask);
             }
             /* 处理返回的配置 */
             let eventDetails = PopsHandler.handleEventDetails(guid, $shadowContainer, $shadowRoot, PopsType, $anim, $pops, $mask, config);
             /* 为顶部右边的关闭按钮添加点击事件 */
             PopsHandler.handleClickEvent("close", $headerCloseBtn, eventDetails, config.btn.close.callback);
             /* 创建到页面中 */
-            popsDOMUtils.append($shadowRoot, elementList);
+            popsDOMUtils.append($shadowRoot, isCreatedElementList);
             if (typeof config.beforeAppendToPageCallBack === "function") {
                 config.beforeAppendToPageCallBack($shadowRoot, $shadowContainer);
             }
@@ -8294,6 +8377,7 @@ var pops = (function () {
                     icon: pops.config.iconSVG.search,
                     iconIsLoading: false,
                     text: "搜索",
+                    item: [],
                     callback(clickEvent, contextMenuEvent, liElement) {
                         console.log("点击：" + this.text, [
                             clickEvent,
@@ -8306,6 +8390,7 @@ var pops = (function () {
                     icon: pops.config.iconSVG.documentCopy,
                     iconIsLoading: false,
                     text: "复制",
+                    item: [],
                     callback(clickEvent, contextMenuEvent, liElement) {
                         console.log("点击：" + this.text, [
                             clickEvent,
@@ -8318,6 +8403,7 @@ var pops = (function () {
                     icon: pops.config.iconSVG.delete,
                     text: "删除",
                     iconIsLoading: false,
+                    item: [],
                     callback(clickEvent, contextMenuEvent, liElement) {
                         console.log("点击：" + this.text, [
                             clickEvent,
@@ -8330,6 +8416,7 @@ var pops = (function () {
                     icon: pops.config.iconSVG.loading,
                     iconIsLoading: true,
                     text: "加载",
+                    item: [],
                     callback(clickEvent, contextMenuEvent, liElement) {
                         console.log("点击：" + this.text, [
                             clickEvent,
@@ -8356,6 +8443,7 @@ var pops = (function () {
                             icon: "",
                             iconIsLoading: false,
                             text: "处理文件",
+                            item: [],
                             callback(clickEvent, contextMenuEvent, liElement) {
                                 console.log("点击：" + this.text, [
                                     clickEvent,
@@ -8380,6 +8468,7 @@ var pops = (function () {
                                     icon: pops.config.iconSVG.view,
                                     iconIsLoading: false,
                                     text: "查看",
+                                    item: [],
                                     callback(clickEvent, contextMenuEvent, liElement) {
                                         console.log("点击：" + this.text, [
                                             clickEvent,
@@ -8419,6 +8508,7 @@ var pops = (function () {
                 throw "config.target 不能为空";
             }
             if (details.data) {
+                // @ts-ignore
                 config.data = details.data;
             }
             let guid = popsUtils.getRandomGUID();
@@ -9427,8 +9517,8 @@ var pops = (function () {
     }
 
     const PopsTooltipConfig = () => {
+        // @ts-ignore
         return {
-            // @ts-ignore
             target: null,
             content: "默认文字",
             position: "top",
@@ -9448,6 +9538,8 @@ var pops = (function () {
             showAfterCallBack() { },
             closeBeforeCallBack() { },
             closeAfterCallBack() { },
+            delayCloseTime: 100,
+            showArrow: true,
             arrowDistance: 12.5,
             otherDistance: 0,
             style: "",
@@ -9522,6 +9614,10 @@ var pops = (function () {
                 });
                 $toolTipContainer.appendChild(cssNode);
             }
+            // 处理是否显示箭头元素
+            if (!this.$data.config.showArrow) {
+                $toolTipArrow.remove();
+            }
             return {
                 $toolTipContainer: $toolTipContainer,
                 $toolTipArrow: $toolTipArrow,
@@ -9561,12 +9657,12 @@ var pops = (function () {
             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;
@@ -9615,7 +9711,7 @@ var pops = (function () {
          * 动态修改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) {
@@ -9744,8 +9840,8 @@ var pops = (function () {
             // 其它的如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;
                 }
             }
@@ -9763,6 +9859,10 @@ var pops = (function () {
             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"));
@@ -9828,7 +9928,10 @@ var pops = (function () {
          * 鼠标|触摸进入事件
          */
         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";
             // }
@@ -9850,8 +9953,9 @@ var pops = (function () {
         /**
          * 鼠标|触摸离开事件
          */
-        toolTipMouseLeaveEvent() {
-            this.$el.$toolTip.style.animationPlayState = "running";
+        toolTipMouseLeaveEvent(event) {
+            this.close(event);
+            // this.$el.$toolTip.style.animationPlayState = "running";
         }
         /**
          * 监听鼠标|触摸离开事件
@@ -9907,7 +10011,7 @@ var pops = (function () {
         /** 配置 */
         config = {
             /** 版本号 */
-            version: "2024.11.3",
+            version: "2024.11.21",
             cssText: {
                 /** 主CSS */
                 index: indexCSS,