ele-admin-plus 1.4.1 → 1.5.0-beta.2

package/lib/ele-admin-layout/index.cjs

@@ -17,10 +17,13 @@ const _hoisted_3 = {
   key: 2,
   class: "ele-admin-breadcrumb"
 };
-const _hoisted_4 = ["data-tool-id"];
+const _hoisted_4 = {
+  key: 5,
+  class: "ele-admin-tools"
+};
 const _hoisted_5 = ["src"];
-const _hoisted_6 = ["data-side-id"];
-const _hoisted_7 = ["src"];
+const _hoisted_6 = ["src"];
+const _hoisted_7 = ["data-id"];
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...{ name: "EleAdminLayout" },
   __name: "index",
@@ -106,11 +109,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const getBodyWrapperEl = () => {
       const contentEl = getContentEl();
-      return contentEl == null ? void 0 : contentEl.parentElement;
+      return contentEl?.parentElement;
     };
     const sidebarScrollToActive = () => {
       stopSidebarMenuTimer();
-      if (!isFixedSidebar.value || !props$1.menuScrollToActive || sidebarMenuRef.value == null || isCollapseMobile.value || isMixSidebar.value && isCollapseSidebar.value) {
+      if (!(props$1.fixedBody || props$1.fixedSidebar) || !props$1.menuScrollToActive || sidebarMenuRef.value == null || isCollapseMobile.value || isMixSidebar.value && isCollapseSidebar.value) {
         return;
       }
       startSidebarMenuTimer(() => {
@@ -119,7 +122,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const sideboxScrollToActive = () => {
       stopSideboxMenuTimer();
-      if (!isFixedSidebar.value || !props$1.menuScrollToActive || sideboxMenuRef.value == null || isCollapseMobile.value) {
+      if (!(props$1.fixedBody || props$1.fixedSidebar) || !props$1.menuScrollToActive || sideboxMenuRef.value == null || isCollapseMobile.value) {
         return;
       }
       startSideboxMenuTimer(() => {
@@ -141,8 +144,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleHeadMenuClose = (index, indexPath) => {
       emit("headMenuClose", index, indexPath);
     };
-    const handleHeadMenuItemClick = (item, e) => {
-      emit("headMenuItemClick", item, e);
+    const handleHeadMenuItemClick = (item, e, type) => {
+      emit("headMenuItemClick", item, e, type);
     };
     const handleHeadMenuItemMouseenter = (item, e) => {
       emit("headMenuItemMouseenter", item, e);
@@ -165,8 +168,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         emit("headMouseleave", e);
       });
     };
-    const handleBoxMenuItemClick = (item, e) => {
-      emit("boxMenuItemClick", item, e);
+    const handleBoxMenuItemClick = (item, e, type) => {
+      emit("boxMenuItemClick", item, e, type);
     };
     const handleBoxMenuItemMouseenter = (item, e) => {
       emit("boxMenuItemMouseenter", item, e);
@@ -186,8 +189,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleSideMenuClose = (index, indexPath) => {
       emit("sideMenuClose", index, indexPath);
     };
-    const handleSideMenuItemClick = (item, e) => {
-      emit("sideMenuItemClick", item, e);
+    const handleSideMenuItemClick = (item, e, type) => {
+      emit("sideMenuItemClick", item, e, type);
     };
     const handleSideMouseEnter = (e) => {
       emit("sideMouseenter", e);
@@ -198,8 +201,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleTabClick = (option) => {
       emit("tabClick", option);
     };
-    const handleTabRemove = (name) => {
-      emit("tabRemove", name);
+    const handleTabRemove = (name, closeable) => {
+      if (closeable) {
+        emit("tabRemove", name);
+      }
     };
     const handleTabContextMenu = (option) => {
       emit("tabContextMenu", option);
@@ -288,17 +293,16 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           height: _ctx.fixedBody ? layoutHeight.value : void 0
         })
       }, {
-        head: vue.withCtx(({ params }) => [
+        head: vue.withCtx(() => [
           !isSideLayout.value ? (vue.openBlock(), vue.createElementBlock("div", {
             key: 0,
-            class: vue.normalizeClass([
-              "ele-admin-header",
+            class: vue.normalizeClass(["ele-admin-header", [
               { "is-dark": isDarkHeader.value },
               { "is-primary": isPrimaryHeader.value },
               { "is-ghost": isGhostHeader.value },
               { "show-divider": _ctx.tabBar && !showHeaderTabs.value && !isButtonTab.value },
               { "is-fixed": isFixedHeader.value }
-            ]),
+            ]]),
             style: vue.normalizeStyle(_ctx.headerCustomStyle),
             onMouseenter: handleHeadMouseenter,
             onMouseleave: handleHeadMouseleave
@@ -389,27 +393,22 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 };
               })
             ]), 1032, ["tabs", "active", "fixedHome", "homePath", "isHome", "tabStyle", "tabContextMenu", "tabContextMenus", "tabSortable", "class", "style"])) : vue.createCommentVNode("", true),
-            _ctx.$slots.right ? (vue.openBlock(), vue.createElementBlock("div", {
-              key: 5,
-              class: "ele-admin-tools",
-              "data-tool-id": params == null ? void 0 : params.viewId
-            }, [
+            _ctx.$slots.right ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_4, [
               vue.renderSlot(_ctx.$slots, "right")
-            ], 8, _hoisted_4)) : vue.createCommentVNode("", true)
+            ])) : vue.createCommentVNode("", true)
           ], 38)) : vue.createCommentVNode("", true)
         ]),
-        side: vue.withCtx(({ params }) => [
+        side: vue.withCtx(() => [
           !isTopLayout.value ? (vue.openBlock(), vue.createElementBlock("div", {
             key: 0,
-            class: vue.normalizeClass([
-              "ele-admin-side",
+            class: vue.normalizeClass(["ele-admin-side", [
               { "is-fixed": isFixedSidebar.value },
               { "show-placeholder": isFixedSidebar.value && isHeaderLogo.value },
               { "is-collapse": !isMobile.value && !isBoxSidebar.value && isCollapseSidebar.value },
               { "is-mix": !isMobile.value && !isBoxSidebar.value && isMixSidebar.value },
               { "is-compact": !isMobile.value && _ctx.compact },
               { "is-box": !isMobile.value && isBoxSidebar.value }
-            ]),
+            ]]),
             style: vue.normalizeStyle([
               { height: isFixedSidebar.value ? layoutHeight.value : void 0 },
               _ctx.sideCustomStyle
@@ -417,13 +416,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           }, [
             isMixSidebar.value ? (vue.openBlock(), vue.createElementBlock("div", {
               key: 0,
-              class: vue.normalizeClass([
-                "ele-admin-sidebox",
+              class: vue.normalizeClass(["ele-admin-sidebox", [
                 { "is-dark": isDarkSidebar.value },
                 { "is-ghost": isGhostSidebar.value },
                 { "show-divider": !isCollapseSidebar.value && !isBoxSidebar.value },
                 { "is-compact": _ctx.compact }
-              ]),
+              ]]),
               style: vue.normalizeStyle(_ctx.sideboxCustomStyle),
               onMouseenter: handleBoxMouseEnter,
               onMouseleave: handleBoxMouseLeave
@@ -441,8 +439,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               vue.renderSlot(_ctx.$slots, "boxTop"),
               vue.createVNode(vue.unref(elementPlus.ElScrollbar), {
                 class: "ele-admin-menus",
-                style: vue.normalizeStyle(_ctx.sideboxMenusStyle),
-                "data-menu-id": params == null ? void 0 : params.viewId
+                style: vue.normalizeStyle(_ctx.sideboxMenusStyle)
               }, {
                 default: vue.withCtx(() => [
                   _ctx.sideboxMenus ? (vue.openBlock(), vue.createBlock(EleMenus, vue.mergeProps({
@@ -477,14 +474,13 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                     } : void 0
                   ]), 1040, ["theme", "defaultActive", "collapse", "items"])) : vue.createCommentVNode("", true)
                 ]),
-                _: 2
-              }, 1032, ["style", "data-menu-id"]),
+                _: 3
+              }, 8, ["style"]),
               vue.renderSlot(_ctx.$slots, "boxBottom")
             ], 38)) : vue.createCommentVNode("", true),
             !isBoxSidebar.value ? (vue.openBlock(), vue.createElementBlock("div", {
               key: 1,
-              class: vue.normalizeClass([
-                "ele-admin-sidebar",
+              class: vue.normalizeClass(["ele-admin-sidebar", [
                 { "is-dark": isMixSidebar.value ? isDarkMixSidebar.value : isDarkSidebar.value },
                 { "is-ghost": isGhostSidebar.value },
                 { "is-mix": isMixSidebar.value },
@@ -492,8 +488,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 {
                   "show-divider": isMixSidebar.value && isDarkMixSidebar.value && isDarkSidebar.value
                 }
-              ]),
-              "data-side-id": params == null ? void 0 : params.viewId,
+              ]]),
               style: vue.normalizeStyle(_ctx.sidebarCustomStyle),
               onMouseenter: handleSideMouseEnter,
               onMouseleave: handleSideMouseLeave
@@ -515,7 +510,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 onClick: handleLogoClick
               }, [
                 _ctx.logoSrc || _ctx.$slots.logo ? vue.renderSlot(_ctx.$slots, "logo", { key: 0 }, () => [
-                  vue.createElementVNode("img", { src: _ctx.logoSrc }, null, 8, _hoisted_7)
+                  vue.createElementVNode("img", { src: _ctx.logoSrc }, null, 8, _hoisted_6)
                 ]) : vue.createCommentVNode("", true),
                 _ctx.logoTitle || _ctx.$slots.logoTitle ? vue.renderSlot(_ctx.$slots, "logoTitle", { key: 1 }, () => [
                   vue.createElementVNode("h1", null, vue.toDisplayString(_ctx.logoTitle), 1)
@@ -561,10 +556,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 _: 3
               }, 8, ["style"]),
               vue.renderSlot(_ctx.$slots, "bottom")
-            ], 46, _hoisted_6)) : vue.createCommentVNode("", true)
+            ], 38)) : vue.createCommentVNode("", true)
           ], 6)) : vue.createCommentVNode("", true)
         ]),
-        tabs: vue.withCtx(({ params }) => [
+        tabs: vue.withCtx(({ param }) => [
           _ctx.tabBar && !showHeaderTabs.value ? (vue.openBlock(), vue.createBlock(LayoutTabs, {
             key: 0,
             tabs: _ctx.tabs,
@@ -576,7 +571,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             tabContextMenu: _ctx.tabContextMenu,
             tabContextMenus: _ctx.tabContextMenus,
             tabSortable: _ctx.tabSortable,
-            disabled: !(params == null ? void 0 : params.text),
             class: vue.normalizeClass([
               { "is-fixed-home": _ctx.fixedHome },
               { "is-fixed": isFixedHeader.value },
@@ -584,7 +578,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             ]),
             style: vue.normalizeStyle(_ctx.tabsCustomStyle),
             onTabClick: handleTabClick,
-            onTabRemove: handleTabRemove,
+            onTabRemove: (name) => handleTabRemove(name, param?.label),
             onTabContextMenu: handleTabContextMenu,
             onTabSortChange: handleTabSortChange
           }, vue.createSlots({ _: 2 }, [
@@ -598,9 +592,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 ])
               };
             })
-          ]), 1032, ["tabs", "active", "fixedHome", "homePath", "isHome", "tabStyle", "tabContextMenu", "tabContextMenus", "tabSortable", "disabled", "class", "style"])) : vue.createCommentVNode("", true)
+          ]), 1032, ["tabs", "active", "fixedHome", "homePath", "isHome", "tabStyle", "tabContextMenu", "tabContextMenus", "tabSortable", "class", "style", "onTabRemove"])) : vue.createCommentVNode("", true)
         ]),
-        body: vue.withCtx(() => [
+        body: vue.withCtx(({ param }) => [
           vue.createElementVNode("div", {
             ref_key: "contentRef",
             ref: contentRef,
@@ -618,8 +612,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           vue.createElementVNode("div", {
             ref_key: "modalsRef",
             ref: modalsRef,
-            class: "ele-admin-modals"
-          }, null, 512)
+            class: "ele-admin-modals",
+            "data-id": param?.key
+          }, null, 8, _hoisted_7)
         ]),
         default: vue.withCtx(() => [
           vue.createElementVNode("div", {

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

@@ -1,5 +1,5 @@
 import { EleMenusInstance } from '../ele-app/plus';
-import { MenuItem } from '../ele-menus/types';
+import { MenuItem, MenuItemClickType } from '../ele-menus/types';
 import { TabPaneItem, TabEventOption } from '../ele-tabs/types';
 
 declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & {
@@ -137,19 +137,19 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     logoClick: (_e: MouseEvent) => void;
     headMenuOpen: (_index: string, _indexPath: string[]) => void;
     headMenuClose: (_index: string, _indexPath: string[]) => void;
-    headMenuItemClick: (_item: MenuItem, _e: MouseEvent) => void;
+    headMenuItemClick: (_item: MenuItem, _e: MouseEvent, _type?: MenuItemClickType) => void;
     headMenuItemMouseenter: (_item: MenuItem, _e: MouseEvent) => void;
     headMenuItemMouseleave: (_item: MenuItem, _e: MouseEvent) => void;
     headMouseenter: (_e: MouseEvent) => void;
     headMouseleave: (_e: MouseEvent) => void;
-    boxMenuItemClick: (_item: MenuItem, _e: MouseEvent) => void;
+    boxMenuItemClick: (_item: MenuItem, _e: MouseEvent, _type?: MenuItemClickType) => void;
     boxMenuItemMouseenter: (_item: MenuItem, _e: MouseEvent) => void;
     boxMenuItemMouseleave: (_item: MenuItem, _e: MouseEvent) => void;
     boxMouseenter: (_e: MouseEvent) => void;
     boxMouseleave: (_e: MouseEvent) => void;
     sideMenuOpen: (_index: string, _indexPath: string[]) => void;
     sideMenuClose: (_index: string, _indexPath: string[]) => void;
-    sideMenuItemClick: (_item: MenuItem, _e: MouseEvent) => void;
+    sideMenuItemClick: (_item: MenuItem, _e: MouseEvent, _type?: MenuItemClickType) => void;
     sideMouseenter: (_e: MouseEvent) => void;
     sideMouseleave: (_e: MouseEvent) => void;
     contentMounted: (_contentEl: HTMLElement, _modalsEl: HTMLElement) => void;
@@ -270,28 +270,29 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onLogoClick?: ((_e: MouseEvent) => any) | undefined;
     onHeadMenuOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onHeadMenuClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
-    onHeadMenuItemClick?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
+    onHeadMenuItemClick?: ((_item: MenuItem, _e: MouseEvent, _type?: MenuItemClickType) => any) | undefined;
     onHeadMenuItemMouseenter?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
     onHeadMenuItemMouseleave?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
     onHeadMouseenter?: ((_e: MouseEvent) => any) | undefined;
     onHeadMouseleave?: ((_e: MouseEvent) => any) | undefined;
-    onBoxMenuItemClick?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
+    onBoxMenuItemClick?: ((_item: MenuItem, _e: MouseEvent, _type?: MenuItemClickType) => any) | undefined;
     onBoxMenuItemMouseenter?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
     onBoxMenuItemMouseleave?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
     onBoxMouseenter?: ((_e: MouseEvent) => any) | undefined;
     onBoxMouseleave?: ((_e: MouseEvent) => any) | undefined;
     onSideMenuOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onSideMenuClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
-    onSideMenuItemClick?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
+    onSideMenuItemClick?: ((_item: MenuItem, _e: MouseEvent, _type?: MenuItemClickType) => any) | undefined;
     onSideMouseenter?: ((_e: MouseEvent) => any) | undefined;
     onSideMouseleave?: ((_e: MouseEvent) => any) | undefined;
     onContentMounted?: ((_contentEl: HTMLElement, _modalsEl: HTMLElement) => any) | undefined;
 }>, {
     height: string | number;
+    mobile: boolean;
     collapse: boolean;
     compact: boolean;
-    tabBar: import('./types').TabBar;
     breadcrumb: boolean | import('../ele-app/plus').EleBreadcrumbProps;
+    tabBar: import('./types').TabBar;
     backTop: boolean | import('../ele-app/plus').EleBacktopProps;
     sidebarStyle: import('./types').SidebarStyle;
     tabStyle: import('./types').TabStyle;
@@ -309,7 +310,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     sideboxTitleSlot: string;
     sideboxIconSlot: string;
     menuScrollToActive: boolean;
-    mobile: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;

package/lib/ele-admin-layout/props.cjs

@@ -170,19 +170,19 @@ const adminLayoutEmits = {
   logoClick: (_e) => true,
   headMenuOpen: (_index, _indexPath) => true,
   headMenuClose: (_index, _indexPath) => true,
-  headMenuItemClick: (_item, _e) => true,
+  headMenuItemClick: (_item, _e, _type) => true,
   headMenuItemMouseenter: (_item, _e) => true,
   headMenuItemMouseleave: (_item, _e) => true,
   headMouseenter: (_e) => true,
   headMouseleave: (_e) => true,
-  boxMenuItemClick: (_item, _e) => true,
+  boxMenuItemClick: (_item, _e, _type) => true,
   boxMenuItemMouseenter: (_item, _e) => true,
   boxMenuItemMouseleave: (_item, _e) => true,
   boxMouseenter: (_e) => true,
   boxMouseleave: (_e) => true,
   sideMenuOpen: (_index, _indexPath) => true,
   sideMenuClose: (_index, _indexPath) => true,
-  sideMenuItemClick: (_item, _e) => true,
+  sideMenuItemClick: (_item, _e, _type) => true,
   sideMouseenter: (_e) => true,
   sideMouseleave: (_e) => true,
   tabClick: (_option) => true,

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

@@ -1,7 +1,7 @@
 import { PropType, ExtractPropTypes, InjectionKey } from 'vue';
 import { StyleValue } from '../ele-app/types';
 import { EleMenusProps, EleBreadcrumbProps, EleBacktopProps, EleDropdownProps } from '../ele-app/plus';
-import { MenuItem } from '../ele-menus/types';
+import { MenuItem, MenuItemClickType } from '../ele-menus/types';
 import { BreadcrumbItem } from '../ele-breadcrumb/types';
 import { TabPaneItem, TabEventOption, ContextMenus } from '../ele-tabs/types';
 import { Layout, SidebarLayout, HeaderStyle, SidebarStyle, TabStyle, TabBar, Maximized, LayoutProvide } from './types';
@@ -12,7 +12,7 @@ import { Layout, SidebarLayout, HeaderStyle, SidebarStyle, TabStyle, TabBar, Max
 export declare const adminLayoutProps: {
     /** 高度 */
     height: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: string;
     };
     /** 顶栏菜单数据 */
@@ -183,19 +183,19 @@ export declare const adminLayoutEmits: {
     logoClick: (_e: MouseEvent) => boolean;
     headMenuOpen: (_index: string, _indexPath: string[]) => boolean;
     headMenuClose: (_index: string, _indexPath: string[]) => boolean;
-    headMenuItemClick: (_item: MenuItem, _e: MouseEvent) => boolean;
+    headMenuItemClick: (_item: MenuItem, _e: MouseEvent, _type?: MenuItemClickType) => boolean;
     headMenuItemMouseenter: (_item: MenuItem, _e: MouseEvent) => boolean;
     headMenuItemMouseleave: (_item: MenuItem, _e: MouseEvent) => boolean;
     headMouseenter: (_e: MouseEvent) => boolean;
     headMouseleave: (_e: MouseEvent) => boolean;
-    boxMenuItemClick: (_item: MenuItem, _e: MouseEvent) => boolean;
+    boxMenuItemClick: (_item: MenuItem, _e: MouseEvent, _type?: MenuItemClickType) => boolean;
     boxMenuItemMouseenter: (_item: MenuItem, _e: MouseEvent) => boolean;
     boxMenuItemMouseleave: (_item: MenuItem, _e: MouseEvent) => boolean;
     boxMouseenter: (_e: MouseEvent) => boolean;
     boxMouseleave: (_e: MouseEvent) => boolean;
     sideMenuOpen: (_index: string, _indexPath: string[]) => boolean;
     sideMenuClose: (_index: string, _indexPath: string[]) => boolean;
-    sideMenuItemClick: (_item: MenuItem, _e: MouseEvent) => boolean;
+    sideMenuItemClick: (_item: MenuItem, _e: MouseEvent, _type?: MenuItemClickType) => boolean;
     sideMouseenter: (_e: MouseEvent) => boolean;
     sideMouseleave: (_e: MouseEvent) => boolean;
     tabClick: (_option: TabEventOption) => boolean;

package/lib/ele-admin-layout/style/header.scss

@@ -58,13 +58,32 @@
   }
 
   & > .ele-admin-tabs.ele-tab-wrap.is-simple,
-  & > .ele-admin-tabs.ele-tab-wrap.is-indicator,
-  & > .ele-tab-wrap .ele-tabs.is-simple,
-  & > .ele-tab-wrap .ele-tabs.is-indicator {
+  & > .ele-admin-tabs.ele-tab-wrap.is-indicator {
     $height: eleVar('header', 'height');
     $tool-height: eleVar('header', 'tool-height');
     $tab-height: calc(#{$height} - (#{$height} - #{$tool-height}) / 2);
     #{eleVarName('tab', 'height')}: #{$tab-height};
+
+    .el-tabs__item,
+    .ele-tab-tool,
+    .el-tabs__nav-prev,
+    .el-tabs__nav-next {
+      line-height: calc(#{$height} - (#{$height} - #{$tool-height}));
+    }
+
+    .el-tabs__nav-prev,
+    .el-tabs__nav-next {
+      display: block;
+
+      & > .el-icon {
+        vertical-align: -2px;
+      }
+    }
+
+    & > .ele-tabs > .el-tabs__header .el-tabs__item .is-icon-close,
+    & > .ele-tabs > .el-tabs__header .ele-tab-title::before {
+      margin-top: calc((#{$height} - #{$tool-height}) / 2 / 2 * -1);
+    }
   }
 
   /* 顶栏与页签栏分割线 */
@@ -142,8 +161,7 @@
   }
 
   /* 暗色顶栏页签栏 */
-  & > .ele-admin-tabs.ele-tab-wrap,
-  & > .ele-admin-tabs .ele-tabs {
+  & > .ele-admin-tabs.ele-tab-wrap {
     $color: eleVar('header', 'dark-color');
     $hover-bg: eleVar('header', 'dark-tool-hover-bg');
     #{eleVarName('tab', 'color')}: #{$color};
@@ -155,7 +173,7 @@
     #{eleVarName('tab', 'tool-hover-color')}: #{$color};
     #{eleVarName('tab', 'simple-hover-color')}: #{$color};
     #{eleVarName('tab', 'simple-hover-bg')}: #{$hover-bg};
-    #{eleVarName('tab', 'simple-active-bg')}: #{elVar('bg-color', 'overlay')};
+    #{eleVarName('tab', 'simple-active-bg')}: #{elVar('bg-color')};
     #{eleVarName('tab', 'simple-active-line')}: 0px;
     #{eleVarName('tab', 'simple-tool-hover-bg')}: transparent;
     #{eleVarName('tab', 'indicator-dot-color')}: rgba(255, 255, 255, 0.4);
@@ -166,8 +184,7 @@
   }
 }
 
-.ele-admin-header.is-dark > .ele-admin-tabs.ele-tab-wrap,
-.ele-admin-header.is-dark > .ele-admin-tabs .ele-tabs {
+.ele-admin-header.is-dark > .ele-admin-tabs.ele-tab-wrap {
   $color: eleVar('header', 'dark-color');
   $hover-bg: eleVar('header', 'dark-tool-hover-bg');
   #{eleVarName('tab', 'active-close-color')}: #{$color};

package/lib/ele-admin-layout/style/index.scss

@@ -148,10 +148,17 @@
     z-index: calc(#{eleVar('layout', 'mask-index')} + 1);
     clip-path: none !important;
 
-    & > .ele-admin-sidebar,
-    & > .ele-admin-sidebox {
+    & > .ele-admin-sidebar:not(.is-dark),
+    & > .ele-admin-sidebox:not(.is-dark) {
+      background: eleVar('sidebar', 'mobile-bg');
       backdrop-filter: eleVar('sidebar', 'mobile-backdrop-filter');
     }
+
+    & > .ele-admin-sidebar.is-dark,
+    & > .ele-admin-sidebox.is-dark {
+      background: eleVar('sidebar', 'mobile-dark-bg');
+      backdrop-filter: eleVar('sidebar', 'mobile-dark-backdrop-filter');
+    }
   }
 
   &.is-collapse > .ele-admin-side {
@@ -211,7 +218,6 @@
     margin: 0;
     font-weight: 600;
     font-size: inherit;
-    text-overflow: ellipsis;
     word-break: break-all;
     white-space: nowrap;
     overflow: hidden;

package/lib/ele-admin-layout/style/tabs.scss

@@ -9,17 +9,8 @@
   z-index: calc(#{eleVar('layout', 'index')} + 1);
   $padding: eleVar('page', 'padding', #{eleVar('header', 'tools-padding')});
 
-  &:not(.is-fixed-home) {
-    .el-tabs__nav-wrap:not(.is-scrollable) .el-tabs__nav {
-      padding-left: $padding;
-    }
-
-    &.is-simple,
-    &.is-indicator {
-      .el-tabs__nav-wrap:not(.is-scrollable) .el-tabs__nav {
-        padding-left: calc(#{$padding} - eleVar('tab', 'simple-angle-size'));
-      }
-    }
+  &:not(.is-fixed-home) .el-tabs__nav-wrap:not(.is-scrollable) .el-tabs__nav {
+    padding-left: $padding;
   }
 
   /* 固定的主页页签 */

package/lib/ele-alert/index.cjs

@@ -37,15 +37,14 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       return vue.openBlock(), vue.createBlock(vue.Transition, { name: _ctx.transitionName }, {
         default: vue.withCtx(() => [
           visible.value ? (vue.openBlock(), vue.createElementBlock("div", vue.mergeProps({ key: 0 }, _ctx.$attrs, {
-            class: [
-              "ele-alert",
+            class: ["ele-alert", [
               { "is-success": _ctx.type === "success" },
               { "is-warning": _ctx.type === "warning" },
               { "is-error": _ctx.type === "error" },
               { "is-dark": _ctx.effect === "dark" },
               { "is-center": _ctx.center },
               { "is-rich": isRich.value }
-            ]
+            ]]
           }), [
             _ctx.showIcon ? (vue.openBlock(), vue.createElementBlock("div", {
               key: 0,

package/lib/ele-app/components/form-item-rest.cjs

@@ -1,14 +1,3 @@
 "use strict";
-const vue = require("vue");
-const hook = require("../../utils/hook");
-const formItemRest = vue.defineComponent({
-  name: "FormItemRest",
-  setup(_props, { slots }) {
-    hook.useFormItemRest();
-    return () => {
-      var _a;
-      return (_a = slots.default) == null ? void 0 : _a.call(slots);
-    };
-  }
-});
-module.exports = formItemRest;
+const EleFormItemRest = require("../../ele-form-item-rest/index");
+module.exports = EleFormItemRest;

package/lib/ele-app/components/form-item-rest.d.ts

@@ -1,4 +1,3 @@
-declare const _default: import('vue').DefineComponent<{}, () => import('vue').VNode<import('vue').RendererNode, import('vue').RendererElement, {
-    [key: string]: any;
-}>[] | undefined, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
-export default _default;
+import { default as EleFormItemRest } from '../../ele-form-item-rest/index';
+
+export default EleFormItemRest;

package/lib/ele-app/components/message-box-icon.cjs

@@ -18,18 +18,16 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     boxMounted: (_) => true
   },
   setup(__props, { emit: __emit }) {
-    var _a;
     const props = __props;
     const emit = __emit;
-    const ins = (_a = vue.getCurrentInstance) == null ? void 0 : _a.call(vue);
+    const ins = vue.getCurrentInstance?.();
     vue.onBeforeUnmount(() => {
       emit("boxDestroy", props.boxId);
     });
     vue.onMounted(() => {
-      var _a2, _b;
       emit("boxMounted", {
         boxId: props.boxId,
-        doClose: (_b = (_a2 = ins == null ? void 0 : ins.ctx) == null ? void 0 : _a2.$root) == null ? void 0 : _b.doClose
+        doClose: ins?.ctx?.$root?.doClose
       });
     });
     return (_ctx, _cache) => {

package/lib/ele-app/el.d.ts

@@ -30,6 +30,8 @@ import type {
   ElDropdown,
   dropdownProps,
   dropdownItemProps,
+  // ElDivider
+  DividerProps,
   // ElEmpty
   EmptyProps,
   // ElForm
@@ -192,6 +194,11 @@ export type ElDropdownItemProps = ComponentProps<
   ExtractPropTypes<typeof dropdownItemProps>
 >;
 
+/**
+ * ElDivider
+ */
+export type ElDividerProps = ComponentProps<DividerProps>;
+
 /**
  * ElEmpty
  */