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

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

@@ -1,5 +1,9 @@
 declare const _default: import('vue').DefineComponent<{
     total: import("vue").PropType<import("./types").PaginationTotal>;
+    hasNext: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     type: {
         type: import("vue").PropType<import("./types").PaginationType>;
         default: string;
@@ -32,6 +36,10 @@ declare const _default: import('vue').DefineComponent<{
     'update:pageSize': (_pageSize: number) => boolean;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     total: import("vue").PropType<import("./types").PaginationTotal>;
+    hasNext: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     type: {
         type: import("vue").PropType<import("./types").PaginationType>;
         default: string;
@@ -59,6 +67,7 @@ declare const _default: import('vue').DefineComponent<{
     "onUpdate:pageSize"?: ((_pageSize: number) => any) | undefined;
 }, {
     type: import("./types").PaginationType;
+    hasNext: boolean;
     pagerCount: number;
     layout: string;
     pageSizes: number[];

package/es/ele-pagination/index.js

@@ -10,7 +10,10 @@ const _sfc_main = defineComponent({
     const isInfinite = computed(() => "*" === props.total);
     const pageTotal = computed(() => {
       if (isInfinite.value) {
-        return Number.MAX_SAFE_INTEGER;
+        if (props.hasNext) {
+          return Number.MAX_SAFE_INTEGER;
+        }
+        return (props.currentPage || 1) * (props.pageSize || 10);
       }
       const num = props.total == null ? void 0 : Number(props.total);
       return num == null || isNaN(num) ? void 0 : num;

package/es/ele-pagination/props.d.ts

@@ -7,6 +7,11 @@ import { PropType, ExtractPropTypes } from 'vue';
 export declare const paginationProps: {
     /** 总条目数 */
     total: PropType<PaginationTotal>;
+    /** 是否还有下一页 */
+    hasNext: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     /** 风格 */
     type: {
         type: PropType<PaginationType>;

package/es/ele-pagination/props.js

@@ -3,6 +3,11 @@ const paginationProps = {
   ...paginationProps$1,
   /** 总条目数 */
   total: [String, Number],
+  /** 是否还有下一页 */
+  hasNext: {
+    type: Boolean,
+    default: true
+  },
   /** 风格 */
   type: {
     type: String,

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

@@ -37,7 +37,6 @@ declare const _default: import('vue').DefineComponent<{
     bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     contentStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
-    width: import("element-plus/es/utils/index").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
     offset: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, undefined, boolean>;
     effect: {
         readonly default: "light";
@@ -72,6 +71,7 @@ declare const _default: import('vue').DefineComponent<{
     hideAfter: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
     autoClose: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     title: StringConstructor;
+    width: import("element-plus/es/utils/index").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
     popperClass: StringConstructor;
     bg: StringConstructor;
     arrowOffset: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
@@ -153,7 +153,6 @@ declare const _default: import('vue').DefineComponent<{
     bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     contentStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
-    width: import("element-plus/es/utils/index").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
     offset: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, undefined, boolean>;
     effect: {
         readonly default: "light";
@@ -188,6 +187,7 @@ declare const _default: import('vue').DefineComponent<{
     hideAfter: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
     autoClose: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     title: StringConstructor;
+    width: import("element-plus/es/utils/index").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
     popperClass: StringConstructor;
     bg: StringConstructor;
     arrowOffset: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
@@ -220,7 +220,6 @@ declare const _default: import('vue').DefineComponent<{
     onConfirm?: ((_e: MouseEvent) => any) | undefined;
     onCancel?: ((_e: MouseEvent) => any) | undefined;
 }, {
-    width: import("element-plus/es/utils/index").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
     offset: number;
     trigger: import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils/typescript").Arrayable<import("element-plus").TooltipTriggerType>) | ((new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils/typescript").Arrayable<import("element-plus").TooltipTriggerType>))[], unknown, unknown> | undefined;
     effect: string;
@@ -242,6 +241,7 @@ declare const _default: import('vue').DefineComponent<{
     showAfter: number;
     hideAfter: number;
     autoClose: number;
+    width: import("element-plus/es/utils/index").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
     confirmButtonType: import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "" | "default" | "success" | "warning" | "info" | "text" | "primary" | "danger", unknown> | undefined;
     cancelButtonType: import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "" | "default" | "success" | "warning" | "info" | "text" | "primary" | "danger", unknown> | undefined;
     iconColor: string;

package/es/ele-popconfirm/index.js

@@ -1,7 +1,8 @@
 import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createElementVNode, normalizeClass, normalizeStyle, normalizeProps, resolveDynamicComponent, createCommentVNode, createElementBlock, renderSlot, createTextVNode, toDisplayString } from "vue";
 import { ElIcon, ElButton, useLocale } from "element-plus";
-import { omit } from "../utils/core";
+import { pick } from "../utils/core";
 import EleTooltip from "../ele-tooltip/index";
+import { tooltipPropKeys } from "../ele-tooltip/props";
 import { QuestionCircleFilled } from "../icons";
 import { popconfirmProps, popconfirmEmits } from "./props";
 const _sfc_main = defineComponent({
@@ -13,33 +14,10 @@ const _sfc_main = defineComponent({
     const { t } = useLocale();
     const tooltipRef = ref(null);
     const tooltipProps = computed(() => {
-      const options = omit(props, [
-        "title",
-        "content",
-        "bodyClass",
-        "bodyStyle",
-        "titleStyle",
-        "contentStyle",
-        "confirmButtonText",
-        "cancelButtonText",
-        "confirmButtonType",
-        "cancelButtonType",
-        "icon",
-        "iconColor",
-        "hideIcon",
-        "hideConfirmButton",
-        "hideCancelButton",
-        "iconStyle",
-        "iconProps",
-        "confirmButtonProps",
-        "cancelButtonProps",
-        "footerStyle",
-        "onUpdate:visible",
-        "onBefore-enter",
-        "onBefore-leave",
-        "onAfter-enter",
-        "onAfter-leave"
-      ]);
+      const keys = tooltipPropKeys.filter(
+        (k) => !["content", "bodyStyle"].includes(k)
+      );
+      const options = pick(props, keys);
       options.ariaLabel = props.title;
       options.gpuAcceleration = props.transition === "el-fade-in-linear";
       const classes = ["ele-popconfirm"];

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

@@ -9,6 +9,7 @@ declare const _default: import('vue').DefineComponent<{
     bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     contentStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    title: StringConstructor;
     width: import("element-plus/es/utils/index").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
     offset: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, undefined, boolean>;
     trigger: import("element-plus/es/utils/index").EpPropFinalized<(new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils/typescript").Arrayable<import("element-plus").TooltipTriggerType>) | ((new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils/typescript").Arrayable<import("element-plus").TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
@@ -44,7 +45,6 @@ declare const _default: import('vue').DefineComponent<{
     showAfter: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     hideAfter: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
     autoClose: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
-    title: StringConstructor;
     popperClass: StringConstructor;
     bg: StringConstructor;
     arrowOffset: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
@@ -92,6 +92,7 @@ declare const _default: import('vue').DefineComponent<{
     bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     contentStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    title: StringConstructor;
     width: import("element-plus/es/utils/index").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
     offset: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, undefined, boolean>;
     trigger: import("element-plus/es/utils/index").EpPropFinalized<(new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils/typescript").Arrayable<import("element-plus").TooltipTriggerType>) | ((new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils/typescript").Arrayable<import("element-plus").TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
@@ -127,7 +128,6 @@ declare const _default: import('vue').DefineComponent<{
     showAfter: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     hideAfter: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
     autoClose: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
-    title: StringConstructor;
     popperClass: StringConstructor;
     bg: StringConstructor;
     arrowOffset: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;

package/es/ele-popover/index.js

@@ -1,6 +1,7 @@
 import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createElementVNode, normalizeClass, normalizeStyle, renderSlot, createElementBlock, createTextVNode, toDisplayString, createCommentVNode } from "vue";
-import { omit } from "../utils/core";
+import { pick } from "../utils/core";
 import EleTooltip from "../ele-tooltip/index";
+import { tooltipPropKeys } from "../ele-tooltip/props";
 import { popoverProps, popoverEmits } from "./props";
 const _sfc_main = defineComponent({
   name: "ElePopover",
@@ -10,19 +11,10 @@ const _sfc_main = defineComponent({
   setup(props, { emit }) {
     const tooltipRef = ref(null);
     const tooltipProps = computed(() => {
-      const options = omit(props, [
-        "title",
-        "content",
-        "bodyClass",
-        "bodyStyle",
-        "titleStyle",
-        "contentStyle",
-        "onUpdate:visible",
-        "onBefore-enter",
-        "onBefore-leave",
-        "onAfter-enter",
-        "onAfter-leave"
-      ]);
+      const keys = tooltipPropKeys.filter(
+        (k) => !["content", "bodyStyle"].includes(k)
+      );
+      const options = pick(props, keys);
       options.ariaLabel = props.title;
       options.gpuAcceleration = props.transition === "el-fade-in-linear";
       return options;

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

@@ -1,5 +1,6 @@
-import { MenuItem, LevelItem, HeaderStyle, MenuItemTrigger, MenuItemProps } from '../types';
-import { EllipsisProps } from '../../ele-menus/types';
+import { MenuItem, LevelItem, HeaderStyle, MenuItemTrigger, MenuItemProps, TabStyle, TabItem, TabItemEventOption } from '../types';
+import { ContextMenus } from '../../ele-tabs/types';
+import { EleDropdownProps } from '../../ele-app/plus';
 import { BreadcrumbItem } from '../../ele-breadcrumb/types';
 import { PropType } from 'vue';
 
@@ -16,7 +17,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 菜单是否省略多余的子项 */
     ellipsis: BooleanConstructor;
     /** 菜单省略项的属性 */
-    ellipsisProps: PropType<EllipsisProps>;
+    ellipsisProps: PropType<import("../../ele-menus/types").EllipsisProps | undefined>;
     /** 父级菜单展开触发方式 */
     menuTrigger: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
     /** 子菜单项触发模式 */
@@ -43,15 +44,36 @@ declare const _default: import('vue').DefineComponent<{
     /** 当前路由是否是主页 */
     isHome: BooleanConstructor;
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: BooleanConstructor;
-    /** 菜单文本溢出提示属性 */
-    menuTextEllipsisTooltipProps: PropType<Partial<import("../../ele-tooltip/props").TooltipProps>>;
+    menuTextEllipsisTooltip: PropType<boolean | Partial<import("../../ele-tooltip/props").TooltipProps> | undefined>;
+    /** 页签数据 */
+    tabs: {
+        type: PropType<TabItem[]>;
+        required: true;
+    };
+    /** 页签选中 */
+    tabActive: {
+        type: StringConstructor;
+        required: true;
+    };
+    /** 是否需要固定的主页页签 */
+    fixedHome: BooleanConstructor;
+    /** 页签风格 */
+    tabStyle: PropType<TabStyle>;
+    /** 是否支持右键菜单 */
+    tabContextMenu: PropType<boolean | EleDropdownProps>;
+    /** 右键菜单 */
+    tabContextMenus: PropType<ContextMenus>;
+    /** 是否支持拖动排序 */
+    tabSortable: BooleanConstructor;
+    /** 是否需要页签栏 */
+    tabBar: PropType<boolean | "header">;
 }, {
     levelItems: import("vue").ShallowRef<BreadcrumbItem[]>;
     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>;
+    hasTab: import("vue").ComputedRef<boolean>;
     onLogoClick: () => void;
     onOpen: (index: string, indexPath: string[]) => void;
     onClose: (index: string, indexPath: string[]) => void;
@@ -60,6 +82,10 @@ declare const _default: import('vue').DefineComponent<{
     onItemMouseleave: (item: MenuItemProps, e: MouseEvent) => void;
     onMouseenter: (e: MouseEvent) => void;
     onMouseleave: (e: MouseEvent) => void;
+    onTabClick: (opt: TabItemEventOption) => void;
+    onTabRemove: (opt: TabItemEventOption) => void;
+    onTabContextMenu: (opt: TabItemEventOption) => void;
+    onTabSortChange: (data: TabItem[]) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     logoClick: () => true;
     open: (_index: string, _indexPath: string[]) => true;
@@ -69,6 +95,10 @@ declare const _default: import('vue').DefineComponent<{
     itemMouseleave: (_item: MenuItemProps, _e: MouseEvent) => true;
     mouseEnter: (_e: MouseEvent) => true;
     mouseLeave: (_e: MouseEvent) => true;
+    tabClick: (_opt: TabItemEventOption) => true;
+    tabRemove: (_opt: TabItemEventOption) => true;
+    tabContextMenu: (_opt: TabItemEventOption) => true;
+    tabSortChange: (_data: TabItem[]) => true;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /** 菜单数据 */
     menus: {
@@ -82,7 +112,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 菜单是否省略多余的子项 */
     ellipsis: BooleanConstructor;
     /** 菜单省略项的属性 */
-    ellipsisProps: PropType<EllipsisProps>;
+    ellipsisProps: PropType<import("../../ele-menus/types").EllipsisProps | undefined>;
     /** 父级菜单展开触发方式 */
     menuTrigger: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
     /** 子菜单项触发模式 */
@@ -109,13 +139,37 @@ declare const _default: import('vue').DefineComponent<{
     /** 当前路由是否是主页 */
     isHome: BooleanConstructor;
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: BooleanConstructor;
-    /** 菜单文本溢出提示属性 */
-    menuTextEllipsisTooltipProps: PropType<Partial<import("../../ele-tooltip/props").TooltipProps>>;
+    menuTextEllipsisTooltip: PropType<boolean | Partial<import("../../ele-tooltip/props").TooltipProps> | undefined>;
+    /** 页签数据 */
+    tabs: {
+        type: PropType<TabItem[]>;
+        required: true;
+    };
+    /** 页签选中 */
+    tabActive: {
+        type: StringConstructor;
+        required: true;
+    };
+    /** 是否需要固定的主页页签 */
+    fixedHome: BooleanConstructor;
+    /** 页签风格 */
+    tabStyle: PropType<TabStyle>;
+    /** 是否支持右键菜单 */
+    tabContextMenu: PropType<boolean | EleDropdownProps>;
+    /** 右键菜单 */
+    tabContextMenus: PropType<ContextMenus>;
+    /** 是否支持拖动排序 */
+    tabSortable: BooleanConstructor;
+    /** 是否需要页签栏 */
+    tabBar: PropType<boolean | "header">;
 }>> & {
     onOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
+    onTabClick?: ((_opt: TabItemEventOption) => any) | undefined;
+    onTabRemove?: ((_opt: TabItemEventOption) => any) | undefined;
     onItemClick?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
+    onTabContextMenu?: ((_opt: TabItemEventOption) => any) | undefined;
+    onTabSortChange?: ((_data: TabItem[]) => 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;
@@ -126,7 +180,8 @@ declare const _default: import('vue').DefineComponent<{
     ellipsis: boolean;
     breadcrumb: boolean;
     sidebar: boolean;
-    menuTextEllipsisTooltip: boolean;
+    fixedHome: boolean;
+    tabSortable: boolean;
     isHome: boolean;
 }, {}>;
 export default _default;

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

@@ -1,11 +1,12 @@
-import { defineComponent, shallowRef, computed, watch, onBeforeUnmount, resolveComponent, openBlock, createElementBlock, normalizeClass, renderSlot, createCommentVNode, createVNode, createElementVNode, createBlock, createSlots, withCtx, normalizeProps, guardReactiveProps } from "vue";
+import { defineComponent, shallowRef, computed, watch, onBeforeUnmount, resolveComponent, openBlock, createElementBlock, normalizeClass, renderSlot, createCommentVNode, createVNode, createBlock, createSlots, withCtx, normalizeProps, guardReactiveProps, renderList } from "vue";
 import { HomeOutlined } from "../../icons";
 import EleBreadcrumb from "../../ele-breadcrumb/index";
 import EleMenus from "../../ele-menus/index";
 import { getMenuItems } from "../util";
+import ProTabs from "./pro-tabs";
 const _sfc_main = defineComponent({
   name: "ProHeader",
-  components: { EleBreadcrumb, EleMenus },
+  components: { EleBreadcrumb, EleMenus, ProTabs },
   props: {
     /** 菜单数据 */
     menus: {
@@ -46,9 +47,29 @@ const _sfc_main = defineComponent({
     /** 当前路由是否是主页 */
     isHome: Boolean,
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: Boolean,
-    /** 菜单文本溢出提示属性 */
-    menuTextEllipsisTooltipProps: Object
+    menuTextEllipsisTooltip: [Boolean, Object],
+    /** 页签数据 */
+    tabs: {
+      type: Array,
+      required: true
+    },
+    /** 页签选中 */
+    tabActive: {
+      type: String,
+      required: true
+    },
+    /** 是否需要固定的主页页签 */
+    fixedHome: Boolean,
+    /** 页签风格 */
+    tabStyle: String,
+    /** 是否支持右键菜单 */
+    tabContextMenu: [Boolean, Object],
+    /** 右键菜单 */
+    tabContextMenus: [Array, Function],
+    /** 是否支持拖动排序 */
+    tabSortable: Boolean,
+    /** 是否需要页签栏 */
+    tabBar: [Boolean, String]
   },
   emits: {
     logoClick: () => true,
@@ -58,7 +79,11 @@ const _sfc_main = defineComponent({
     itemMouseenter: (_item, _e) => true,
     itemMouseleave: (_item, _e) => true,
     mouseEnter: (_e) => true,
-    mouseLeave: (_e) => true
+    mouseLeave: (_e) => true,
+    tabClick: (_opt) => true,
+    tabRemove: (_opt) => true,
+    tabContextMenu: (_opt) => true,
+    tabSortChange: (_data) => true
   },
   setup(props, { emit }) {
     const state = { hover: false, timer: null };
@@ -74,6 +99,7 @@ const _sfc_main = defineComponent({
     const isIconSeparator = computed(() => {
       return typeof props.breadcrumbSeparator !== "string";
     });
+    const hasTab = computed(() => props.tabBar === "header");
     const onLogoClick = () => {
       emit("logoClick");
     };
@@ -114,6 +140,18 @@ const _sfc_main = defineComponent({
         emit("mouseLeave", e);
       }, 300);
     };
+    const onTabClick = (opt) => {
+      emit("tabClick", opt);
+    };
+    const onTabRemove = (opt) => {
+      emit("tabRemove", opt);
+    };
+    const onTabContextMenu = (opt) => {
+      emit("tabContextMenu", opt);
+    };
+    const onTabSortChange = (data) => {
+      emit("tabSortChange", data);
+    };
     watch(
       [() => props.isHome, () => props.homePath, () => props.levels],
       () => {
@@ -151,6 +189,7 @@ const _sfc_main = defineComponent({
       isDark,
       isPrimary,
       isIconSeparator,
+      hasTab,
       onLogoClick,
       onOpen,
       onClose,
@@ -158,7 +197,11 @@ const _sfc_main = defineComponent({
       onItemMouseenter,
       onItemMouseleave,
       onMouseenter,
-      onMouseleave
+      onMouseleave,
+      onTabClick,
+      onTabRemove,
+      onTabContextMenu,
+      onTabSortChange
     };
   }
 });
@@ -177,19 +220,24 @@ const _hoisted_2 = {
   key: 2,
   class: "ele-admin-breadcrumb"
 };
-const _hoisted_3 = { class: "ele-admin-menus" };
-const _hoisted_4 = {
+const _hoisted_3 = {
   key: 3,
+  class: "ele-admin-menus"
+};
+const _hoisted_4 = {
+  key: 5,
   class: "ele-admin-tools"
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_EleBreadcrumb = resolveComponent("EleBreadcrumb");
   const _component_EleMenus = resolveComponent("EleMenus");
+  const _component_ProTabs = resolveComponent("ProTabs");
   return openBlock(), createElementBlock("div", {
     class: normalizeClass([
       "ele-admin-header",
       { "is-dark": _ctx.isDark },
-      { "is-primary": _ctx.isPrimary }
+      { "is-primary": _ctx.isPrimary },
+      { "is-ghost": !_ctx.isDark && !_ctx.isPrimary && _ctx.hasTab && _ctx.tabStyle === "button" }
     ]),
     onMouseenter: _cache[1] || (_cache[1] = (...args) => _ctx.onMouseenter && _ctx.onMouseenter(...args)),
     onMouseleave: _cache[2] || (_cache[2] = (...args) => _ctx.onMouseleave && _ctx.onMouseleave(...args))
@@ -222,7 +270,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       ])
     ])) : createCommentVNode("", true),
     renderSlot(_ctx.$slots, "center", { sidebar: _ctx.sidebar }),
-    createElementVNode("div", _hoisted_3, [
+    _ctx.menuItems.length || !_ctx.hasTab ? (openBlock(), createElementBlock("div", _hoisted_3, [
       _ctx.menuItems.length ? (openBlock(), createBlock(_component_EleMenus, {
         key: 0,
         items: _ctx.menuItems,
@@ -234,33 +282,75 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         defaultActive: _ctx.active,
         menuTrigger: _ctx.menuTrigger,
         textEllipsisTooltip: _ctx.menuTextEllipsisTooltip,
-        textEllipsisTooltipProps: _ctx.menuTextEllipsisTooltipProps,
         onOpen: _ctx.onOpen,
         onClose: _ctx.onClose,
         onItemClick: _ctx.onItemClick,
         onItemMouseenter: _ctx.onItemMouseenter,
         onItemMouseleave: _ctx.onItemMouseleave
       }, createSlots({ _: 2 }, [
-        _ctx.iconSlot && !["logo", "left", "right", "center", "breadcrumb"].includes(
-          _ctx.iconSlot
-        ) && _ctx.$slots[_ctx.iconSlot] ? {
+        _ctx.iconSlot && ![
+          "logo",
+          "left",
+          "right",
+          "center",
+          "breadcrumb",
+          "tabTitle",
+          "tabContext",
+          "tabExtra",
+          "tabHome"
+        ].includes(_ctx.iconSlot) && _ctx.$slots[_ctx.iconSlot] ? {
           name: "icon",
           fn: withCtx((slotProps) => [
             renderSlot(_ctx.$slots, _ctx.iconSlot, normalizeProps(guardReactiveProps(slotProps || {})))
           ]),
           key: "0"
         } : void 0,
-        _ctx.titleSlot && !["logo", "left", "right", "center", "breadcrumb"].includes(
-          _ctx.titleSlot
-        ) && _ctx.$slots[_ctx.titleSlot] ? {
+        _ctx.titleSlot && ![
+          "logo",
+          "left",
+          "right",
+          "center",
+          "breadcrumb",
+          "tabTitle",
+          "tabContext",
+          "tabExtra",
+          "tabHome"
+        ].includes(_ctx.titleSlot) && _ctx.$slots[_ctx.titleSlot] ? {
           name: "title",
           fn: withCtx((slotProps) => [
             renderSlot(_ctx.$slots, _ctx.titleSlot, normalizeProps(guardReactiveProps(slotProps || {})))
           ]),
           key: "1"
         } : void 0
-      ]), 1032, ["items", "theme", "popupTheme", "ellipsis", "ellipsisProps", "defaultActive", "menuTrigger", "textEllipsisTooltip", "textEllipsisTooltipProps", "onOpen", "onClose", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : createCommentVNode("", true)
-    ]),
+      ]), 1032, ["items", "theme", "popupTheme", "ellipsis", "ellipsisProps", "defaultActive", "menuTrigger", "textEllipsisTooltip", "onOpen", "onClose", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : createCommentVNode("", true)
+    ])) : createCommentVNode("", true),
+    _ctx.hasTab ? (openBlock(), createBlock(_component_ProTabs, {
+      key: 4,
+      tabs: _ctx.tabs,
+      active: _ctx.tabActive,
+      tabStyle: _ctx.tabStyle,
+      fixedHome: _ctx.fixedHome,
+      homePath: _ctx.homePath,
+      isHome: _ctx.isHome,
+      tabContextMenu: _ctx.tabContextMenu,
+      tabContextMenus: _ctx.tabContextMenus,
+      tabSortable: _ctx.tabSortable,
+      onTabClick: _ctx.onTabClick,
+      onTabRemove: _ctx.onTabRemove,
+      onTabContextMenu: _ctx.onTabContextMenu,
+      onTabSortChange: _ctx.onTabSortChange
+    }, createSlots({ _: 2 }, [
+      renderList(Object.keys(_ctx.$slots).filter(
+        (k) => ["tabTitle", "tabContext", "tabExtra", "tabHome"].includes(k)
+      ), (name) => {
+        return {
+          name,
+          fn: withCtx((slotProps) => [
+            renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
+          ])
+        };
+      })
+    ]), 1032, ["tabs", "active", "tabStyle", "fixedHome", "homePath", "isHome", "tabContextMenu", "tabContextMenus", "tabSortable", "onTabClick", "onTabRemove", "onTabContextMenu", "onTabSortChange"])) : createCommentVNode("", true),
     _ctx.$slots.right ? (openBlock(), createElementBlock("div", _hoisted_4, [
       renderSlot(_ctx.$slots, "right", { sidebar: _ctx.sidebar })
     ])) : createCommentVNode("", true)

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

@@ -29,9 +29,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: BooleanConstructor;
-    /** 菜单文本溢出提示属性 */
-    menuTextEllipsisTooltipProps: PropType<Partial<import("../../ele-tooltip/props").TooltipProps>>;
+    menuTextEllipsisTooltip: PropType<boolean | Partial<import("../../ele-tooltip/props").TooltipProps> | undefined>;
 }, {
     menusRef: import("vue").Ref<ElScrollbarInstance>;
     menuItems: import("vue").ComputedRef<Partial<import("../../ele-menus/types").MenuItem>[]>;
@@ -73,9 +71,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 菜单图标插槽名称 */
     iconSlot: StringConstructor;
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: BooleanConstructor;
-    /** 菜单文本溢出提示属性 */
-    menuTextEllipsisTooltipProps: PropType<Partial<import("../../ele-tooltip/props").TooltipProps>>;
+    menuTextEllipsisTooltip: PropType<boolean | Partial<import("../../ele-tooltip/props").TooltipProps> | undefined>;
 }>> & {
     onOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
@@ -86,6 +82,5 @@ 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

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