ele-admin-plus 1.1.9-beta.1 → 1.1.9-beta.10

package/es/ele-pro-layout/index.js

@@ -2,8 +2,8 @@ import { defineComponent, ref, shallowRef, computed, watch, unref, provide, reso
 import { useRouter } from "vue-router";
 import { ElBacktop } from "element-plus";
 import { mapTree, isExternalLink } from "../utils/core";
-import { useLicense, UNAUTHORIZED_TIP, LAYOUT_KEY } from "../ele-config-provider/receiver";
-import EleWatermark from "../ele-watermark/index";
+import { LAYOUT_KEY } from "../ele-config-provider/receiver";
+import ReceiverView from "../ele-config-provider/components/receiver-view";
 import ProHeader from "./components/pro-header";
 import ProSidebar from "./components/pro-sidebar";
 import ProSidebox from "./components/pro-sidebox";
@@ -15,7 +15,7 @@ const _sfc_main = defineComponent({
   name: "EleProLayout",
   components: {
     ElBacktop,
-    EleWatermark,
+    ReceiverView,
     ProHeader,
     ProSidebar,
     ProSidebox,
@@ -25,9 +25,15 @@ const _sfc_main = defineComponent({
   props: proLayoutProps,
   emits: proLayoutEmits,
   setup(props, { emit }) {
-    const { authenticated } = useLicense();
     const { currentRoute, push } = useRouter();
     const { disableTransition } = useDisableTransition();
+    const state = {
+      headerData: [],
+      sideboxData: [],
+      sidebarData: [],
+      menuTimer: null,
+      isHover: false
+    };
     const contentRef = ref(null);
     const levelData = shallowRef([]);
     const tabData = shallowRef([]);
@@ -45,7 +51,6 @@ const _sfc_main = defineComponent({
     const homeMenuPath = ref(getHomePath(props.homePath));
     const isHome = ref(false);
     const mobile = ref(false);
-    const watermark = ref(UNAUTHORIZED_TIP.split(",") || "Error");
     const topLayout = computed(() => props.layout === "top");
     const mixLayout = computed(() => props.layout === "mix");
     const mixSidebar = computed(() => props.sidebarLayout === "mix");
@@ -215,6 +220,9 @@ const _sfc_main = defineComponent({
         sideboxActive.value = active1;
       }
       sidebarActive.value = active;
+      state.headerActive = headerActive.value;
+      state.sideboxActive = sideboxActive.value;
+      state.sidebarActive = sidebarActive.value;
     };
     const splitMenuData = () => {
       var _a;
@@ -291,6 +299,9 @@ const _sfc_main = defineComponent({
           sidebarData.value = menuData.value;
         }
       }
+      state.headerData = headerData.value;
+      state.sideboxData = sideboxData.value;
+      state.sidebarData = sidebarData.value;
     };
     const updateMenuData = () => {
       let temp;
@@ -336,90 +347,276 @@ const _sfc_main = defineComponent({
         });
       }
     };
-    const onNavItemClick = (item) => {
-      if (!item.index || props.navTrigger != "click") {
-        return;
-      }
-      if (props.beforeClick && props.beforeClick(item) === false) {
+    const onNavItemClick = (item, e) => {
+      const path = item.index;
+      const trigger = props.navTrigger;
+      if (!path || trigger !== "click" && trigger !== "hover") {
         return;
       }
       if (isExternalLink(item.index)) {
-        window.open(item.index);
+        e.stopPropagation();
+        if (props.beforeClick && props.beforeClick(item, e) === false) {
+          return;
+        }
+        window.open(path);
         return;
       }
-      headerActive.value = item.index;
-      const temp = getActiveChilds(
-        headerData.value,
-        headerActive.value,
-        "tempChildren"
-      );
+      const temp = getActiveChilds(headerData.value, path, "tempChildren");
       const isChild = !temp.some((d) => {
         var _a;
         return !((_a = d.meta) == null ? void 0 : _a.hide);
       });
-      if (isChild && item.index !== unref(currentRoute).fullPath) {
-        push(item.index);
+      if (trigger !== "click" && !isChild) {
+        e.stopPropagation();
         return;
       }
-      if (mixSidebar.value) {
+      if (props.beforeClick && props.beforeClick(item, e) === false) {
+        return;
+      }
+      if (isChild) {
+        if (path !== unref(currentRoute).fullPath) {
+          push(path);
+        }
+        return;
+      }
+      if (headerActive.value !== path) {
+        headerActive.value = path;
+        if (!mixSidebar.value) {
+          sidebarData.value = temp;
+          return;
+        }
         sideboxData.value = temp.map((d) => {
           return {
-            name: d.name,
-            path: d.path,
-            component: d.component,
-            redirect: d.redirect,
-            meta: d.meta,
+            ...d,
             children: props.collapse ? d.children : void 0,
             tempChildren: d.children
           };
         });
+      }
+    };
+    const onNavItemMouseenter = (item, e) => {
+      if (!mixLayout.value) {
+        return;
+      }
+      if (state.menuTimer != null) {
+        clearTimeout(state.menuTimer);
+        state.menuTimer = null;
+      }
+      const path = item.index;
+      const trigger = props.navTrigger;
+      if (trigger !== "hover" || !path || isExternalLink(path)) {
         return;
       }
-      sidebarData.value = temp;
+      const temp = getActiveChilds(headerData.value, path, "tempChildren");
+      if (!temp.some((d) => {
+        var _a;
+        return !((_a = d.meta) == null ? void 0 : _a.hide);
+      })) {
+        return;
+      }
+      if (props.beforeClick && props.beforeClick(item, e) === false) {
+        return;
+      }
+      if (headerActive.value !== path) {
+        state.isHover = true;
+        headerActive.value = path;
+        if (!mixSidebar.value) {
+          sidebarData.value = temp;
+          return;
+        }
+        sideboxData.value = temp.map((d) => {
+          return {
+            ...d,
+            children: props.collapse ? d.children : void 0,
+            tempChildren: d.children
+          };
+        });
+      }
+    };
+    const onNavMouseEnter = () => {
+      if (state.menuTimer != null) {
+        clearTimeout(state.menuTimer);
+        state.menuTimer = null;
+      }
     };
-    const onBoxItemClick = (item) => {
-      if (!item.index || props.boxTrigger != "click") {
+    const onNavMouseLeave = () => {
+      if (!state.isHover) {
         return;
       }
-      if (props.beforeClick && props.beforeClick(item) === false) {
+      if (state.menuTimer != null) {
+        clearTimeout(state.menuTimer);
+        state.menuTimer = null;
+      }
+      state.menuTimer = setTimeout(() => {
+        state.isHover = false;
+        if (headerActive.value !== state.headerActive) {
+          headerActive.value = state.headerActive;
+          if (mixSidebar.value) {
+            sideboxData.value = state.sideboxData;
+          } else {
+            sidebarData.value = state.sidebarData;
+          }
+        }
+        if (mixSidebar.value && sideboxActive.value !== state.sideboxActive) {
+          sideboxActive.value = state.sideboxActive;
+          sidebarData.value = state.sidebarData;
+        }
+      }, props.menuHoverTimeout);
+    };
+    const onBoxItemClick = (item, e) => {
+      const path = item.index;
+      const trigger = props.boxTrigger;
+      if (!path || trigger !== "click" && trigger !== "hover") {
         return;
       }
-      if (isExternalLink(item.index)) {
-        window.open(item.index);
+      if (isExternalLink(path)) {
+        e.stopPropagation();
+        if (props.beforeClick && props.beforeClick(item, e) === false) {
+          return;
+        }
+        window.open(path);
         return;
       }
-      sideboxActive.value = item.index;
-      const temp = getActiveChilds(
-        sideboxData.value,
-        sideboxActive.value,
-        "tempChildren"
-      );
+      if (props.collapse) {
+        if (props.beforeClick && props.beforeClick(item, e) === false) {
+          return;
+        }
+        if (path !== unref(currentRoute).fullPath) {
+          push(path);
+        }
+        return;
+      }
+      const temp = getActiveChilds(sideboxData.value, path, "tempChildren");
       const isChild = !temp.some((d) => {
         var _a;
         return !((_a = d.meta) == null ? void 0 : _a.hide);
       });
-      if (isChild && item.index !== unref(currentRoute).fullPath) {
-        push(item.index);
+      if (trigger !== "click" && !isChild) {
+        e.stopPropagation();
+        return;
+      }
+      if (props.beforeClick && props.beforeClick(item, e) === false) {
+        return;
+      }
+      if (isChild) {
+        if (path !== unref(currentRoute).fullPath) {
+          push(path);
+        }
         return;
       }
-      sidebarData.value = temp;
+      if (sideboxActive.value !== path) {
+        sideboxActive.value = path;
+        sidebarData.value = temp;
+      }
     };
-    const onMenuItemClick = (item) => {
-      if (!item.index || props.itemTrigger != "click") {
+    const onBoxItemMouseenter = (item, e) => {
+      if (props.collapse) {
         return;
       }
-      if (props.beforeClick && props.beforeClick(item) === false) {
+      if (state.menuTimer != null) {
+        clearTimeout(state.menuTimer);
+        state.menuTimer = null;
+      }
+      const path = item.index;
+      const trigger = props.boxTrigger;
+      if (trigger !== "hover" || !path || isExternalLink(path)) {
         return;
       }
-      if (isExternalLink(item.index)) {
-        window.open(item.index);
+      const temp = getActiveChilds(sideboxData.value, path, "tempChildren");
+      if (!temp.some((d) => {
+        var _a;
+        return !((_a = d.meta) == null ? void 0 : _a.hide);
+      })) {
         return;
       }
-      sidebarActive.value = item.index;
-      if (item.index !== unref(currentRoute).fullPath) {
-        push(item.index);
+      if (props.beforeClick && props.beforeClick(item, e) === false) {
+        return;
+      }
+      if (sideboxActive.value !== path) {
+        state.isHover = true;
+        sideboxActive.value = path;
+        sidebarData.value = temp;
+      }
+    };
+    const onBoxMouseEnter = () => {
+      if (state.menuTimer != null) {
+        clearTimeout(state.menuTimer);
+        state.menuTimer = null;
       }
     };
+    const onBoxMouseLeave = () => {
+      if (!state.isHover) {
+        return;
+      }
+      if (state.menuTimer != null) {
+        clearTimeout(state.menuTimer);
+        state.menuTimer = null;
+      }
+      state.menuTimer = setTimeout(() => {
+        state.isHover = false;
+        if (headerActive.value !== state.headerActive) {
+          headerActive.value = state.headerActive;
+          if (mixSidebar.value) {
+            sideboxData.value = state.sideboxData;
+          } else {
+            sidebarData.value = state.sidebarData;
+          }
+        }
+        if (mixSidebar.value && sideboxActive.value !== state.sideboxActive) {
+          sideboxActive.value = state.sideboxActive;
+          sidebarData.value = state.sidebarData;
+        }
+      }, props.menuHoverTimeout);
+    };
+    const onMenuItemClick = (item, e) => {
+      const path = item.index;
+      const trigger = props.itemTrigger;
+      if (!path || trigger !== "click" && trigger !== "hover") {
+        return;
+      }
+      if (props.beforeClick && props.beforeClick(item, e) === false) {
+        return;
+      }
+      if (isExternalLink(path)) {
+        e.stopPropagation();
+        window.open(path);
+        return;
+      }
+      sidebarActive.value = path;
+      if (path !== unref(currentRoute).fullPath) {
+        push(path);
+      }
+    };
+    const onSideMouseEnter = () => {
+      if (state.menuTimer != null) {
+        clearTimeout(state.menuTimer);
+        state.menuTimer = null;
+      }
+    };
+    const onSideMouseLeave = () => {
+      if (!state.isHover) {
+        return;
+      }
+      if (state.menuTimer != null) {
+        clearTimeout(state.menuTimer);
+        state.menuTimer = null;
+      }
+      state.menuTimer = setTimeout(() => {
+        state.isHover = false;
+        if (headerActive.value !== state.headerActive) {
+          headerActive.value = state.headerActive;
+          if (mixSidebar.value) {
+            sideboxData.value = state.sideboxData;
+          } else {
+            sidebarData.value = state.sidebarData;
+          }
+        }
+        if (mixSidebar.value && sideboxActive.value !== state.sideboxActive) {
+          sideboxActive.value = state.sideboxActive;
+          sidebarData.value = state.sidebarData;
+        }
+      }, props.menuHoverTimeout);
+    };
     watch(
       () => props.menus,
       () => {
@@ -462,11 +659,13 @@ const _sfc_main = defineComponent({
           sideboxData.value = sideboxData.value.map((d) => {
             return { ...d, children: d.tempChildren };
           });
+          state.sideboxData = sideboxData.value;
           return;
         }
         sideboxData.value = sideboxData.value.map((d) => {
           return { ...d, children: void 0 };
         });
+        state.sideboxData = sideboxData.value;
       }
     );
     watch(
@@ -527,7 +726,7 @@ const _sfc_main = defineComponent({
       props
     );
     const layoutProvide = computed(() => {
-      const state = {
+      const state2 = {
         mobile: mobile.value,
         collapse: props.collapse,
         compact: props.compact,
@@ -540,12 +739,10 @@ const _sfc_main = defineComponent({
         keepAlive: props.tabBar && props.keepAlive,
         responsive: props.responsive
       };
-      return state;
+      return state2;
     });
     provide(LAYOUT_KEY, layoutProvide);
     return {
-      authenticated,
-      watermark,
       contentRef,
       levelData,
       tabData,
@@ -576,8 +773,16 @@ const _sfc_main = defineComponent({
       onHeadMenuOpen,
       onHeadMenuClose,
       onNavItemClick,
+      onNavItemMouseenter,
+      onNavMouseEnter,
+      onNavMouseLeave,
       onBoxItemClick,
-      onMenuItemClick
+      onBoxItemMouseenter,
+      onBoxMouseEnter,
+      onBoxMouseLeave,
+      onMenuItemClick,
+      onSideMouseEnter,
+      onSideMouseLeave
     };
   }
 });
@@ -599,7 +804,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ProSidebar = resolveComponent("ProSidebar");
   const _component_ProTabs = resolveComponent("ProTabs");
   const _component_ProIframe = resolveComponent("ProIframe");
-  const _component_EleWatermark = resolveComponent("EleWatermark");
+  const _component_ReceiverView = resolveComponent("ReceiverView");
   const _component_ElBacktop = resolveComponent("ElBacktop");
   return openBlock(), createElementBlock("div", {
     class: normalizeClass(_ctx.layoutClass)
@@ -621,10 +826,15 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       breadcrumbSeparator: _ctx.breadcrumbSeparator,
       homePath: _ctx.homeMenuPath,
       isHome: _ctx.isHome,
+      menuTextEllipsisTooltip: _ctx.menuTextEllipsisTooltip,
+      menuTextEllipsisTooltipProps: _ctx.menuTextEllipsisTooltipProps,
       onLogoClick: _ctx.onLogoClick,
       onOpen: _ctx.onHeadMenuOpen,
       onClsoe: _ctx.onHeadMenuClose,
-      onItemClick: _ctx.onNavItemClick
+      onItemClick: _ctx.onNavItemClick,
+      onItemMouseenter: _ctx.onNavItemMouseenter,
+      onMouseEnter: _ctx.onNavMouseEnter,
+      onMouseLeave: _ctx.onNavMouseLeave
     }, createSlots({ _: 2 }, [
       renderList(Object.keys(_ctx.$slots).filter(
         (k) => ![
@@ -647,13 +857,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           ])
         };
       })
-    ]), 1032, ["menus", "headerStyle", "active", "ellipsis", "ellipsisProps", "menuTrigger", "itemTrigger", "collapse", "sidebar", "titleSlot", "iconSlot", "levels", "breadcrumb", "breadcrumbSeparator", "homePath", "isHome", "onLogoClick", "onOpen", "onClsoe", "onItemClick"]),
-    createVNode(_component_EleWatermark, {
+    ]), 1032, ["menus", "headerStyle", "active", "ellipsis", "ellipsisProps", "menuTrigger", "itemTrigger", "collapse", "sidebar", "titleSlot", "iconSlot", "levels", "breadcrumb", "breadcrumbSeparator", "homePath", "isHome", "menuTextEllipsisTooltip", "menuTextEllipsisTooltipProps", "onLogoClick", "onOpen", "onClsoe", "onItemClick", "onItemMouseenter", "onMouseEnter", "onMouseLeave"]),
+    createVNode(_component_ReceiverView, {
       class: "ele-admin-main",
-      height: 68,
-      disabled: _ctx.authenticated,
-      fixed: true,
-      content: _ctx.watermark
+      wrapPosition: false
     }, {
       default: withCtx(() => [
         _ctx.sidebox ? (openBlock(), createBlock(_component_ProSidebox, {
@@ -668,7 +875,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           itemTrigger: _ctx.boxTrigger,
           titleSlot: _ctx.sideboxTitleSlot,
           iconSlot: _ctx.sideboxIconSlot,
-          onItemClick: _ctx.onBoxItemClick
+          menuTextEllipsisTooltip: _ctx.menuTextEllipsisTooltip,
+          menuTextEllipsisTooltipProps: _ctx.menuTextEllipsisTooltipProps,
+          onItemClick: _ctx.onBoxItemClick,
+          onItemMouseenter: _ctx.onBoxItemMouseenter,
+          onMouseEnter: _ctx.onBoxMouseEnter,
+          onMouseLeave: _ctx.onBoxMouseLeave
         }, createSlots({ _: 2 }, [
           renderList(Object.keys(_ctx.$slots).filter(
             (k) => ![
@@ -694,7 +906,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ])
             };
           })
-        ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "compact", "collapse", "popperEffect", "itemTrigger", "titleSlot", "iconSlot", "onItemClick"])) : createCommentVNode("", true),
+        ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "compact", "collapse", "popperEffect", "itemTrigger", "titleSlot", "iconSlot", "menuTextEllipsisTooltip", "menuTextEllipsisTooltipProps", "onItemClick", "onItemMouseenter", "onMouseEnter", "onMouseLeave"])) : createCommentVNode("", true),
         _ctx.sidebar ? (openBlock(), createBlock(_component_ProSidebar, {
           key: 1,
           menus: _ctx.sidebarData,
@@ -708,9 +920,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           itemTrigger: _ctx.itemTrigger,
           titleSlot: _ctx.sidebarTitleSlot,
           iconSlot: _ctx.sidebarIconSlot,
+          menuTextEllipsisTooltip: _ctx.menuTextEllipsisTooltip,
+          menuTextEllipsisTooltipProps: _ctx.menuTextEllipsisTooltipProps,
           onOpen: _ctx.onSideMenuOpen,
           onClsoe: _ctx.onSideMenuClose,
-          onItemClick: _ctx.onMenuItemClick
+          onItemClick: _ctx.onMenuItemClick,
+          onMouseEnter: _ctx.onSideMouseEnter,
+          onMouseLeave: _ctx.onSideMouseLeave
         }, createSlots({ _: 2 }, [
           renderList(Object.keys(_ctx.$slots).filter(
             (k) => ![
@@ -736,7 +952,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ])
             };
           })
-        ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "collapse", "uniqueOpened", "defaultOpeneds", "popperEffect", "itemTrigger", "titleSlot", "iconSlot", "onOpen", "onClsoe", "onItemClick"])) : createCommentVNode("", true),
+        ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "collapse", "uniqueOpened", "defaultOpeneds", "popperEffect", "itemTrigger", "titleSlot", "iconSlot", "menuTextEllipsisTooltip", "menuTextEllipsisTooltipProps", "onOpen", "onClsoe", "onItemClick", "onMouseEnter", "onMouseLeave"])) : createCommentVNode("", true),
         createElementVNode("div", _hoisted_1, [
           _ctx.tabBar ? (openBlock(), createBlock(_component_ProTabs, {
             key: 0,
@@ -780,7 +996,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         ])
       ]),
       _: 3
-    }, 8, ["disabled", "content"]),
+    }),
     createElementVNode("div", {
       class: "ele-admin-mask",
       onClick: _cache[0] || (_cache[0] = (...args) => _ctx.updateCollapse && _ctx.updateCollapse(...args))

package/es/ele-pro-layout/props.d.ts

@@ -1,8 +1,9 @@
-import type { PropType, ExtractPropTypes } from 'vue';
-import type { EllipsisProps } from '../ele-menus/types';
-import type { ContextMenus } from '../ele-tabs/types';
-import type { EleDropdownProps } from '../ele-app/plus';
-import type { MenuItem, TabItem, Layout, SidebarLayout, HeaderStyle, SidebarStyle, TabStyle, MenuI18n, TabItemEventOption, BodySizeChangeOption, MenuItemTrigger, BeforeClick } from './types';
+import { MenuItem, TabItem, Layout, SidebarLayout, HeaderStyle, SidebarStyle, TabStyle, MenuI18n, TabItemEventOption, BodySizeChangeOption, MenuItemTrigger, BeforeClick } from './types';
+import { EleDropdownProps } from '../ele-app/plus';
+import { ContextMenus } from '../ele-tabs/types';
+import { EllipsisProps } from '../ele-menus/types';
+import { PropType, ExtractPropTypes } from 'vue';
+
 /**
  * 属性
  */
@@ -29,7 +30,7 @@ export declare const proLayoutProps: {
     };
     /** 面包屑导航分隔符 */
     breadcrumbSeparator: {
-        type: PropType<import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>))[], unknown, unknown> | undefined>;
+        type: PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>))[], unknown, unknown> | undefined>;
         default: string;
     };
     /** 是否需要返回顶部 */
@@ -63,7 +64,7 @@ export declare const proLayoutProps: {
     ellipsisProps: PropType<EllipsisProps>;
     /** 顶栏子菜单触发方式 */
     menuTrigger: {
-        type: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
+        type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
         default: string;
     };
     /** 布局类型 */
@@ -178,7 +179,7 @@ export declare const proLayoutProps: {
         default: string;
     };
     /** 菜单 tooltip 主题 */
-    tooltipEffect: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    tooltipEffect: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
     /** 顶栏菜单触发模式 */
     navTrigger: PropType<MenuItemTrigger>;
     /** 双侧栏一级菜单触发模式 */
@@ -187,6 +188,15 @@ export declare const proLayoutProps: {
     itemTrigger: PropType<MenuItemTrigger>;
     /** 菜单点击事件前钩子 */
     beforeClick: PropType<BeforeClick>;
+    /** hover模式的菜单切换超时 */
+    menuHoverTimeout: {
+        type: NumberConstructor;
+        default: number;
+    };
+    /** 是否开启菜单文本溢出提示 */
+    menuTextEllipsisTooltip: BooleanConstructor;
+    /** 菜单文本溢出提示属性 */
+    menuTextEllipsisTooltipProps: PropType<Partial<import('../ele-tooltip/props').TooltipProps>>;
     /** 是否支持内链缓存 */
     keepAlive: BooleanConstructor;
     /** 内链切换动画 */

package/es/ele-pro-layout/props.js

@@ -179,6 +179,15 @@ const proLayoutProps = {
   itemTrigger: String,
   /** 菜单点击事件前钩子 */
   beforeClick: Function,
+  /** hover模式的菜单切换超时 */
+  menuHoverTimeout: {
+    type: Number,
+    default: 600
+  },
+  /** 是否开启菜单文本溢出提示 */
+  menuTextEllipsisTooltip: Boolean,
+  /** 菜单文本溢出提示属性 */
+  menuTextEllipsisTooltipProps: Object,
   /** 是否支持内链缓存 */
   keepAlive: Boolean,
   /** 内链切换动画 */

package/es/ele-pro-layout/style/tabs.scss

@@ -20,7 +20,7 @@
 
 /* 顶栏阴影改分割线 */
 .ele-admin-open-tab:not(.ele-admin-tab-card) {
-  .ele-admin-header:not(.is-dark, .is-primary) {
+  .ele-admin-header:not(.is-dark):not(.is-primary) {
     box-shadow: 0 -0.8px 0 eleVar('header', 'line-color') inset;
   }
 }

package/es/ele-pro-layout/types.d.ts

@@ -230,12 +230,12 @@ export type BreadcrumbSeparator = ElBreadcrumbProps['separatorIcon'];
 /**
  * 混合模式菜单切换模式
  */
-export type MenuItemTrigger = 'route' | 'click';
+export type MenuItemTrigger = 'route' | 'click' | 'hover';
 
 /**
- * 菜单点击前钩子
+ * 子菜单项点击前钩子
  */
-export type BeforeClick = (item: EleMenuItemProps) => boolean;
+export type BeforeClick = (item: EleMenuItemProps, e: MouseEvent) => boolean;
 
 /**
  * 内链数据
@@ -245,9 +245,35 @@ export interface IframeItem {
   id: string;
   /** 地址 */
   src: string;
+  /** 是否是刷新状态 */
+  refresh?: boolean;
 }
 
 /**
  * 标签页标题组件实例
  */
 export type TabTitleInstance = InstanceType<typeof TabTitle> | null;
+
+/**
+ * 顶栏状态数据
+ */
+export interface HeaderState {
+  /** 是否是鼠标进入状态 */
+  hover: boolean;
+  /** 鼠标离开状态定时器 */
+  timer?: number | null;
+}
+
+/**
+ * 状态数据
+ */
+export interface LayoutState {
+  headerActive?: string;
+  sideboxActive?: string;
+  sidebarActive?: string;
+  headerData: MenuItem[];
+  sideboxData: MenuItem[];
+  sidebarData: MenuItem[];
+  menuTimer?: number | null;
+  isHover: boolean;
+}