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

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

@@ -4,9 +4,10 @@ const icons = require("../../icons");
 const EleBreadcrumb = require("../../ele-breadcrumb/index");
 const EleMenus = require("../../ele-menus/index");
 const util = require("../util");
+const ProTabs = require("./pro-tabs");
 const _sfc_main = vue.defineComponent({
   name: "ProHeader",
-  components: { EleBreadcrumb, EleMenus },
+  components: { EleBreadcrumb, EleMenus, ProTabs },
   props: {
     /** 菜单数据 */
     menus: {
@@ -47,9 +48,29 @@ const _sfc_main = vue.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,
@@ -59,7 +80,11 @@ const _sfc_main = vue.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 };
@@ -75,6 +100,7 @@ const _sfc_main = vue.defineComponent({
     const isIconSeparator = vue.computed(() => {
       return typeof props.breadcrumbSeparator !== "string";
     });
+    const hasTab = vue.computed(() => props.tabBar === "header");
     const onLogoClick = () => {
       emit("logoClick");
     };
@@ -115,6 +141,18 @@ const _sfc_main = vue.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);
+    };
     vue.watch(
       [() => props.isHome, () => props.homePath, () => props.levels],
       () => {
@@ -152,6 +190,7 @@ const _sfc_main = vue.defineComponent({
       isDark,
       isPrimary,
       isIconSeparator,
+      hasTab,
       onLogoClick,
       onOpen,
       onClose,
@@ -159,7 +198,11 @@ const _sfc_main = vue.defineComponent({
       onItemMouseenter,
       onItemMouseleave,
       onMouseenter,
-      onMouseleave
+      onMouseleave,
+      onTabClick,
+      onTabRemove,
+      onTabContextMenu,
+      onTabSortChange
     };
   }
 });
@@ -178,19 +221,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 = vue.resolveComponent("EleBreadcrumb");
   const _component_EleMenus = vue.resolveComponent("EleMenus");
+  const _component_ProTabs = vue.resolveComponent("ProTabs");
   return vue.openBlock(), vue.createElementBlock("div", {
     class: vue.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))
@@ -223,7 +271,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       ])
     ])) : vue.createCommentVNode("", true),
     vue.renderSlot(_ctx.$slots, "center", { sidebar: _ctx.sidebar }),
-    vue.createElementVNode("div", _hoisted_3, [
+    _ctx.menuItems.length || !_ctx.hasTab ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3, [
       _ctx.menuItems.length ? (vue.openBlock(), vue.createBlock(_component_EleMenus, {
         key: 0,
         items: _ctx.menuItems,
@@ -235,33 +283,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
       }, vue.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: vue.withCtx((slotProps) => [
             vue.renderSlot(_ctx.$slots, _ctx.iconSlot, vue.normalizeProps(vue.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: vue.withCtx((slotProps) => [
             vue.renderSlot(_ctx.$slots, _ctx.titleSlot, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
           ]),
           key: "1"
         } : void 0
-      ]), 1032, ["items", "theme", "popupTheme", "ellipsis", "ellipsisProps", "defaultActive", "menuTrigger", "textEllipsisTooltip", "textEllipsisTooltipProps", "onOpen", "onClose", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : vue.createCommentVNode("", true)
-    ]),
+      ]), 1032, ["items", "theme", "popupTheme", "ellipsis", "ellipsisProps", "defaultActive", "menuTrigger", "textEllipsisTooltip", "onOpen", "onClose", "onItemClick", "onItemMouseenter", "onItemMouseleave"])) : vue.createCommentVNode("", true)
+    ])) : vue.createCommentVNode("", true),
+    _ctx.hasTab ? (vue.openBlock(), vue.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
+    }, vue.createSlots({ _: 2 }, [
+      vue.renderList(Object.keys(_ctx.$slots).filter(
+        (k) => ["tabTitle", "tabContext", "tabExtra", "tabHome"].includes(k)
+      ), (name) => {
+        return {
+          name,
+          fn: vue.withCtx((slotProps) => [
+            vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
+          ])
+        };
+      })
+    ]), 1032, ["tabs", "active", "tabStyle", "fixedHome", "homePath", "isHome", "tabContextMenu", "tabContextMenus", "tabSortable", "onTabClick", "onTabRemove", "onTabContextMenu", "onTabSortChange"])) : vue.createCommentVNode("", true),
     _ctx.$slots.right ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_4, [
       vue.renderSlot(_ctx.$slots, "right", { sidebar: _ctx.sidebar })
     ])) : vue.createCommentVNode("", true)

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

@@ -1,8 +1,10 @@
-import type { PropType } from 'vue';
+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 type { EllipsisProps } from '../../ele-menus/types';
-import type { MenuItem, LevelItem, HeaderStyle, MenuItemTrigger, MenuItemProps } from '../types';
-declare const _default: import("vue").DefineComponent<{
+import { PropType } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
     /** 菜单数据 */
     menus: {
         type: PropType<MenuItem[]>;
@@ -15,9 +17,9 @@ 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>;
+    menuTrigger: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
     /** 子菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
     /** 侧栏是否折叠 */
@@ -36,21 +38,42 @@ declare const _default: import("vue").DefineComponent<{
     /** 是否显示面包屑导航 */
     breadcrumb: BooleanConstructor;
     /** 面包屑导航分隔符 */
-    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, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>))[], unknown, unknown> | undefined>;
+    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, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>))[], unknown, unknown> | undefined>;
     /** 主页路由地址 */
     homePath: StringConstructor;
     /** 当前路由是否是主页 */
     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>;
+    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;
@@ -59,7 +82,11 @@ declare const _default: import("vue").DefineComponent<{
     onItemMouseleave: (item: MenuItemProps, e: MouseEvent) => void;
     onMouseenter: (e: MouseEvent) => void;
     onMouseleave: (e: MouseEvent) => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    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;
     close: (_index: string, _indexPath: string[]) => true;
@@ -68,7 +95,11 @@ declare const _default: import("vue").DefineComponent<{
     itemMouseleave: (_item: MenuItemProps, _e: MouseEvent) => true;
     mouseEnter: (_e: MouseEvent) => true;
     mouseLeave: (_e: MouseEvent) => true;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    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: {
         type: PropType<MenuItem[]>;
@@ -81,9 +112,9 @@ 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>;
+    menuTrigger: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
     /** 子菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
     /** 侧栏是否折叠 */
@@ -102,21 +133,45 @@ declare const _default: import("vue").DefineComponent<{
     /** 是否显示面包屑导航 */
     breadcrumb: BooleanConstructor;
     /** 面包屑导航分隔符 */
-    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, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions, {}, any>))[], unknown, unknown> | undefined>;
+    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, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>))[], unknown, unknown> | undefined>;
     /** 主页路由地址 */
     homePath: StringConstructor;
     /** 当前路由是否是主页 */
     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;
-    onItemClick?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
-    onItemMouseenter?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
-    onItemMouseleave?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
+    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;
     onMouseEnter?: ((_e: MouseEvent) => any) | undefined;
     onMouseLeave?: ((_e: MouseEvent) => any) | undefined;
@@ -124,8 +179,9 @@ declare const _default: import("vue").DefineComponent<{
     collapse: boolean;
     ellipsis: boolean;
     breadcrumb: boolean;
-    sidebar: boolean;
-    menuTextEllipsisTooltip: boolean;
+    fixedHome: boolean;
+    tabSortable: boolean;
     isHome: boolean;
+    sidebar: boolean;
 }, {}>;
 export default _default;

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

@@ -19,8 +19,6 @@ const _sfc_main = vue.defineComponent({
   },
   setup(props) {
     const state = { timer: null };
-    const visible = vue.ref(false);
-    const active = vue.ref(null);
     const data = vue.computed(() => {
       const list = [];
       props.tabData.forEach((t) => {
@@ -32,25 +30,29 @@ const _sfc_main = vue.defineComponent({
       });
       return list.sort((a, b) => a.id === b.id ? 0 : a.id > b.id ? 1 : -1);
     });
+    const dataActive = vue.computed(() => {
+      if (!props.tabActive || !data.value.length || !data.value.some((d) => d.id === props.tabActive)) {
+        return;
+      }
+      return props.tabActive;
+    });
+    const active = vue.ref(dataActive.value);
     const onAfterLeave = (delay) => {
-      if (props.tabActive && data.value.length && data.value.some((d) => d.id === props.tabActive)) {
-        if (delay) {
-          clearTimer();
-          state.timer = setTimeout(() => {
-            state.timer = null;
-            visible.value = true;
-            vue.nextTick(() => {
-              active.value = props.tabActive;
-            });
-          }, delay);
-        } else {
-          visible.value = true;
-          active.value = props.tabActive;
-        }
-      } else {
-        visible.value = false;
+      if (!dataActive.value) {
         active.value = null;
+        return;
       }
+      if (!delay) {
+        active.value = dataActive.value;
+        return;
+      }
+      clearTimer();
+      state.timer = setTimeout(() => {
+        state.timer = null;
+        vue.nextTick(() => {
+          active.value = dataActive.value;
+        });
+      }, delay);
     };
     const clearTimer = () => {
       if (state.timer != null) {
@@ -58,30 +60,20 @@ const _sfc_main = vue.defineComponent({
         state.timer = null;
       }
     };
-    vue.watch(
-      () => props.tabActive,
-      () => {
-        clearTimer();
-        if (visible.value) {
-          if (!props.transitionName) {
-            onAfterLeave();
-          } else {
-            active.value = null;
-          }
-          return;
-        }
+    vue.watch(dataActive, () => {
+      clearTimer();
+      if (active.value == null) {
         onAfterLeave(props.transitionName ? props.transitionDelay : void 0);
+      } else if (!props.transitionName) {
+        onAfterLeave();
+      } else {
+        active.value = null;
       }
-    );
+    });
     vue.onBeforeUnmount(() => {
       clearTimer();
     });
-    return {
-      active,
-      visible,
-      data,
-      onAfterLeave
-    };
+    return { active, data, onAfterLeave };
   }
 });
 const _export_sfc = (sfc, props) => {
@@ -95,7 +87,7 @@ const _hoisted_1 = { class: "ele-admin-iframe-wrap" };
 const _hoisted_2 = ["data-id", "src"];
 const _hoisted_3 = ["data-id", "src"];
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return vue.withDirectives((vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
+  return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
     !_ctx.transitionName ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(_ctx.data, (item) => {
       return vue.openBlock(), vue.createElementBlock(vue.Fragment, {
         key: item.id
@@ -133,8 +125,6 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       ]),
       _: 1
     }, 8, ["name"]))
-  ], 512)), [
-    [vue.vShow, _ctx.visible]
   ]);
 }
 const proIframe = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);

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

@@ -1,6 +1,7 @@
-import type { PropType } from 'vue';
-import type { TabItem, IframeItem } from '../types';
-declare const _default: import("vue").DefineComponent<{
+import { TabItem, IframeItem } from '../types';
+import { PropType } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
     /** 是否支持内链缓存 */
     keepAlive: BooleanConstructor;
     /** 内链切换动画 */
@@ -15,11 +16,10 @@ declare const _default: import("vue").DefineComponent<{
     /** 页签选中 */
     tabActive: StringConstructor;
 }, {
-    active: import("vue").Ref<string | null | undefined>;
-    visible: import("vue").Ref<boolean>;
-    data: import("vue").ComputedRef<IframeItem[]>;
+    active: import('vue').Ref<string | null | undefined>;
+    data: import('vue').ComputedRef<IframeItem[]>;
     onAfterLeave: (delay?: number) => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 是否支持内链缓存 */
     keepAlive: BooleanConstructor;
     /** 内链切换动画 */

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

@@ -33,9 +33,7 @@ const _sfc_main = vue.defineComponent({
     /** 菜单图标插槽名称 */
     iconSlot: String,
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: Boolean,
-    /** 菜单文本溢出提示属性 */
-    menuTextEllipsisTooltipProps: Object
+    menuTextEllipsisTooltip: [Boolean, Object]
   },
   emits: {
     open: (_index, _indexPath) => true,
@@ -120,7 +118,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
@@ -139,7 +136,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"])) : vue.createCommentVNode("", true)
+        ]), 1032, ["items", "theme", "colorful", "collapse", "defaultActive", "defaultOpeneds", "uniqueOpened", "popperEffect", "textEllipsisTooltip", "onOpen", "onClose", "onItemClick"])) : vue.createCommentVNode("", true)
       ]),
       _: 3
     }, 512),

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

@@ -1,7 +1,8 @@
-import type { PropType } from 'vue';
-import type { ElScrollbarInstance } from '../../ele-app/el';
-import type { MenuItem, SidebarStyle, MenuItemTrigger, MenuItemProps } from '../types';
-declare const _default: import("vue").DefineComponent<{
+import { MenuItem, SidebarStyle, MenuItemTrigger, MenuItemProps } from '../types';
+import { ElScrollbarInstance } from '../../ele-app/el';
+import { PropType } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
     /** 菜单数据 */
     menus: {
         type: PropType<MenuItem[]>;
@@ -20,7 +21,7 @@ declare const _default: import("vue").DefineComponent<{
     /** 默认展开的父级菜单 */
     defaultOpeneds: PropType<string[]>;
     /** 菜单折叠提示气泡主题 */
-    popperEffect: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    popperEffect: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
     /** 子菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
     /** 菜单标题插槽名称 */
@@ -28,24 +29,22 @@ 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>[]>;
+    menusRef: import('vue').Ref<ElScrollbarInstance>;
+    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, e: MouseEvent) => void;
     onMouseenter: (e: MouseEvent) => void;
     onMouseleave: (e: MouseEvent) => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     open: (_index: string, _indexPath: string[]) => true;
     close: (_index: string, _indexPath: string[]) => true;
     itemClick: (_item: MenuItemProps, _e: MouseEvent) => true;
     mouseEnter: (_e: MouseEvent) => true;
     mouseLeave: (_e: MouseEvent) => true;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 菜单数据 */
     menus: {
         type: PropType<MenuItem[]>;
@@ -64,7 +63,7 @@ declare const _default: import("vue").DefineComponent<{
     /** 默认展开的父级菜单 */
     defaultOpeneds: PropType<string[]>;
     /** 菜单折叠提示气泡主题 */
-    popperEffect: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    popperEffect: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
     /** 子菜单项触发模式 */
     itemTrigger: PropType<MenuItemTrigger>;
     /** 菜单标题插槽名称 */
@@ -72,19 +71,16 @@ 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;
-    onItemClick?: ((_item: Partial<import("../../ele-menus/types").MenuItem>, _e: MouseEvent) => any) | undefined;
+    onItemClick?: ((_item: Partial<import('../../ele-menus/types').MenuItem>, _e: MouseEvent) => any) | undefined;
     onMouseEnter?: ((_e: MouseEvent) => any) | undefined;
     onMouseLeave?: ((_e: MouseEvent) => any) | undefined;
 }, {
     uniqueOpened: boolean;
     collapse: boolean;
     colorfulIcon: boolean;
-    menuTextEllipsisTooltip: boolean;
 }, {}>;
 export default _default;