bkui-vue 2.0.1-beta.90 → 2.0.1-beta.92

package/lib/index.js

@@ -4,5 +4,5 @@ export { default } from './preset';
 export * from './config-provider';
 export * from './directives';
 export * as plugins from './plugins';
-export const version = "2.0.1-beta.90";
+export const version = "2.0.1-beta.92";
 window.__bkui_vue_version__ = version;

package/lib/plugin-popover/index.js

@@ -3129,6 +3129,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
     var delay = resolvePopoverDelay()[1];
     popHideTimerId = setTimeout(function () {
       popShowTimerId && clearTimeout(popShowTimerId);
+      isMouseenter = false;
       localIsShow.value = false;
     }, delay);
   };
@@ -3164,20 +3165,25 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
     if (!['hover', 'click-hover'].includes(props.trigger)) {
       return;
     }
-    if (popHideTimerId) {
+    if (!isMouseenter) {
       isMouseenter = true;
+    }
+    // 设置setTimeout的延时为delay, 避免出现同时触发mouseenter mouseleave事件
+    var delay = resolvePopoverDelay()[1];
+    if (popHideTimerId) {
       clearTimeout(popHideTimerId);
-      popHideTimerId = undefined;
+      setTimeout(function () {
+        popHideTimerId = undefined;
+      }, delay);
     }
     emitPopContentMouseEnter(e);
   };
   var handlePopContentMouseLeave = function handlePopContentMouseLeave(e) {
     // 处理底部触发mouseleave事件，popShowTimerId有值代表处于hover状态
-    if (isMouseenter && !popShowTimerId) {
+    if (popShowTimerId && !popHideTimerId) {
       hidePopover();
-      isMouseenter = false;
-      emitPopContentMouseLeave(e);
     }
+    emitPopContentMouseLeave(e);
   };
   /**
    * 弹出内容鼠标移入事件
@@ -3444,14 +3450,40 @@ var parentNodeReferId = null;
     var _storeEvents;
     if ((_storeEvents = storeEvents) !== null && _storeEvents !== void 0 && _storeEvents.length) {
       var _resolvePopElements2 = resolvePopElements(),
-        elReference = _resolvePopElements2.elReference;
+        elReference = _resolvePopElements2.elReference,
+        elContent = _resolvePopElements2.elContent;
       if (elReference) {
-        storeEvents.forEach(function (_ref4) {
-          var _ref5 = _slicedToArray(_ref4, 2),
-            event = _ref5[0],
-            listener = _ref5[1];
-          if (event && typeof listener === 'function') {
-            elReference.removeEventListener(event, listener);
+        storeEvents.forEach(function (storeEvent) {
+          if (Array.isArray(storeEvent)) {
+            storeEvent.forEach(function (_ref4) {
+              var _ref5 = _slicedToArray(_ref4, 2),
+                event = _ref5[0],
+                listener = _ref5[1];
+              if (event && typeof listener === 'function') {
+                elReference.removeEventListener(event, listener);
+              }
+            });
+          } else {
+            var content = storeEvent.content,
+              reference = storeEvent.reference;
+            content.forEach(function (_ref6) {
+              var _ref7 = _slicedToArray(_ref6, 2),
+                event = _ref7[0],
+                listener = _ref7[1];
+              if (event && typeof listener === 'function') {
+                if (elContent) {
+                  elContent.removeEventListener(event, listener);
+                }
+              }
+            });
+            reference.forEach(function (_ref8) {
+              var _ref9 = _slicedToArray(_ref8, 2),
+                event = _ref9[0],
+                listener = _ref9[1];
+              if (event && typeof listener === 'function') {
+                elReference.removeEventListener(event, listener);
+              }
+            });
           }
         });
       }
@@ -3468,8 +3500,8 @@ var parentNodeReferId = null;
       root = _resolvePopElements3.root;
     if (isFullscreen.value) {
       var _fullScreenTarget$val;
-      var _ref6 = elReference || root || {},
-        parentNode = _ref6.parentNode;
+      var _ref10 = elReference || root || {},
+        parentNode = _ref10.parentNode;
       boundary.value = (_fullScreenTarget$val = fullScreenTarget === null || fullScreenTarget === void 0 ? void 0 : fullScreenTarget.value) !== null && _fullScreenTarget$val !== void 0 ? _fullScreenTarget$val : getClosestFullscreenElement(parentNode);
       return;
     }

package/lib/popover/index.js

@@ -3132,6 +3132,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
     var delay = resolvePopoverDelay()[1];
     popHideTimerId = setTimeout(function () {
       popShowTimerId && clearTimeout(popShowTimerId);
+      isMouseenter = false;
       localIsShow.value = false;
     }, delay);
   };
@@ -3167,20 +3168,25 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
     if (!['hover', 'click-hover'].includes(props.trigger)) {
       return;
     }
-    if (popHideTimerId) {
+    if (!isMouseenter) {
       isMouseenter = true;
+    }
+    // 设置setTimeout的延时为delay, 避免出现同时触发mouseenter mouseleave事件
+    var delay = resolvePopoverDelay()[1];
+    if (popHideTimerId) {
       clearTimeout(popHideTimerId);
-      popHideTimerId = undefined;
+      setTimeout(function () {
+        popHideTimerId = undefined;
+      }, delay);
     }
     emitPopContentMouseEnter(e);
   };
   var handlePopContentMouseLeave = function handlePopContentMouseLeave(e) {
     // 处理底部触发mouseleave事件，popShowTimerId有值代表处于hover状态
-    if (isMouseenter && !popShowTimerId) {
+    if (popShowTimerId && !popHideTimerId) {
       hidePopover();
-      isMouseenter = false;
-      emitPopContentMouseLeave(e);
     }
+    emitPopContentMouseLeave(e);
   };
   /**
    * 弹出内容鼠标移入事件
@@ -3447,14 +3453,40 @@ var parentNodeReferId = null;
     var _storeEvents;
     if ((_storeEvents = storeEvents) !== null && _storeEvents !== void 0 && _storeEvents.length) {
       var _resolvePopElements2 = resolvePopElements(),
-        elReference = _resolvePopElements2.elReference;
+        elReference = _resolvePopElements2.elReference,
+        elContent = _resolvePopElements2.elContent;
       if (elReference) {
-        storeEvents.forEach(function (_ref4) {
-          var _ref5 = _slicedToArray(_ref4, 2),
-            event = _ref5[0],
-            listener = _ref5[1];
-          if (event && typeof listener === 'function') {
-            elReference.removeEventListener(event, listener);
+        storeEvents.forEach(function (storeEvent) {
+          if (Array.isArray(storeEvent)) {
+            storeEvent.forEach(function (_ref4) {
+              var _ref5 = _slicedToArray(_ref4, 2),
+                event = _ref5[0],
+                listener = _ref5[1];
+              if (event && typeof listener === 'function') {
+                elReference.removeEventListener(event, listener);
+              }
+            });
+          } else {
+            var content = storeEvent.content,
+              reference = storeEvent.reference;
+            content.forEach(function (_ref6) {
+              var _ref7 = _slicedToArray(_ref6, 2),
+                event = _ref7[0],
+                listener = _ref7[1];
+              if (event && typeof listener === 'function') {
+                if (elContent) {
+                  elContent.removeEventListener(event, listener);
+                }
+              }
+            });
+            reference.forEach(function (_ref8) {
+              var _ref9 = _slicedToArray(_ref8, 2),
+                event = _ref9[0],
+                listener = _ref9[1];
+              if (event && typeof listener === 'function') {
+                elReference.removeEventListener(event, listener);
+              }
+            });
           }
         });
       }
@@ -3471,8 +3503,8 @@ var parentNodeReferId = null;
       root = _resolvePopElements3.root;
     if (isFullscreen.value) {
       var _fullScreenTarget$val;
-      var _ref6 = elReference || root || {},
-        parentNode = _ref6.parentNode;
+      var _ref10 = elReference || root || {},
+        parentNode = _ref10.parentNode;
       boundary.value = (_fullScreenTarget$val = fullScreenTarget === null || fullScreenTarget === void 0 ? void 0 : fullScreenTarget.value) !== null && _fullScreenTarget$val !== void 0 ? _fullScreenTarget$val : getClosestFullscreenElement(parentNode);
       return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "2.0.1-beta.90",
+  "version": "2.0.1-beta.92",
   "workspaces": [
     "packages/**",
     "scripts/cli",