bkui-vue 2.0.1-beta.91 → 2.0.1-beta.93

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.91";
+export const version = "2.0.1-beta.93";
 window.__bkui_vue_version__ = version;

package/lib/menu/index.d.ts

@@ -144,13 +144,22 @@ declare const BkMenu: {
             type: StringConstructor;
             default: string;
         };
+        foldName: {
+            type: StringConstructor;
+            default: any;
+        };
     }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         name: {
             type: StringConstructor;
             default: string;
         };
+        foldName: {
+            type: StringConstructor;
+            default: any;
+        };
     }>>, {
         name: string;
+        foldName: string;
     }, {}>;
 }>;
 export default BkMenu;

package/lib/menu/index.js

@@ -448,25 +448,39 @@ var menuProps = {
  */
 
 
+
 /* harmony default export */ const menu_group = ((0,external_vue_namespaceObject.defineComponent)({
   name: 'MenuGroup',
   props: {
     name: {
       type: String,
       "default": ''
+    },
+    foldName: {
+      type: String,
+      "default": undefined
     }
   },
   setup: function setup(props, _ref) {
     var slots = _ref.slots;
+    var _useMenuInject = useMenuInject(),
+      collapse = _useMenuInject.collapse;
     var _usePrefix = (0,config_provider_namespaceObject.usePrefix)(),
       resolveClassName = _usePrefix.resolveClassName;
+    var displayTitle = (0,external_vue_namespaceObject.computed)(function () {
+      if (collapse.value) {
+        // 收起
+        return props.foldName !== undefined ? props.foldName : props.name;
+      }
+      return props.name;
+    });
     return function () {
       var _slots$default;
       return (0,external_vue_namespaceObject.createVNode)("div", {
         "class": "".concat(resolveClassName('menu-group'))
       }, [(0,external_vue_namespaceObject.createVNode)("div", {
         "class": "group-name"
-      }, [props.name]), (0,external_vue_namespaceObject.createVNode)("ul", {
+      }, [displayTitle.value]), (0,external_vue_namespaceObject.createVNode)("ul", {
         "class": "group-wrap"
       }, [(_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)])]);
     };

package/lib/menu/menu-group.d.ts

@@ -3,12 +3,21 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    foldName: {
+        type: StringConstructor;
+        default: any;
+    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     name: {
         type: StringConstructor;
         default: string;
     };
+    foldName: {
+        type: StringConstructor;
+        default: any;
+    };
 }>>, {
     name: string;
+    foldName: string;
 }, {}>;
 export default _default;

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);
   };
   /**
    * 弹出内容鼠标移入事件

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);
   };
   /**
    * 弹出内容鼠标移入事件

package/package.json

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