ele-admin-plus 1.1.9-beta.3 → 1.1.9-beta.4

package/lib/ele-menus/util.cjs

@@ -7,26 +7,22 @@ const core = require("../utils/core");
 const icons = require("../icons");
 const linkClass = "ele-menu-link";
 const titleClass = "ele-menu-title";
+const triggerClass = "ele-menu-trigger";
 const overflowClass = "ele-menu-overflow";
 const ellipsisClass = "ele-sub-menu-ellipsis";
-function getLinkNode(item, onItemClick) {
-  if (!(item == null ? void 0 : item.path)) {
-    return;
-  }
-  if (core.isExternalLink(item.path)) {
+function getLinkNode(path) {
+  if (core.isExternalLink(path)) {
     return vue.h("a", {
-      href: item.path,
+      href: path,
       target: "_blank",
-      class: linkClass,
-      onClick: (e) => {
-        e.stopPropagation();
-        onItemClick && onItemClick(item);
-      }
+      class: linkClass
     });
   }
-  return vue.h(vueRouter.RouterLink, { to: item.path, class: linkClass });
+  if (path) {
+    return vue.h(vueRouter.RouterLink, { to: path, class: linkClass });
+  }
 }
-function getNodes(icons2, titles, badge, link) {
+function getNodes(icons2, titles, badge, trigger) {
   const nodes = [];
   if (icons2) {
     icons2.forEach((t) => {
@@ -41,18 +37,19 @@ function getNodes(icons2, titles, badge, link) {
   if (badge) {
     nodes.push(badge);
   }
-  if (link) {
-    nodes.push(link);
+  if (trigger) {
+    nodes.push(trigger);
   }
   return nodes;
 }
-function renderItems(items, sIcon, sTitle, tipDisabled, theme, popTheme, colorful, popupColorful, firstPopClass, first, onItemClick) {
+function renderItems(items, sIcon, sTitle, tipDisabled, theme, popTheme, colorful, popupColorful, firstPopClass, first, onItemClick, onItemMouseenter, onItemMouseleave, webkit) {
   const nodes = [];
   if (!items) {
     return nodes;
   }
   items.forEach((item) => {
     var _a;
+    const key = item.key || item.index || item.path;
     const iNodes = sIcon ? sIcon({ item, icon: item.icon }) ?? [] : [];
     if (!iNodes.length && item.icon) {
       iNodes.push(
@@ -67,27 +64,40 @@ function renderItems(items, sIcon, sTitle, tipDisabled, theme, popTheme, colorfu
     }
     const bNode = item.badge != null ? vue.h(elementPlus.ElBadge, item.badge) : null;
     if (!((_a = item.children) == null ? void 0 : _a.length)) {
-      const linkNode = getLinkNode(item, onItemClick);
-      const key = item.key || item.index || item.path;
+      const triggerNode = vue.h(
+        "div",
+        {
+          class: triggerClass,
+          onClick: (e) => {
+            onItemClick && onItemClick(item, e);
+          },
+          onMouseenter: (e) => {
+            onItemMouseenter && onItemMouseenter(item, e);
+          },
+          onMouseleave: (e) => {
+            onItemMouseleave && onItemMouseleave(item, e);
+          }
+        },
+        getLinkNode(item.path)
+      );
       nodes.push(
         vue.h(
           elementPlus.ElMenuItem,
           {
             key: key + "-" + tipDisabled,
-            index: item.index,
+            index: item.index || item.path,
             route: item.route,
             disabled: item.disabled,
             class: item.overflow ? overflowClass : void 0,
             onClick: () => {
-              onItemClick && onItemClick(item);
             }
           },
           {
             default: () => {
-              if (!first || tipDisabled) {
-                return getNodes(iNodes, tNodes, bNode, linkNode);
+              if (first && !tipDisabled) {
+                return getNodes(iNodes, void 0, bNode, triggerNode);
               }
-              return getNodes(iNodes, void 0, bNode, linkNode);
+              return getNodes(iNodes, tNodes, bNode, triggerNode);
             },
             title: first && !tipDisabled ? () => tNodes : void 0
           }
@@ -97,47 +107,45 @@ function renderItems(items, sIcon, sTitle, tipDisabled, theme, popTheme, colorfu
     }
     if (item.group === true) {
       nodes.push(
-        vue.h(
-          elementPlus.ElMenuItemGroup,
-          { key: item.key || item.index },
-          {
-            default: () => {
-              return renderItems(
-                item.children,
-                sIcon,
-                sTitle,
-                tipDisabled,
-                theme,
-                popTheme,
-                colorful,
-                popupColorful,
-                firstPopClass,
-                first,
-                onItemClick
-              );
-            },
-            title: () => getNodes(iNodes, tNodes, bNode)
-          }
-        )
+        vue.h(elementPlus.ElMenuItemGroup, { key }, {
+          default: () => {
+            return renderItems(
+              item.children,
+              sIcon,
+              sTitle,
+              tipDisabled,
+              theme,
+              popTheme,
+              colorful,
+              popupColorful,
+              firstPopClass,
+              first,
+              onItemClick,
+              onItemMouseenter,
+              onItemMouseleave
+            );
+          },
+          title: () => getNodes(iNodes, tNodes, bNode)
+        })
       );
       return;
     }
-    const popperClass = getPopperClass(
-      item.popperClass,
-      theme,
-      popTheme,
-      colorful,
-      popupColorful,
-      firstPopClass,
-      first
-    );
     nodes.push(
       vue.h(
         elementPlus.ElSubMenu,
         {
-          key: item.key || item.index,
-          index: item.index,
-          popperClass,
+          key,
+          index: item.index || item.path,
+          popperClass: getPopperClass(
+            item.popperClass,
+            theme,
+            popTheme,
+            colorful,
+            popupColorful,
+            firstPopClass,
+            first,
+            webkit
+          ),
           showTimeout: item.showTimeout,
           hideTimeout: item.hideTimeout,
           disabled: item.disabled,
@@ -166,7 +174,9 @@ function renderItems(items, sIcon, sTitle, tipDisabled, theme, popTheme, colorfu
               popupColorful,
               firstPopClass,
               false,
-              onItemClick
+              onItemClick,
+              onItemMouseenter,
+              onItemMouseleave
             );
           },
           title: () => getNodes(iNodes, tNodes, bNode)
@@ -176,6 +186,25 @@ function renderItems(items, sIcon, sTitle, tipDisabled, theme, popTheme, colorfu
   });
   return nodes;
 }
+function getPopperClass(customerClass, theme, popTheme, colorful, popupColorful, firstPopClass, first, webkit) {
+  const popperClass = ["ele-menu"];
+  if (webkit) {
+    popperClass.push("is-webkit");
+  }
+  if (popTheme === "dark" || popTheme === "auto" && theme === "dark") {
+    popperClass.push("is-night ele-menu-dark");
+  }
+  if (popupColorful === true || popupColorful === "auto" && colorful) {
+    popperClass.push("is-colorful ele-menu-colorful");
+  }
+  if (first && firstPopClass) {
+    popperClass.push(firstPopClass);
+  }
+  if (customerClass) {
+    popperClass.push(customerClass);
+  }
+  return popperClass.join(" ");
+}
 function getMenuItems(menus, index, horizontal) {
   if (!horizontal || !menus || !menus.length) {
     return { items: menus };
@@ -190,36 +219,16 @@ function getMenuItems(menus, index, horizontal) {
   const moreItems = index === 0 ? data : data.slice(index);
   moreItems.forEach((d) => {
     var _a;
-    const children = ((_a = d.children) == null ? void 0 : _a.length) ? [null] : void 0;
     items.push({
       ...d,
+      key: `overflow-${d.key || d.index || d.path}`,
+      index: `overflow-${d.index || d.path}`,
       overflow: true,
-      key: `overflow-${d.key || d.index}`,
-      index: `overflow-${d.index}`,
-      children
+      children: ((_a = d.children) == null ? void 0 : _a.length) ? [null] : void 0
     });
   });
   return { items, moreItems };
 }
-function getPopperClass(customerClass, theme, popTheme, colorful, popupColorful, firstPopClass, first) {
-  const popperClass = ["ele-menu"];
-  if (navigator.userAgent.includes("WebKit")) {
-    popperClass.push("is-webkit");
-  }
-  if (popTheme === "dark" || popTheme === "auto" && theme === "dark") {
-    popperClass.push("is-night ele-menu-dark");
-  }
-  if (popupColorful === true || popupColorful === "auto" && colorful) {
-    popperClass.push("is-colorful ele-menu-colorful");
-  }
-  if (first && firstPopClass) {
-    popperClass.push(firstPopClass);
-  }
-  if (customerClass) {
-    popperClass.push(customerClass);
-  }
-  return popperClass.join(" ");
-}
 function getMenuWidth(el) {
   if (!el) {
     return;
@@ -239,8 +248,7 @@ function getItemWidth(el) {
   return el.offsetWidth + ml + mr;
 }
 function getMenuChilds(el) {
-  const childs = Array.from(el.childNodes ?? []);
-  return childs.filter((t) => {
+  return Array.from(el.childNodes ?? []).filter((t) => {
     return t.nodeName === "LI" && !t.classList.contains(ellipsisClass);
   });
 }
@@ -311,4 +319,5 @@ exports.linkClass = linkClass;
 exports.overflowClass = overflowClass;
 exports.renderItems = renderItems;
 exports.titleClass = titleClass;
+exports.triggerClass = triggerClass;
 exports.useMenuEllipsis = useMenuEllipsis;

package/lib/ele-menus/util.d.ts

@@ -1,9 +1,11 @@
 import type { VNode, Slot } from 'vue';
-import type { MenuItem, MenuTheme, PopupMenuTheme, PopupColorful, MenuResult, MenuEllipsisOption, ItemClick } from './types';
-/** 菜单链接类名 */
+import type { MenuItem, MenuTheme, PopupMenuTheme, PopupColorful, MenuResult, MenuEllipsisOption, MenuItemEvent } from './types';
+/** 子菜单项链接类名 */
 export declare const linkClass = "ele-menu-link";
 /** 菜单标题类名 */
 export declare const titleClass = "ele-menu-title";
+/** 子菜单项事件触发元素类名 */
+export declare const triggerClass = "ele-menu-trigger";
 /** 菜单溢出隐藏项类名 */
 export declare const overflowClass = "ele-menu-overflow";
 /** 菜单省略项的类名 */
@@ -12,20 +14,20 @@ export declare const ellipsisClass = "ele-sub-menu-ellipsis";
  * 生成菜单链接节点
  * @param path 链接地址
  */
-export declare function getLinkNode(item: MenuItem, onItemClick?: ItemClick): VNode | undefined;
+export declare function getLinkNode(path?: string): VNode | undefined;
 /**
  * 生成菜单内容节点
  * @param icons 图标节点
  * @param titles 标题节点
  * @param badge 徽章节点
- * @param link 链接节点
+ * @param trigger 子菜单项事件触发元素节点
  */
-export declare function getNodes(icons?: VNode[], titles?: VNode[], badge?: VNode | null, link?: VNode | null): VNode[];
+export declare function getNodes(icons?: VNode[], titles?: VNode[], badge?: VNode | null, trigger?: VNode | null): VNode[];
 /**
  * 递归生成菜单节点
  * @param items 菜单数据
  * @param sIcon 图标插槽
- * @param sTitle 白哦提插槽
+ * @param sTitle 标题插槽
  * @param tipDisabled 是否禁用折叠的tooltip
  * @param theme 主题
  * @param popTheme 气泡菜单主题
@@ -33,15 +35,12 @@ export declare function getNodes(icons?: VNode[], titles?: VNode[], badge?: VNod
  * @param popupColorful 气泡菜单是否彩色图标
  * @param firstPopClass 第一级气泡菜单类名
  * @param first 是否是第一级菜单
+ * @param onItemClick 子菜单项点击事件
+ * @param onItemMouseenter 子菜单项鼠标进入事件
+ * @param onItemMouseenter 子菜单项鼠标离开事件
+ * @param webkit 是否时webkit内核
  */
-export declare function renderItems(items?: MenuItem[], sIcon?: Slot, sTitle?: Slot, tipDisabled?: boolean, theme?: MenuTheme, popTheme?: PopupMenuTheme, colorful?: boolean, popupColorful?: PopupColorful, firstPopClass?: string, first?: boolean, onItemClick?: ItemClick): VNode[];
-/**
- * 生成菜单数据
- * @param items 菜单数据
- * @param index 省略位置
- * @param horizontal 是否是水平菜单
- */
-export declare function getMenuItems(menus?: MenuItem[], index?: number, horizontal?: boolean): MenuResult;
+export declare function renderItems(items?: MenuItem[], sIcon?: Slot, sTitle?: Slot, tipDisabled?: boolean, theme?: MenuTheme, popTheme?: PopupMenuTheme, colorful?: boolean, popupColorful?: PopupColorful, firstPopClass?: string, first?: boolean, onItemClick?: MenuItemEvent, onItemMouseenter?: MenuItemEvent, onItemMouseleave?: MenuItemEvent, webkit?: boolean): VNode[];
 /**
  * 生成气泡菜单的类名
  * @param customerClass 自定义的类名
@@ -52,7 +51,14 @@ export declare function getMenuItems(menus?: MenuItem[], index?: number, horizon
  * @param firstPopClass 第一级气泡菜单类名
  * @param first 是否是第一级菜单
  */
-export declare function getPopperClass(customerClass?: string, theme?: MenuTheme, popTheme?: PopupMenuTheme, colorful?: boolean, popupColorful?: PopupColorful, firstPopClass?: string, first?: boolean): string;
+export declare function getPopperClass(customerClass?: string, theme?: MenuTheme, popTheme?: PopupMenuTheme, colorful?: boolean, popupColorful?: PopupColorful, firstPopClass?: string, first?: boolean, webkit?: boolean): string;
+/**
+ * 生成菜单数据
+ * @param items 菜单数据
+ * @param index 省略位置
+ * @param horizontal 是否是水平菜单
+ */
+export declare function getMenuItems(menus?: MenuItem[], index?: number, horizontal?: boolean): MenuResult;
 /**
  * 获取菜单节点宽度
  * @param el 菜单节点

package/lib/ele-pro-layout/components/pro-header.cjs

@@ -21,17 +21,17 @@ const _sfc_main = vue.defineComponent({
     ellipsis: Boolean,
     /** 菜单省略项的属性 */
     ellipsisProps: Object,
-    /** 子菜单触发方式 */
+    /** 父级菜单展开触发方式 */
     menuTrigger: String,
-    /** 菜单项触发模式 */
+    /** 子菜单项触发模式 */
     itemTrigger: String,
     /** 侧栏是否折叠 */
     collapse: Boolean,
     /** 当前是否有侧栏 */
     sidebar: Boolean,
-    /** 标题插槽名称 */
+    /** 菜单标题插槽名称 */
     titleSlot: String,
-    /** 图标插槽名称 */
+    /** 菜单图标插槽名称 */
     iconSlot: String,
     /** 面包屑导航数据 */
     levels: {
@@ -51,12 +51,20 @@ const _sfc_main = vue.defineComponent({
     logoClick: () => true,
     open: (_index, _indexPath) => true,
     close: (_index, _indexPath) => true,
-    itemClick: (_item) => true
+    itemClick: (_item, _e) => true,
+    itemMouseenter: (_item, _e) => true,
+    itemMouseleave: (_item, _e) => true,
+    mouseEnter: (_e) => true,
+    mouseLeave: (_e) => true
   },
   setup(props, { emit }) {
+    const state = { hover: false, timer: null };
     const levelItems = vue.shallowRef([]);
     const menuItems = vue.computed(() => {
-      return util.getMenuItems(props.menus, props.itemTrigger != "click");
+      return util.getMenuItems(
+        props.menus,
+        props.itemTrigger !== "click" && props.itemTrigger !== "hover"
+      );
     });
     const isDark = vue.computed(() => props.headerStyle === "dark");
     const isPrimary = vue.computed(() => props.headerStyle === "primary");
@@ -72,8 +80,36 @@ const _sfc_main = vue.defineComponent({
     const onClose = (index, indexPath) => {
       emit("close", index, indexPath);
     };
-    const onItemClick = (item) => {
-      emit("itemClick", item);
+    const onItemClick = (item, e) => {
+      emit("itemClick", item, e);
+    };
+    const onItemMouseenter = (item, e) => {
+      emit("itemMouseenter", item, e);
+      onMouseenter(e);
+    };
+    const onItemMouseleave = (item, e) => {
+      emit("itemMouseleave", item, e);
+      onMouseleave(e);
+    };
+    const onMouseenter = (e) => {
+      if (state.timer != null) {
+        clearTimeout(state.timer);
+        state.timer = null;
+      }
+      if (!state.hover) {
+        state.hover = true;
+        emit("mouseEnter", e);
+      }
+    };
+    const onMouseleave = (e) => {
+      if (state.timer != null) {
+        clearTimeout(state.timer);
+      }
+      state.timer = setTimeout(() => {
+        state.timer = null;
+        state.hover = false;
+        emit("mouseLeave", e);
+      }, 300);
     };
     vue.watch(
       [() => props.isHome, () => props.homePath, () => props.levels],
@@ -95,8 +131,17 @@ const _sfc_main = vue.defineComponent({
         });
         levelItems.value = data;
       },
-      { deep: true, immediate: true }
+      {
+        immediate: true,
+        deep: true
+      }
     );
+    vue.onBeforeUnmount(() => {
+      if (state.timer != null) {
+        clearTimeout(state.timer);
+        state.timer = null;
+      }
+    });
     return {
       levelItems,
       menuItems,
@@ -106,7 +151,11 @@ const _sfc_main = vue.defineComponent({
       onLogoClick,
       onOpen,
       onClose,
-      onItemClick
+      onItemClick,
+      onItemMouseenter,
+      onItemMouseleave,
+      onMouseenter,
+      onMouseleave
     };
   }
 });
@@ -138,7 +187,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       "ele-admin-header",
       { "is-dark": _ctx.isDark },
       { "is-primary": _ctx.isPrimary }
-    ])
+    ]),
+    onMouseenter: _cache[1] || (_cache[1] = (...args) => _ctx.onMouseenter && _ctx.onMouseenter(...args)),
+    onMouseleave: _cache[2] || (_cache[2] = (...args) => _ctx.onMouseleave && _ctx.onMouseleave(...args))
   }, [
     _ctx.$slots.logo ? (vue.openBlock(), vue.createElementBlock("div", {
       key: 0,
@@ -181,7 +232,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         menuTrigger: _ctx.menuTrigger,
         onOpen: _ctx.onOpen,
         onClose: _ctx.onClose,
-        onItemClick: _ctx.onItemClick
+        onItemClick: _ctx.onItemClick,
+        onItemMouseenter: _ctx.onItemMouseenter,
+        onItemMouseleave: _ctx.onItemMouseleave
       }, vue.createSlots({ _: 2 }, [
         _ctx.iconSlot && !["logo", "left", "right", "center", "breadcrumb"].includes(
           _ctx.iconSlot
@@ -201,12 +254,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           ]),
           key: "1"
         } : void 0
-      ]), 1032, ["items", "theme", "popupTheme", "ellipsis", "ellipsisProps", "defaultActive", "menuTrigger", "onOpen", "onClose", "onItemClick"])) : vue.createCommentVNode("", true)
+      ]), 1032, ["items", "theme", "popupTheme", "ellipsis", "ellipsisProps", "defaultActive", "menuTrigger", "onOpen", "onClose", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : vue.createCommentVNode("", true)
     ]),
     _ctx.$slots.right ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_4, [
       vue.renderSlot(_ctx.$slots, "right", { sidebar: _ctx.sidebar })
     ])) : vue.createCommentVNode("", true)
-  ], 2);
+  ], 34);
 }
 const proHeader = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 module.exports = proHeader;

package/lib/ele-pro-layout/components/pro-header.d.ts

@@ -16,17 +16,17 @@ declare const _default: import("vue").DefineComponent<{
     ellipsis: BooleanConstructor;
     /** 菜单省略项的属性 */
     ellipsisProps: PropType<EllipsisProps>;
-    /** 子菜单触发方式 */
+    /** 父级菜单展开触发方式 */
     menuTrigger: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
-    /** 菜单项触发模式 */
+    /** 子菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
     /** 侧栏是否折叠 */
     collapse: BooleanConstructor;
     /** 当前是否有侧栏 */
     sidebar: BooleanConstructor;
-    /** 标题插槽名称 */
+    /** 菜单标题插槽名称 */
     titleSlot: StringConstructor;
-    /** 图标插槽名称 */
+    /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
     /** 面包屑导航数据 */
     levels: {
@@ -50,12 +50,20 @@ declare const _default: import("vue").DefineComponent<{
     onLogoClick: () => void;
     onOpen: (index: string, indexPath: string[]) => void;
     onClose: (index: string, indexPath: string[]) => void;
-    onItemClick: (item: MenuItemProps) => void;
+    onItemClick: (item: MenuItemProps, e: MouseEvent) => void;
+    onItemMouseenter: (item: MenuItemProps, e: MouseEvent) => void;
+    onItemMouseleave: (item: MenuItemProps, e: MouseEvent) => void;
+    onMouseenter: (e: MouseEvent) => void;
+    onMouseleave: (e: MouseEvent) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     logoClick: () => true;
     open: (_index: string, _indexPath: string[]) => true;
     close: (_index: string, _indexPath: string[]) => true;
-    itemClick: (_item: MenuItemProps) => true;
+    itemClick: (_item: MenuItemProps, _e: MouseEvent) => true;
+    itemMouseenter: (_item: MenuItemProps, _e: MouseEvent) => true;
+    itemMouseleave: (_item: MenuItemProps, _e: MouseEvent) => true;
+    mouseEnter: (_e: MouseEvent) => true;
+    mouseLeave: (_e: MouseEvent) => true;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /** 菜单数据 */
     menus: {
@@ -70,17 +78,17 @@ declare const _default: import("vue").DefineComponent<{
     ellipsis: BooleanConstructor;
     /** 菜单省略项的属性 */
     ellipsisProps: PropType<EllipsisProps>;
-    /** 子菜单触发方式 */
+    /** 父级菜单展开触发方式 */
     menuTrigger: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
-    /** 菜单项触发模式 */
+    /** 子菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
     /** 侧栏是否折叠 */
     collapse: BooleanConstructor;
     /** 当前是否有侧栏 */
     sidebar: BooleanConstructor;
-    /** 标题插槽名称 */
+    /** 菜单标题插槽名称 */
     titleSlot: StringConstructor;
-    /** 图标插槽名称 */
+    /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
     /** 面包屑导航数据 */
     levels: {
@@ -98,8 +106,12 @@ declare const _default: import("vue").DefineComponent<{
 }>> & {
     onOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
-    onItemClick?: ((_item: Partial<import("../../ele-menus/types").MenuItem>) => any) | undefined;
+    onItemClick?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
+    onItemMouseenter?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
+    onItemMouseleave?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
     onLogoClick?: (() => any) | undefined;
+    onMouseEnter?: ((_e: MouseEvent) => any) | undefined;
+    onMouseLeave?: ((_e: MouseEvent) => any) | undefined;
 }, {
     collapse: boolean;
     ellipsis: boolean;