@whitesev/pops 1.8.7 → 1.8.8

package/dist/index.amd.js

@@ -9460,8 +9460,8 @@ define((function () { 'use strict';
         $data = {
             config: null,
             guid: null,
-            timeId_show: [],
-            timeId_close: [],
+            timeId_close_TouchEvent: [],
+            timeId_close_MouseEvent: [],
         };
         constructor(config, guid, ShadowInfo) {
             this.$data.config = config;
@@ -9637,23 +9637,40 @@ define((function () { 'use strict';
             this.offMouseEnterEvent();
             this.offMouseLeaveEvent();
         }
+        /**
+         * 添加关闭的timeId
+         * @param type
+         * @param timeId
+         */
+        addCloseTimeoutId(type, timeId) {
+            if (type === "MouseEvent") {
+                this.$data.timeId_close_MouseEvent.push(timeId);
+            }
+            else {
+                this.$data.timeId_close_TouchEvent.push(timeId);
+            }
+        }
         /**
          * 清除延迟的timeId
+         * @param type 事件类型
          */
-        clearCloseTimeoutId(timeId) {
-            for (let index = 0; index < this.$data.timeId_close.length; index++) {
-                const currentTimeId = this.$data.timeId_close[index];
+        clearCloseTimeoutId(type, timeId) {
+            let timeIdList = type === "MouseEvent"
+                ? this.$data.timeId_close_MouseEvent
+                : this.$data.timeId_close_TouchEvent;
+            for (let index = 0; index < timeIdList.length; index++) {
+                const currentTimeId = timeIdList[index];
                 if (typeof timeId === "number") {
                     // 只清除一个
                     if (timeId == currentTimeId) {
                         clearTimeout(timeId);
-                        this.$data.timeId_close.splice(index, 1);
+                        timeIdList.splice(index, 1);
                         break;
                     }
                 }
                 else {
                     clearTimeout(currentTimeId);
-                    this.$data.timeId_close.splice(index, 1);
+                    timeIdList.splice(index, 1);
                     index--;
                 }
             }
@@ -9661,14 +9678,16 @@ define((function () { 'use strict';
         /**
          * 显示提示框
          */
-        show() {
+        show(...args) {
+            let event = args[0];
+            let eventType = event instanceof MouseEvent ? "MouseEvent" : "TouchEvent";
+            this.clearCloseTimeoutId(eventType);
             if (typeof this.$data.config.showBeforeCallBack === "function") {
                 let result = this.$data.config.showBeforeCallBack(this.$el.$toolTip);
                 if (typeof result === "boolean" && !result) {
                     return;
                 }
             }
-            this.clearCloseTimeoutId();
             if (!popsUtils.contains(this.$el.$shadowRoot, this.$el.$toolTip)) {
                 // 不在容器中，添加
                 this.init();
@@ -9708,6 +9727,7 @@ define((function () { 'use strict';
          */
         close(...args) {
             let event = args[0];
+            let eventType = event instanceof MouseEvent ? "MouseEvent" : "TouchEvent";
             // 只判断鼠标事件
             // 其它的如Touch事件不做处理
             if (event && event instanceof MouseEvent) {
@@ -9730,12 +9750,12 @@ define((function () { 'use strict';
             }
             let timeId = setTimeout(() => {
                 // 设置属性触发关闭动画
-                this.clearCloseTimeoutId(timeId);
+                this.clearCloseTimeoutId(eventType, timeId);
                 this.$el.$toolTip.setAttribute("data-motion", this.$el.$toolTip
                     .getAttribute("data-motion")
                     .replace("fadeIn", "fadeOut"));
             }, this.$data.config.delayCloseTime);
-            this.$data.timeId_close.push(timeId);
+            this.addCloseTimeoutId(eventType, timeId);
             if (typeof this.$data.config.closeAfterCallBack === "function") {
                 this.$data.config.closeAfterCallBack(this.$el.$toolTip);
             }
@@ -9805,7 +9825,8 @@ define((function () { 'use strict';
          * 监听鼠标|触摸事件
          */
         onMouseEnterEvent() {
-            this.clearCloseTimeoutId();
+            this.clearCloseTimeoutId("MouseEvent");
+            this.clearCloseTimeoutId("TouchEvent");
             popsDOMUtils.on(this.$el.$toolTip, "mouseenter touchstart", this.mouseEnterEvent.bind(this), this.$data.config.eventOption);
         }
         /**