ele-admin-plus 1.1.9-beta.6 → 1.1.9-beta.8

package/es/ele-printer/index.d.ts

@@ -4,19 +4,19 @@ declare const _default: import("vue").DefineComponent<{
     bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     footerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     title: StringConstructor;
-    margin: (StringConstructor | NumberConstructor)[];
+    margin: (NumberConstructor | StringConstructor)[];
     direction: import("vue").PropType<string | null>;
     orientation: import("vue").PropType<import("./types").PrintOrientation | null>;
     target: import("vue").PropType<import("./types").PrintTarget | null>;
     static: BooleanConstructor;
-    options: ObjectConstructor; /** 是否显示 */
+    options: ObjectConstructor;
 }, {
     container: import("vue").ShallowRef<Element>;
     visible: import("vue").Ref<boolean>;
     isStatic: import("vue").ComputedRef<boolean>;
     print: (options?: any) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    'update:modelValue': (_value: boolean) => boolean;
+    'update:modelValue': (_value: boolean) => boolean; /** 打印 */
     done: () => boolean;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: BooleanConstructor;
@@ -24,17 +24,17 @@ declare const _default: import("vue").DefineComponent<{
     bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     footerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     title: StringConstructor;
-    margin: (StringConstructor | NumberConstructor)[];
+    margin: (NumberConstructor | StringConstructor)[];
     direction: import("vue").PropType<string | null>;
     orientation: import("vue").PropType<import("./types").PrintOrientation | null>;
     target: import("vue").PropType<import("./types").PrintTarget | null>;
     static: BooleanConstructor;
-    options: ObjectConstructor; /** 是否显示 */
+    options: ObjectConstructor;
 }>> & {
     "onUpdate:modelValue"?: ((_value: boolean) => any) | undefined;
     onDone?: (() => any) | undefined;
 }, {
-    modelValue: boolean;
     static: boolean;
+    modelValue: boolean;
 }, {}>;
 export default _default;

package/es/ele-printer/index.js

@@ -1,13 +1,13 @@
-import { defineComponent, shallowRef, ref, computed, watch, nextTick, openBlock, createBlock, Teleport, createElementVNode, normalizeClass, createElementBlock, normalizeStyle, renderSlot, createCommentVNode } from "vue";
-import { useLicense } from "../ele-config-provider/receiver";
+import { defineComponent, shallowRef, ref, computed, watch, nextTick, resolveComponent, openBlock, createBlock, Teleport, createElementVNode, normalizeClass, createElementBlock, normalizeStyle, renderSlot, createCommentVNode, createVNode, withCtx } from "vue";
+import ReceiverView from "../ele-config-provider/components/receiver-view";
 import { usePrinter, getPrintContainer, mergeOptions, doPrintOnFrame, doPrint } from "./util";
 import { printerProps, printerEmits } from "./props";
 const _sfc_main = defineComponent({
   name: "ElePrinter",
+  components: { ReceiverView },
   props: printerProps,
   emits: printerEmits,
   setup(props, { emit }) {
-    const { authenticated } = useLicense();
     const { printId } = usePrinter(() => {
       updateModelValue(false);
       onDone();
@@ -18,10 +18,6 @@ const _sfc_main = defineComponent({
       return props.static;
     });
     const print = (options) => {
-      if (!authenticated.value) {
-        updateModelValue(false);
-        return;
-      }
       visible.value = true;
       nextTick(() => {
         const option = {
@@ -71,6 +67,7 @@ const _export_sfc = (sfc, props) => {
 const _hoisted_1 = { key: 0 };
 const _hoisted_2 = { key: 1 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_ReceiverView = resolveComponent("ReceiverView");
   return openBlock(), createBlock(Teleport, {
     to: _ctx.container,
     disabled: _ctx.isStatic && !_ctx.visible
@@ -97,12 +94,15 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       createElementVNode("tbody", null, [
         createElementVNode("tr", null, [
           createElementVNode("td", null, [
-            createElementVNode("div", {
+            createVNode(_component_ReceiverView, {
               class: "ele-printer-body",
               style: normalizeStyle(_ctx.bodyStyle)
-            }, [
-              renderSlot(_ctx.$slots, "default")
-            ], 4)
+            }, {
+              default: withCtx(() => [
+                renderSlot(_ctx.$slots, "default")
+              ]),
+              _: 3
+            }, 8, ["style"])
           ])
         ])
       ]),

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

@@ -41,6 +41,10 @@ declare const _default: import("vue").DefineComponent<{
     homePath: StringConstructor;
     /** 当前路由是否是主页 */
     isHome: BooleanConstructor;
+    /** 是否开启菜单文本溢出提示 */
+    menuTextEllipsisTooltip: BooleanConstructor;
+    /** 菜单文本溢出提示属性 */
+    menuTextEllipsisTooltipProps: PropType<Partial<import("../../ele-tooltip/props").TooltipProps>>;
 }, {
     levelItems: import("vue").ShallowRef<BreadcrumbItem[]>;
     menuItems: import("vue").ComputedRef<Partial<import("../../ele-menus/types").MenuItem>[]>;
@@ -103,6 +107,10 @@ declare const _default: import("vue").DefineComponent<{
     homePath: StringConstructor;
     /** 当前路由是否是主页 */
     isHome: BooleanConstructor;
+    /** 是否开启菜单文本溢出提示 */
+    menuTextEllipsisTooltip: BooleanConstructor;
+    /** 菜单文本溢出提示属性 */
+    menuTextEllipsisTooltipProps: PropType<Partial<import("../../ele-tooltip/props").TooltipProps>>;
 }>> & {
     onOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
@@ -117,6 +125,7 @@ declare const _default: import("vue").DefineComponent<{
     ellipsis: boolean;
     breadcrumb: boolean;
     sidebar: boolean;
+    menuTextEllipsisTooltip: boolean;
     isHome: boolean;
 }, {}>;
 export default _default;

package/es/ele-pro-layout/components/pro-header.js

@@ -44,7 +44,11 @@ const _sfc_main = defineComponent({
     /** 主页路由地址 */
     homePath: String,
     /** 当前路由是否是主页 */
-    isHome: Boolean
+    isHome: Boolean,
+    /** 是否开启菜单文本溢出提示 */
+    menuTextEllipsisTooltip: Boolean,
+    /** 菜单文本溢出提示属性 */
+    menuTextEllipsisTooltipProps: Object
   },
   emits: {
     logoClick: () => true,
@@ -229,6 +233,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         ellipsisProps: _ctx.ellipsisProps,
         defaultActive: _ctx.active,
         menuTrigger: _ctx.menuTrigger,
+        textEllipsisTooltip: _ctx.menuTextEllipsisTooltip,
+        textEllipsisTooltipProps: _ctx.menuTextEllipsisTooltipProps,
         onOpen: _ctx.onOpen,
         onClose: _ctx.onClose,
         onItemClick: _ctx.onItemClick,
@@ -253,7 +259,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           ]),
           key: "1"
         } : void 0
-      ]), 1032, ["items", "theme", "popupTheme", "ellipsis", "ellipsisProps", "defaultActive", "menuTrigger", "onOpen", "onClose", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : createCommentVNode("", true)
+      ]), 1032, ["items", "theme", "popupTheme", "ellipsis", "ellipsisProps", "defaultActive", "menuTrigger", "textEllipsisTooltip", "textEllipsisTooltipProps", "onOpen", "onClose", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : createCommentVNode("", true)
     ]),
     _ctx.$slots.right ? (openBlock(), createElementBlock("div", _hoisted_4, [
       renderSlot(_ctx.$slots, "right", { sidebar: _ctx.sidebar })

package/es/ele-pro-layout/components/pro-sidebar.d.ts

@@ -27,6 +27,10 @@ declare const _default: import("vue").DefineComponent<{
     titleSlot: StringConstructor;
     /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
+    /** 是否开启菜单文本溢出提示 */
+    menuTextEllipsisTooltip: BooleanConstructor;
+    /** 菜单文本溢出提示属性 */
+    menuTextEllipsisTooltipProps: PropType<Partial<import("../../ele-tooltip/props").TooltipProps>>;
 }, {
     menusRef: import("vue").Ref<ElScrollbarInstance>;
     menuItems: import("vue").ComputedRef<Partial<import("../../ele-menus/types").MenuItem>[]>;
@@ -67,6 +71,10 @@ declare const _default: import("vue").DefineComponent<{
     titleSlot: StringConstructor;
     /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
+    /** 是否开启菜单文本溢出提示 */
+    menuTextEllipsisTooltip: BooleanConstructor;
+    /** 菜单文本溢出提示属性 */
+    menuTextEllipsisTooltipProps: PropType<Partial<import("../../ele-tooltip/props").TooltipProps>>;
 }>> & {
     onOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
@@ -77,5 +85,6 @@ declare const _default: import("vue").DefineComponent<{
     uniqueOpened: boolean;
     collapse: boolean;
     colorfulIcon: boolean;
+    menuTextEllipsisTooltip: boolean;
 }, {}>;
 export default _default;

package/es/ele-pro-layout/components/pro-sidebar.js

@@ -30,7 +30,11 @@ const _sfc_main = defineComponent({
     /** 菜单标题插槽名称 */
     titleSlot: String,
     /** 菜单图标插槽名称 */
-    iconSlot: String
+    iconSlot: String,
+    /** 是否开启菜单文本溢出提示 */
+    menuTextEllipsisTooltip: Boolean,
+    /** 菜单文本溢出提示属性 */
+    menuTextEllipsisTooltipProps: Object
   },
   emits: {
     open: (_index, _indexPath) => true,
@@ -114,6 +118,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           uniqueOpened: _ctx.uniqueOpened,
           popperEffect: _ctx.popperEffect,
           collapseTransition: false,
+          textEllipsisTooltip: _ctx.menuTextEllipsisTooltip,
+          textEllipsisTooltipProps: _ctx.menuTextEllipsisTooltipProps,
           onOpen: _ctx.onOpen,
           onClose: _ctx.onClose,
           onItemClick: _ctx.onItemClick
@@ -132,7 +138,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ]),
             key: "1"
           } : void 0
-        ]), 1032, ["items", "theme", "colorful", "collapse", "defaultActive", "defaultOpeneds", "uniqueOpened", "popperEffect", "onOpen", "onClose", "onItemClick"])) : createCommentVNode("", true)
+        ]), 1032, ["items", "theme", "colorful", "collapse", "defaultActive", "defaultOpeneds", "uniqueOpened", "popperEffect", "textEllipsisTooltip", "textEllipsisTooltipProps", "onOpen", "onClose", "onItemClick"])) : createCommentVNode("", true)
       ]),
       _: 3
     }, 512),

package/es/ele-pro-layout/components/pro-sidebox.d.ts

@@ -25,6 +25,10 @@ declare const _default: import("vue").DefineComponent<{
     titleSlot: StringConstructor;
     /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
+    /** 是否开启菜单文本溢出提示 */
+    menuTextEllipsisTooltip: BooleanConstructor;
+    /** 菜单文本溢出提示属性 */
+    menuTextEllipsisTooltipProps: PropType<Partial<import("../../ele-tooltip/props").TooltipProps>>;
 }, {
     menusRef: import("vue").Ref<ElScrollbarInstance>;
     menuItems: import("vue").ComputedRef<Partial<import("../../ele-menus/types").MenuItem>[]>;
@@ -63,6 +67,10 @@ declare const _default: import("vue").DefineComponent<{
     titleSlot: StringConstructor;
     /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
+    /** 是否开启菜单文本溢出提示 */
+    menuTextEllipsisTooltip: BooleanConstructor;
+    /** 菜单文本溢出提示属性 */
+    menuTextEllipsisTooltipProps: PropType<Partial<import("../../ele-tooltip/props").TooltipProps>>;
 }>> & {
     onItemClick?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
     onItemMouseenter?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
@@ -73,5 +81,6 @@ declare const _default: import("vue").DefineComponent<{
     collapse: boolean;
     compact: boolean;
     colorfulIcon: boolean;
+    menuTextEllipsisTooltip: boolean;
 }, {}>;
 export default _default;

package/es/ele-pro-layout/components/pro-sidebox.js

@@ -28,7 +28,11 @@ const _sfc_main = defineComponent({
     /** 菜单标题插槽名称 */
     titleSlot: String,
     /** 菜单图标插槽名称 */
-    iconSlot: String
+    iconSlot: String,
+    /** 是否开启菜单文本溢出提示 */
+    menuTextEllipsisTooltip: Boolean,
+    /** 菜单文本溢出提示属性 */
+    menuTextEllipsisTooltipProps: Object
   },
   emits: {
     itemClick: (_item, _e) => true,
@@ -47,7 +51,9 @@ const _sfc_main = defineComponent({
       return getMenuItems(
         props.menus,
         props.itemTrigger !== "click" && props.itemTrigger !== "hover"
-      );
+      ).map((d) => {
+        return { ...d, group: false };
+      });
     });
     const onItemClick = (item, e) => {
       emit("itemClick", item, e);
@@ -113,6 +119,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           collapseTransition: false,
           firstPopperClass: "ele-admin-sidebox-popup",
           tooltipDisabled: !_ctx.compact,
+          textEllipsisTooltip: _ctx.menuTextEllipsisTooltip,
+          textEllipsisTooltipProps: _ctx.menuTextEllipsisTooltipProps,
           onItemClick: _ctx.onItemClick,
           onItemMouseenter: _ctx.onItemMouseenter,
           onItemMouseleave: _ctx.onItemMouseleave
@@ -131,7 +139,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ]),
             key: "1"
           } : void 0
-        ]), 1032, ["items", "theme", "popupColorful", "collapse", "defaultActive", "popperEffect", "tooltipDisabled", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : createCommentVNode("", true)
+        ]), 1032, ["items", "theme", "popupColorful", "collapse", "defaultActive", "popperEffect", "tooltipDisabled", "textEllipsisTooltip", "textEllipsisTooltipProps", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : createCommentVNode("", true)
       ]),
       _: 3
     }, 512),

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

@@ -63,17 +63,17 @@ declare const _default: import("vue").DefineComponent<{
     };
     tabStyle: {
         type: import("vue").PropType<import("./types").TabStyle>;
-        default: string; /** 页签数据 */
-    }; /** 页签数据 */
+        default: string;
+    };
     fixedHeader: {
         type: BooleanConstructor;
-        default: boolean;
+        default: boolean; /** 菜单数据 */
     };
     fixedSidebar: BooleanConstructor;
     fixedBody: BooleanConstructor;
     fluid: {
         type: BooleanConstructor;
-        default: boolean; /** 顶栏菜单数据 */
+        default: boolean;
     };
     logoInHeader: BooleanConstructor;
     colorfulIcon: BooleanConstructor;
@@ -83,22 +83,22 @@ declare const _default: import("vue").DefineComponent<{
     };
     expanded: BooleanConstructor;
     compressOnEsc: BooleanConstructor;
+    /** 侧栏一级菜单选中 */
     fixedHome: {
         type: BooleanConstructor;
-        default: boolean;
+        default: boolean; /** 侧栏是否隐藏 */
     };
     homePath: StringConstructor;
     redirectPath: {
-        /** 侧栏是否隐藏 */
         type: StringConstructor;
         default: string;
     };
     locale: StringConstructor;
-    i18n: import("vue").PropType<import("./types").MenuI18n>; /** 页脚是否隐藏 */
-    sidebarOpeneds: import("vue").PropType<string[]>; /** 主页地址 */
+    i18n: import("vue").PropType<import("./types").MenuI18n>;
+    sidebarOpeneds: import("vue").PropType<string[]>;
     tabContextMenu: import("vue").PropType<boolean | import("../ele-app/plus").EleDropdownProps>;
     tabContextMenus: import("vue").PropType<import("../ele-tabs/types").ContextMenus>;
-    tabSortable: BooleanConstructor; /** 水印文本 */
+    tabSortable: BooleanConstructor;
     autoScrollTop: {
         type: BooleanConstructor;
         default: boolean;
@@ -132,6 +132,12 @@ declare const _default: import("vue").DefineComponent<{
     boxTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
     itemTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
     beforeClick: import("vue").PropType<import("./types").BeforeClick>;
+    menuHoverTimeout: {
+        type: NumberConstructor;
+        default: number;
+    };
+    menuTextEllipsisTooltip: BooleanConstructor;
+    menuTextEllipsisTooltipProps: import("vue").PropType<Partial<import("../ele-tooltip/props").TooltipProps>>;
     keepAlive: BooleanConstructor;
     transitionName: StringConstructor;
     transitionDelay: {
@@ -142,13 +148,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    menuHoverTimeout: {
-        type: NumberConstructor;
-        default: number;
-    };
 }, {
-    authenticated: Ref<boolean>;
-    watermark: Ref<string[]>;
     contentRef: Ref<HTMLElement | null>;
     levelData: import("vue").ShallowRef<LevelItem[]>;
     tabData: import("vue").ShallowRef<TabItem[]>;
@@ -265,17 +265,17 @@ declare const _default: import("vue").DefineComponent<{
     };
     tabStyle: {
         type: import("vue").PropType<import("./types").TabStyle>;
-        default: string; /** 页签数据 */
-    }; /** 页签数据 */
+        default: string;
+    };
     fixedHeader: {
         type: BooleanConstructor;
-        default: boolean;
+        default: boolean; /** 菜单数据 */
     };
     fixedSidebar: BooleanConstructor;
     fixedBody: BooleanConstructor;
     fluid: {
         type: BooleanConstructor;
-        default: boolean; /** 顶栏菜单数据 */
+        default: boolean;
     };
     logoInHeader: BooleanConstructor;
     colorfulIcon: BooleanConstructor;
@@ -285,22 +285,22 @@ declare const _default: import("vue").DefineComponent<{
     };
     expanded: BooleanConstructor;
     compressOnEsc: BooleanConstructor;
+    /** 侧栏一级菜单选中 */
     fixedHome: {
         type: BooleanConstructor;
-        default: boolean;
+        default: boolean; /** 侧栏是否隐藏 */
     };
     homePath: StringConstructor;
     redirectPath: {
-        /** 侧栏是否隐藏 */
         type: StringConstructor;
         default: string;
     };
     locale: StringConstructor;
-    i18n: import("vue").PropType<import("./types").MenuI18n>; /** 页脚是否隐藏 */
-    sidebarOpeneds: import("vue").PropType<string[]>; /** 主页地址 */
+    i18n: import("vue").PropType<import("./types").MenuI18n>;
+    sidebarOpeneds: import("vue").PropType<string[]>;
     tabContextMenu: import("vue").PropType<boolean | import("../ele-app/plus").EleDropdownProps>;
     tabContextMenus: import("vue").PropType<import("../ele-tabs/types").ContextMenus>;
-    tabSortable: BooleanConstructor; /** 水印文本 */
+    tabSortable: BooleanConstructor;
     autoScrollTop: {
         type: BooleanConstructor;
         default: boolean;
@@ -334,6 +334,12 @@ declare const _default: import("vue").DefineComponent<{
     boxTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
     itemTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
     beforeClick: import("vue").PropType<import("./types").BeforeClick>;
+    menuHoverTimeout: {
+        type: NumberConstructor;
+        default: number;
+    };
+    menuTextEllipsisTooltip: BooleanConstructor;
+    menuTextEllipsisTooltipProps: import("vue").PropType<Partial<import("../ele-tooltip/props").TooltipProps>>;
     keepAlive: BooleanConstructor;
     transitionName: StringConstructor;
     transitionDelay: {
@@ -344,10 +350,6 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    menuHoverTimeout: {
-        type: NumberConstructor;
-        default: number;
-    };
 }>> & {
     onTabClick?: ((_option: TabItemEventOption) => any) | undefined;
     onTabRemove?: ((_option: TabItemEventOption) => any) | undefined;
@@ -370,9 +372,9 @@ declare const _default: import("vue").DefineComponent<{
     breadcrumb: boolean;
     layout: import("./types").Layout;
     transitionDelay: number;
-    maximized: boolean;
-    compact: boolean;
     expanded: boolean;
+    compact: boolean;
+    maximized: boolean;
     tabBar: boolean;
     keepAlive: boolean;
     responsive: boolean;
@@ -403,5 +405,6 @@ declare const _default: import("vue").DefineComponent<{
     sideboxTitleSlot: string;
     sideboxIconSlot: string;
     menuHoverTimeout: number;
+    menuTextEllipsisTooltip: boolean;
 }, {}>;
 export default _default;

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,7 +25,6 @@ const _sfc_main = defineComponent({
   props: proLayoutProps,
   emits: proLayoutEmits,
   setup(props, { emit }) {
-    const { authenticated } = useLicense();
     const { currentRoute, push } = useRouter();
     const { disableTransition } = useDisableTransition();
     const state = {
@@ -52,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");
@@ -745,8 +743,6 @@ const _sfc_main = defineComponent({
     });
     provide(LAYOUT_KEY, layoutProvide);
     return {
-      authenticated,
-      watermark,
       contentRef,
       levelData,
       tabData,
@@ -808,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)
@@ -830,6 +826,8 @@ 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,
@@ -859,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", "onItemMouseenter", "onMouseEnter", "onMouseLeave"]),
-    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, {
@@ -880,6 +875,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           itemTrigger: _ctx.boxTrigger,
           titleSlot: _ctx.sideboxTitleSlot,
           iconSlot: _ctx.sideboxIconSlot,
+          menuTextEllipsisTooltip: _ctx.menuTextEllipsisTooltip,
+          menuTextEllipsisTooltipProps: _ctx.menuTextEllipsisTooltipProps,
           onItemClick: _ctx.onBoxItemClick,
           onItemMouseenter: _ctx.onBoxItemMouseenter,
           onMouseEnter: _ctx.onBoxMouseEnter,
@@ -909,7 +906,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ])
             };
           })
-        ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "compact", "collapse", "popperEffect", "itemTrigger", "titleSlot", "iconSlot", "onItemClick", "onItemMouseenter", "onMouseEnter", "onMouseLeave"])) : 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,
@@ -923,6 +920,8 @@ 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,
@@ -953,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", "onMouseEnter", "onMouseLeave"])) : 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,
@@ -997,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

@@ -187,6 +187,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;
     /** 内链切换动画 */
@@ -201,11 +210,6 @@ export declare const proLayoutProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    /** 菜单切换超时 */
-    menuHoverTimeout: {
-        type: NumberConstructor;
-        default: number;
-    };
 };
 export type ProLayoutProps = ExtractPropTypes<typeof proLayoutProps>;
 /**

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,
   /** 内链切换动画 */
@@ -192,11 +201,6 @@ const proLayoutProps = {
   responsive: {
     type: Boolean,
     default: true
-  },
-  /** 菜单切换超时 */
-  menuHoverTimeout: {
-    type: Number,
-    default: 600
   }
 };
 const proLayoutEmits = {