ele-admin-plus 1.1.6-beta.1 → 1.1.6-beta.3

package/lib/ele-printer/util.js

@@ -28,7 +28,7 @@ function doPrint(option) {
     if (option.title != null && option.title !== "") {
       document.title = option.title;
     }
-    window.print();
+    window.print(option.options);
     $html.classList.remove(printingClass);
     document.body.removeChild(elem);
     if (option.title != null) {
@@ -55,6 +55,7 @@ function doPrintOnFrame(opt) {
     el.setAttribute("value", el.value);
   });
   pDoc.open();
+  const printOption = opt.options ? `JSON.parse('${JSON.stringify(opt.options)}')` : "";
   const optHtml = `
   <style type="text/css" media="print">
     ${getOptionCss(opt)}
@@ -68,7 +69,7 @@ function doPrintOnFrame(opt) {
       if(${opt.title == null ? 0 : 1}) {
         document.title = '${opt.title}';
       }
-      window.print();
+      window.print(${printOption});
       window.parent.postMessage('elePrintDone_${opt.printId}', '*');
     };
   <\/script>
@@ -112,6 +113,12 @@ function getOptionCss(opt) {
   css.push("}");
   return css.join(" ");
 }
+function mergeOptions(options, userOptions) {
+  if (options == null) {
+    return userOptions;
+  }
+  return Object.assign({}, options, userOptions);
+}
 function usePrinter(done) {
   const printId = core.uuid(8);
   const onMessage = (e) => {
@@ -131,7 +138,7 @@ function printPdf(option) {
   pFrame.onload = () => {
     if (!!pFrame.getAttribute("src")) {
       pFrame.focus();
-      pFrame.contentWindow && pFrame.contentWindow.print();
+      pFrame.contentWindow && pFrame.contentWindow.print(option.options);
       option.done && option.done();
     }
   };
@@ -166,6 +173,7 @@ exports.doPrintOnFrame = doPrintOnFrame;
 exports.getOptionCss = getOptionCss;
 exports.getPrintContainer = getPrintContainer;
 exports.getPrintFrame = getPrintFrame;
+exports.mergeOptions = mergeOptions;
 exports.printContainerId = printContainerId;
 exports.printFrameId = printFrameId;
 exports.printPdf = printPdf;

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

@@ -17,7 +17,7 @@ declare const _default: import("vue").DefineComponent<{
     /** 菜单省略项的属性 */
     ellipsisProps: PropType<EllipsisProps>;
     /** 子菜单触发方式 */
-    menuTrigger: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
+    menuTrigger: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
     /** 菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
     /** 侧栏是否折叠 */
@@ -36,14 +36,14 @@ declare const _default: import("vue").DefineComponent<{
     /** 是否显示面包屑导航 */
     breadcrumb: BooleanConstructor;
     /** 面包屑导航分隔符 */
-    breadcrumbSeparator: PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>))[], unknown, unknown> | undefined>;
+    breadcrumbSeparator: PropType<import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>))[], unknown, unknown> | undefined>;
     /** 主页路由地址 */
     homePath: StringConstructor;
     /** 当前路由是否是主页 */
     isHome: BooleanConstructor;
 }, {
     levelItems: import("vue").ShallowRef<BreadcrumbItem[]>;
-    menuItems: import("vue").ComputedRef<MenuItemProps[]>;
+    menuItems: import("vue").ComputedRef<Partial<import("../../ele-menus/types").MenuItem>[]>;
     isDark: import("vue").ComputedRef<boolean>;
     isPrimary: import("vue").ComputedRef<boolean>;
     isIconSeparator: import("vue").ComputedRef<boolean>;
@@ -71,7 +71,7 @@ declare const _default: import("vue").DefineComponent<{
     /** 菜单省略项的属性 */
     ellipsisProps: PropType<EllipsisProps>;
     /** 子菜单触发方式 */
-    menuTrigger: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
+    menuTrigger: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
     /** 菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
     /** 侧栏是否折叠 */
@@ -90,7 +90,7 @@ declare const _default: import("vue").DefineComponent<{
     /** 是否显示面包屑导航 */
     breadcrumb: BooleanConstructor;
     /** 面包屑导航分隔符 */
-    breadcrumbSeparator: PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>))[], unknown, unknown> | undefined>;
+    breadcrumbSeparator: PropType<import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>))[], unknown, unknown> | undefined>;
     /** 主页路由地址 */
     homePath: StringConstructor;
     /** 当前路由是否是主页 */
@@ -98,7 +98,7 @@ declare const _default: import("vue").DefineComponent<{
 }>> & {
     onOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
-    onItemClick?: ((_item: MenuItemProps) => any) | undefined;
+    onItemClick?: ((_item: Partial<import("../../ele-menus/types").MenuItem>) => any) | undefined;
     onLogoClick?: (() => any) | undefined;
 }, {
     collapse: boolean;

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

@@ -41,7 +41,7 @@ const _sfc_main = vue.defineComponent({
     /** 是否显示面包屑导航 */
     breadcrumb: Boolean,
     /** 面包屑导航分隔符 */
-    breadcrumbSeparator: [String, Object],
+    breadcrumbSeparator: [String, Object, Function],
     /** 主页路由地址 */
     homePath: String,
     /** 当前路由是否是主页 */
@@ -81,6 +81,7 @@ const _sfc_main = vue.defineComponent({
         const data = [];
         if (!props.isHome) {
           data.push({
+            key: props.homePath,
             to: props.homePath,
             icon: icons.HomeOutlined,
             iconStyle: {
@@ -182,14 +183,18 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         onClose: _ctx.onClose,
         onItemClick: _ctx.onItemClick
       }, vue.createSlots({ _: 2 }, [
-        _ctx.iconSlot && _ctx.$slots[_ctx.iconSlot] ? {
+        _ctx.iconSlot && !["logo", "left", "right", "center", "breadcrumb"].includes(
+          _ctx.iconSlot
+        ) && _ctx.$slots[_ctx.iconSlot] ? {
           name: "icon",
           fn: vue.withCtx((slotProps) => [
             vue.renderSlot(_ctx.$slots, _ctx.iconSlot, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
           ]),
           key: "0"
         } : void 0,
-        _ctx.titleSlot && _ctx.$slots[_ctx.titleSlot] ? {
+        _ctx.titleSlot && !["logo", "left", "right", "center", "breadcrumb"].includes(
+          _ctx.titleSlot
+        ) && _ctx.$slots[_ctx.titleSlot] ? {
           name: "title",
           fn: vue.withCtx((slotProps) => [
             vue.renderSlot(_ctx.$slots, _ctx.titleSlot, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))

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

@@ -20,7 +20,7 @@ declare const _default: import("vue").DefineComponent<{
     /** 默认展开的子菜单 */
     defaultOpeneds: PropType<string[]>;
     /** tooltip 主题 */
-    popperEffect: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown>>;
+    popperEffect: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
     /** 菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
     /** 标题插槽名称 */
@@ -29,7 +29,7 @@ declare const _default: import("vue").DefineComponent<{
     iconSlot: StringConstructor;
 }, {
     menusRef: import("vue").Ref<ElScrollbarInstance>;
-    menuItems: import("vue").ComputedRef<MenuItemProps[]>;
+    menuItems: import("vue").ComputedRef<Partial<import("../../ele-menus/types").MenuItem>[]>;
     onOpen: (index: string, indexPath: string[]) => void;
     onClose: (index: string, indexPath: string[]) => void;
     onItemClick: (item: MenuItemProps) => void;
@@ -56,7 +56,7 @@ declare const _default: import("vue").DefineComponent<{
     /** 默认展开的子菜单 */
     defaultOpeneds: PropType<string[]>;
     /** tooltip 主题 */
-    popperEffect: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown>>;
+    popperEffect: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
     /** 菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
     /** 标题插槽名称 */
@@ -66,7 +66,7 @@ declare const _default: import("vue").DefineComponent<{
 }>> & {
     onOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
-    onItemClick?: ((_item: MenuItemProps) => any) | undefined;
+    onItemClick?: ((_item: Partial<import("../../ele-menus/types").MenuItem>) => any) | undefined;
 }, {
     uniqueOpened: boolean;
     collapse: boolean;

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

@@ -82,7 +82,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       class: "ele-admin-menus"
     }, {
       default: vue.withCtx(() => [
-        vue.createVNode(_component_EleMenus, {
+        _ctx.menuItems.length ? (vue.openBlock(), vue.createBlock(_component_EleMenus, {
+          key: 0,
           items: _ctx.menuItems,
           theme: _ctx.sidebarStyle,
           colorful: _ctx.colorfulIcon,
@@ -96,21 +97,21 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           onClose: _ctx.onClose,
           onItemClick: _ctx.onItemClick
         }, vue.createSlots({ _: 2 }, [
-          _ctx.iconSlot && _ctx.$slots[_ctx.iconSlot] ? {
+          _ctx.iconSlot && !["top", "bottom"].includes(_ctx.iconSlot) && _ctx.$slots[_ctx.iconSlot] ? {
             name: "icon",
             fn: vue.withCtx((slotProps) => [
               vue.renderSlot(_ctx.$slots, _ctx.iconSlot, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
             ]),
             key: "0"
           } : void 0,
-          _ctx.titleSlot && _ctx.$slots[_ctx.titleSlot] ? {
+          _ctx.titleSlot && !["top", "bottom"].includes(_ctx.titleSlot) && _ctx.$slots[_ctx.titleSlot] ? {
             name: "title",
             fn: vue.withCtx((slotProps) => [
               vue.renderSlot(_ctx.$slots, _ctx.titleSlot, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
             ]),
             key: "1"
           } : void 0
-        ]), 1032, ["items", "theme", "colorful", "collapse", "defaultActive", "defaultOpeneds", "uniqueOpened", "popperEffect", "onOpen", "onClose", "onItemClick"])
+        ]), 1032, ["items", "theme", "colorful", "collapse", "defaultActive", "defaultOpeneds", "uniqueOpened", "popperEffect", "onOpen", "onClose", "onItemClick"])) : vue.createCommentVNode("", true)
       ]),
       _: 3
     }, 512),

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

@@ -18,7 +18,7 @@ declare const _default: import("vue").DefineComponent<{
     /** 二级侧栏是否折叠 */
     collapse: BooleanConstructor;
     /** tooltip 主题 */
-    popperEffect: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown>>;
+    popperEffect: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
     /** 菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
     /** 标题插槽名称 */
@@ -27,7 +27,7 @@ declare const _default: import("vue").DefineComponent<{
     iconSlot: StringConstructor;
 }, {
     menusRef: import("vue").Ref<ElScrollbarInstance>;
-    menuItems: import("vue").ComputedRef<MenuItemProps[]>;
+    menuItems: import("vue").ComputedRef<Partial<import("../../ele-menus/types").MenuItem>[]>;
     onItemClick: (item: MenuItemProps) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     itemClick: (_item: MenuItemProps) => true;
@@ -48,7 +48,7 @@ declare const _default: import("vue").DefineComponent<{
     /** 二级侧栏是否折叠 */
     collapse: BooleanConstructor;
     /** tooltip 主题 */
-    popperEffect: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown>>;
+    popperEffect: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
     /** 菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
     /** 标题插槽名称 */
@@ -56,7 +56,7 @@ declare const _default: import("vue").DefineComponent<{
     /** 图标插槽名称 */
     iconSlot: StringConstructor;
 }>> & {
-    onItemClick?: ((_item: MenuItemProps) => any) | undefined;
+    onItemClick?: ((_item: Partial<import("../../ele-menus/types").MenuItem>) => any) | undefined;
 }, {
     collapse: boolean;
     compact: boolean;

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

@@ -72,7 +72,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       class: "ele-admin-menus"
     }, {
       default: vue.withCtx(() => [
-        vue.createVNode(_component_EleMenus, {
+        _ctx.menuItems.length ? (vue.openBlock(), vue.createBlock(_component_EleMenus, {
+          key: 0,
           items: _ctx.menuItems,
           theme: _ctx.sidebarStyle,
           popupColorful: _ctx.colorfulIcon,
@@ -85,21 +86,21 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           tooltipDisabled: !_ctx.compact,
           onItemClick: _ctx.onItemClick
         }, vue.createSlots({ _: 2 }, [
-          _ctx.iconSlot && _ctx.$slots[_ctx.iconSlot] ? {
+          _ctx.iconSlot && !["boxTop", "boxBottom"].includes(_ctx.iconSlot) && _ctx.$slots[_ctx.iconSlot] ? {
             name: "icon",
             fn: vue.withCtx((slotProps) => [
               vue.renderSlot(_ctx.$slots, _ctx.iconSlot, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
             ]),
             key: "0"
           } : void 0,
-          _ctx.titleSlot && _ctx.$slots[_ctx.titleSlot] ? {
+          _ctx.titleSlot && !["boxTop", "boxBottom"].includes(_ctx.titleSlot) && _ctx.$slots[_ctx.titleSlot] ? {
             name: "title",
             fn: vue.withCtx((slotProps) => [
               vue.renderSlot(_ctx.$slots, _ctx.titleSlot, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
             ]),
             key: "1"
           } : void 0
-        ]), 1032, ["items", "theme", "popupColorful", "collapse", "defaultActive", "popperEffect", "tooltipDisabled", "onItemClick"])
+        ]), 1032, ["items", "theme", "popupColorful", "collapse", "defaultActive", "popperEffect", "tooltipDisabled", "onItemClick"])) : vue.createCommentVNode("", true)
       ]),
       _: 3
     }, 512),

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

@@ -1,6 +1,6 @@
 import type { PropType } from 'vue';
 import type { TabPaneItem, TabEventOption, ContextMenus } from '../../ele-tabs/types';
-import type { EleDropdownProps, EleDropdownInstance, EleTabsInstance } from '../../ele-app/types/components';
+import type { EleDropdownProps, EleDropdownInstance, EleTabsInstance } from '../../ele-app/types';
 import type { TabItem, TabStyle, TabItemEventOption, TabTitleInstance } from '../types';
 declare const _default: import("vue").DefineComponent<{
     /** 页签数据 */
@@ -68,10 +68,10 @@ declare const _default: import("vue").DefineComponent<{
     /** 是否支持拖动排序 */
     tabSortable: BooleanConstructor;
 }>> & {
-    onTabContextMenu?: ((_opt: TabItemEventOption) => any) | undefined;
-    onTabSortChange?: ((_data: TabItem[]) => any) | undefined;
     onTabClick?: ((_opt: TabItemEventOption) => any) | undefined;
     onTabRemove?: ((_opt: TabItemEventOption) => any) | undefined;
+    onTabContextMenu?: ((_opt: TabItemEventOption) => any) | undefined;
+    onTabSortChange?: ((_data: TabItem[]) => any) | undefined;
 }, {
     fixedHome: boolean;
     isHome: boolean;

package/lib/ele-pro-layout/components/tab-dropdown.d.ts

@@ -1,6 +1,6 @@
 import type { PropType } from 'vue';
 import type { DropdownItem } from '../../ele-dropdown/types';
-import type { EleDropdownProps, EleDropdownInstance } from '../../ele-app/types/components';
+import type { EleDropdownProps, EleDropdownInstance } from '../../ele-app/types';
 declare const _default: import("vue").DefineComponent<{
     /** 右键菜单 */
     items: PropType<DropdownItem[]>;

package/lib/ele-pro-layout/components/tab-dropdown.js

@@ -59,13 +59,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_EleTabTool = vue.resolveComponent("EleTabTool");
   return vue.openBlock(), vue.createBlock(_component_EleTabTool, null, {
     default: vue.withCtx(() => [
-      vue.createVNode(_component_EleDropdown, vue.mergeProps(_ctx.dropdownProps, {
-        ref: "dropdownRef",
+      vue.createVNode(_component_EleDropdown, vue.mergeProps({
         placement: "bottom-end",
         popperClass: "ele-tab-popup",
         popperOptions: {
           modifiers: [{ name: "offset", options: { offset: [12, 8] } }]
-        },
+        }
+      }, _ctx.dropdownProps, {
+        ref: "dropdownRef",
         items: _ctx.items,
         onCommand: _ctx.onCommand
       }), vue.createSlots({

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

@@ -16,7 +16,7 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     breadcrumbSeparator: {
-        type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>))[], unknown, unknown> | undefined>;
+        type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>))[], unknown, unknown> | undefined>;
         default: string;
     };
     backTop: {
@@ -42,7 +42,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     ellipsisProps: import("vue").PropType<import("../ele-menus/types").EllipsisProps>;
     menuTrigger: {
-        type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
+        type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
         default: string;
     };
     layout: {
@@ -91,19 +91,18 @@ declare const _default: import("vue").DefineComponent<{
     homePath: StringConstructor;
     redirectPath: {
         type: StringConstructor;
-        /** 主页地址 */
         default: string;
     };
     locale: StringConstructor;
     i18n: import("vue").PropType<import("./types").MenuI18n>;
     sidebarOpeneds: import("vue").PropType<string[]>;
-    tabContextMenu: import("vue").PropType<boolean | import("../ele-app/types/components").EleDropdownProps>;
+    tabContextMenu: import("vue").PropType<boolean | import("../ele-app/types").EleDropdownProps>;
     tabContextMenus: import("vue").PropType<import("../ele-tabs/types").ContextMenus>;
     tabSortable: BooleanConstructor; /** 是否混合导航布局 */
     autoScrollTop: {
         type: BooleanConstructor;
         default: boolean;
-    }; /** 是否双侧栏布局 */
+    };
     headerTitleSlot: {
         type: StringConstructor;
         default: string;
@@ -125,10 +124,10 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
     sideboxIconSlot: {
-        type: StringConstructor; /** 布局类名 */
+        type: StringConstructor;
         default: string;
     };
-    tooltipEffect: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    tooltipEffect: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
     navTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
     boxTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
     itemTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
@@ -207,7 +206,7 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     breadcrumbSeparator: {
-        type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>))[], unknown, unknown> | undefined>;
+        type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>))[], unknown, unknown> | undefined>;
         default: string;
     };
     backTop: {
@@ -233,7 +232,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     ellipsisProps: import("vue").PropType<import("../ele-menus/types").EllipsisProps>;
     menuTrigger: {
-        type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
+        type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
         default: string;
     };
     layout: {
@@ -282,19 +281,18 @@ declare const _default: import("vue").DefineComponent<{
     homePath: StringConstructor;
     redirectPath: {
         type: StringConstructor;
-        /** 主页地址 */
         default: string;
     };
     locale: StringConstructor;
     i18n: import("vue").PropType<import("./types").MenuI18n>;
     sidebarOpeneds: import("vue").PropType<string[]>;
-    tabContextMenu: import("vue").PropType<boolean | import("../ele-app/types/components").EleDropdownProps>;
+    tabContextMenu: import("vue").PropType<boolean | import("../ele-app/types").EleDropdownProps>;
     tabContextMenus: import("vue").PropType<import("../ele-tabs/types").ContextMenus>;
     tabSortable: BooleanConstructor; /** 是否混合导航布局 */
     autoScrollTop: {
         type: BooleanConstructor;
         default: boolean;
-    }; /** 是否双侧栏布局 */
+    };
     headerTitleSlot: {
         type: StringConstructor;
         default: string;
@@ -316,10 +314,10 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
     sideboxIconSlot: {
-        type: StringConstructor; /** 布局类名 */
+        type: StringConstructor;
         default: string;
     };
-    tooltipEffect: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    tooltipEffect: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
     navTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
     boxTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
     itemTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
@@ -335,14 +333,14 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
 }>> & {
-    onTabContextMenu?: ((_option: TabItemEventOption) => any) | undefined;
-    onTabSortChange?: ((_data: TabItem[]) => any) | undefined;
     onTabClick?: ((_option: TabItemEventOption) => any) | undefined;
     onTabRemove?: ((_option: TabItemEventOption) => any) | undefined;
     onTabAdd?: ((_data: TabItem) => any) | undefined;
+    "onUpdate:maximized"?: ((_val: boolean) => any) | undefined;
+    onTabContextMenu?: ((_option: TabItemEventOption) => any) | undefined;
+    onTabSortChange?: ((_data: TabItem[]) => any) | undefined;
     onLogoClick?: ((_isHome: boolean) => any) | undefined;
     "onUpdate:collapse"?: ((_collapse: boolean) => any) | undefined;
-    "onUpdate:maximized"?: ((_val: boolean) => any) | undefined;
     onSideMenuOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onSideMenuClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onHeadMenuOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
@@ -350,25 +348,25 @@ declare const _default: import("vue").DefineComponent<{
     onBodySizeChange?: ((_option: import("./types").BodySizeChangeOption) => any) | undefined;
 }, {
     uniqueOpened: boolean;
-    menuTrigger: import("element-plus/es/utils").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined;
+    menuTrigger: import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined;
     collapse: boolean;
     ellipsis: boolean;
-    transitionDelay: number;
+    breadcrumb: boolean;
+    layout: import("./types").Layout;
     maximized: boolean;
-    compact: boolean;
+    transitionDelay: number;
     expanded: boolean;
+    compact: boolean;
+    responsive: boolean;
     tabBar: boolean;
     keepAlive: boolean;
-    responsive: boolean;
-    layout: import("./types").Layout;
-    breadcrumb: boolean;
-    breadcrumbSeparator: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>))[], unknown, unknown> | undefined;
+    headerStyle: import("./types").HeaderStyle;
+    breadcrumbSeparator: import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>))[], unknown, unknown> | undefined;
     backTop: boolean;
     backTopVisibilityHeight: number;
     backTopRight: number;
     backTopBottom: number;
     sidebarLayout: import("./types").SidebarLayout;
-    headerStyle: import("./types").HeaderStyle;
     sidebarStyle: import("./types").SidebarStyle;
     tabStyle: import("./types").TabStyle;
     fixedHeader: boolean;

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

@@ -627,7 +627,20 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       onClsoe: _ctx.onHeadMenuClose,
       onItemClick: _ctx.onNavItemClick
     }, vue.createSlots({ _: 2 }, [
-      vue.renderList(Object.keys(_ctx.$slots), (name) => {
+      vue.renderList(Object.keys(_ctx.$slots).filter(
+        (k) => ![
+          "default",
+          "top",
+          "bottom",
+          "boxTop",
+          "boxBottom",
+          "footer",
+          "tabTitle",
+          "tabContext",
+          "tabExtra",
+          "tabHome"
+        ].includes(k)
+      ), (name) => {
         return {
           name,
           fn: vue.withCtx((slotProps) => [
@@ -658,7 +671,23 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           iconSlot: _ctx.sideboxIconSlot,
           onItemClick: _ctx.onBoxItemClick
         }, vue.createSlots({ _: 2 }, [
-          vue.renderList(Object.keys(_ctx.$slots), (name) => {
+          vue.renderList(Object.keys(_ctx.$slots).filter(
+            (k) => ![
+              "default",
+              "logo",
+              "left",
+              "right",
+              "center",
+              "breadcrumb",
+              "top",
+              "bottom",
+              "footer",
+              "tabTitle",
+              "tabContext",
+              "tabExtra",
+              "tabHome"
+            ].includes(k)
+          ), (name) => {
             return {
               name,
               fn: vue.withCtx((slotProps) => [
@@ -684,7 +713,23 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           onClsoe: _ctx.onSideMenuClose,
           onItemClick: _ctx.onMenuItemClick
         }, vue.createSlots({ _: 2 }, [
-          vue.renderList(Object.keys(_ctx.$slots), (name) => {
+          vue.renderList(Object.keys(_ctx.$slots).filter(
+            (k) => ![
+              "default",
+              "logo",
+              "left",
+              "right",
+              "center",
+              "breadcrumb",
+              "boxTop",
+              "boxBottom",
+              "footer",
+              "tabTitle",
+              "tabContext",
+              "tabExtra",
+              "tabHome"
+            ].includes(k)
+          ), (name) => {
             return {
               name,
               fn: vue.withCtx((slotProps) => [
@@ -710,7 +755,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             onTabContextMenu: _ctx.onTabContextMenu,
             onTabSortChange: _ctx.onTabSortChange
           }, vue.createSlots({ _: 2 }, [
-            vue.renderList(Object.keys(_ctx.$slots), (name) => {
+            vue.renderList(Object.keys(_ctx.$slots).filter(
+              (k) => ["tabTitle", "tabContext", "tabExtra", "tabHome"].includes(k)
+            ), (name) => {
               return {
                 name,
                 fn: vue.withCtx((slotProps) => [

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

@@ -1,7 +1,7 @@
 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/types/components';
+import type { EleDropdownProps } from '../ele-app/types';
 import type { MenuItem, TabItem, Layout, SidebarLayout, HeaderStyle, SidebarStyle, TabStyle, MenuI18n, TabItemEventOption, BodySizeChangeOption, MenuItemTrigger, BeforeClick } from './types';
 /**
  * 属性
@@ -29,7 +29,7 @@ export declare const proLayoutProps: {
     };
     /** 面包屑导航分隔符 */
     breadcrumbSeparator: {
-        type: PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>))[], 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>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>))[], unknown, unknown> | undefined>;
         default: string;
     };
     /** 是否需要返回顶部 */
@@ -63,7 +63,7 @@ export declare const proLayoutProps: {
     ellipsisProps: PropType<EllipsisProps>;
     /** 顶栏子菜单触发方式 */
     menuTrigger: {
-        type: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
+        type: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
         default: string;
     };
     /** 布局类型 */
@@ -178,7 +178,7 @@ export declare const proLayoutProps: {
         default: string;
     };
     /** 菜单 tooltip 主题 */
-    tooltipEffect: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    tooltipEffect: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
     /** 顶栏菜单触发模式 */
     navTrigger: PropType<MenuItemTrigger>;
     /** 双侧栏一级菜单触发模式 */

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

@@ -23,7 +23,7 @@ const proLayoutProps = {
   },
   /** 面包屑导航分隔符 */
   breadcrumbSeparator: {
-    type: [String, Object],
+    type: [String, Object, Function],
     default: "/"
   },
   /** 是否需要返回顶部 */