ele-admin-plus 1.1.3 → 1.1.4-beta.2

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

@@ -1,9 +1,9 @@
-import { defineComponent, ref, shallowRef, computed, watch, unref, provide, resolveComponent, openBlock, createElementBlock, normalizeClass, createVNode, createSlots, renderList, withCtx, renderSlot, normalizeProps, guardReactiveProps, createElementVNode, createBlock, createCommentVNode } from "vue";
+import { defineComponent, ref, shallowRef, computed, watch, unref, provide, resolveComponent, openBlock, createElementBlock, normalizeClass, createVNode, createSlots, renderList, withCtx, renderSlot, normalizeProps, guardReactiveProps, createBlock, createCommentVNode, createElementVNode } from "vue";
 import { useRouter } from "vue-router";
 import { ElBacktop } from "element-plus";
-import { mapTree } from "../utils/core";
-import { useLicense, LAYOUT_KEY, UNAUTHORIZED_TIP } from "../ele-config-provider/receiver";
-import EleAlert from "../ele-alert/index";
+import { mapTree, isExternalLink } from "../utils/core";
+import { useLicense, UNAUTHORIZED_TIP, LAYOUT_KEY } from "../ele-config-provider/receiver";
+import EleWatermark from "../ele-watermark/index";
 import ProHeader from "./components/pro-header";
 import ProSidebar from "./components/pro-sidebar";
 import ProSidebox from "./components/pro-sidebox";
@@ -15,7 +15,7 @@ const _sfc_main = defineComponent({
   name: "EleProLayout",
   components: {
     ElBacktop,
-    EleAlert,
+    EleWatermark,
     ProHeader,
     ProSidebar,
     ProSidebox,
@@ -26,7 +26,7 @@ const _sfc_main = defineComponent({
   emits: proLayoutEmits,
   setup(props, { emit }) {
     const { authenticated } = useLicense();
-    const { currentRoute } = useRouter();
+    const { currentRoute, push } = useRouter();
     const { disableTransition } = useDisableTransition();
     const contentRef = ref(null);
     const levelData = shallowRef([]);
@@ -45,6 +45,7 @@ const _sfc_main = defineComponent({
     const homeMenuPath = ref(getHomePath(props.homePath));
     const isHome = ref(false);
     const mobile = ref(false);
+    const watermark = ref(UNAUTHORIZED_TIP.split(",") || "Error");
     const topLayout = computed(() => props.layout === "top");
     const mixLayout = computed(() => props.layout === "mix");
     const mixSidebar = computed(() => props.sidebarLayout === "mix");
@@ -64,6 +65,7 @@ const _sfc_main = defineComponent({
       const hasSide = sidebox.value || sidebar.value;
       const fixedSide = props.fixedSidebar && !props.fixedBody && hasSide;
       const logoAuto = props.logoInHeader || topLayout.value || !hasSide;
+      const hasMix = mixSidebar.value && sidebox.value;
       return [
         "ele-admin-layout",
         // 折叠侧栏
@@ -71,7 +73,9 @@ const _sfc_main = defineComponent({
         // 双侧栏折叠一级
         { "ele-admin-compact": props.compact && sidebox.value },
         // 双侧栏
-        { "ele-admin-mix-sidebar": mixSidebar.value && sidebox.value },
+        { "ele-admin-mix-sidebar": hasMix },
+        // 双侧栏时侧栏空数据
+        { "ele-admin-none-sidebar": hasMix && !sidebar.value },
         // 固定顶栏
         { "ele-admin-fixed-header": props.fixedHeader && !props.fixedBody },
         // 固定侧栏
@@ -96,6 +100,15 @@ const _sfc_main = defineComponent({
         { "ele-admin-mobile": mobile.value }
       ];
     });
+    const backTopSelector = computed(() => {
+      if (props.backTopTarget) {
+        return props.backTopTarget;
+      }
+      if (props.fixedBody) {
+        return ".ele-admin-layout.ele-admin-fixed-body>.ele-admin-main>.ele-admin-body>.ele-admin-content";
+      }
+      return void 0;
+    });
     const sidebarCollapse = computed(() => {
       return mobile.value || mixSidebar.value ? false : props.collapse;
     });
@@ -224,7 +237,8 @@ const _sfc_main = defineComponent({
             path: d.path,
             component: d.component,
             redirect: d.redirect,
-            meta: d.meta
+            meta: d.meta,
+            tempChildren: d.children
           };
         });
         const childMenus = getActiveChilds(
@@ -322,6 +336,90 @@ const _sfc_main = defineComponent({
         });
       }
     };
+    const onNavItemClick = (item) => {
+      if (!item.index || props.navTrigger != "click") {
+        return;
+      }
+      if (props.beforeClick && props.beforeClick(item) === false) {
+        return;
+      }
+      if (isExternalLink(item.index)) {
+        window.open(item.index);
+        return;
+      }
+      headerActive.value = item.index;
+      const temp = getActiveChilds(
+        headerData.value,
+        headerActive.value,
+        "tempChildren"
+      );
+      const isChild = !temp.some((d) => {
+        var _a;
+        return !((_a = d.meta) == null ? void 0 : _a.hide);
+      });
+      if (isChild && item.index !== unref(currentRoute).fullPath) {
+        push(item.index);
+        return;
+      }
+      if (mixSidebar.value) {
+        sideboxData.value = temp.map((d) => {
+          return {
+            name: d.name,
+            path: d.path,
+            component: d.component,
+            redirect: d.redirect,
+            meta: d.meta,
+            children: props.collapse ? d.children : void 0,
+            tempChildren: d.children
+          };
+        });
+        return;
+      }
+      sidebarData.value = temp;
+    };
+    const onBoxItemClick = (item) => {
+      if (!item.index || props.boxTrigger != "click") {
+        return;
+      }
+      if (props.beforeClick && props.beforeClick(item) === false) {
+        return;
+      }
+      if (isExternalLink(item.index)) {
+        window.open(item.index);
+        return;
+      }
+      sideboxActive.value = item.index;
+      const temp = getActiveChilds(
+        sideboxData.value,
+        sideboxActive.value,
+        "tempChildren"
+      );
+      const isChild = !temp.some((d) => {
+        var _a;
+        return !((_a = d.meta) == null ? void 0 : _a.hide);
+      });
+      if (isChild && item.index !== unref(currentRoute).fullPath) {
+        push(item.index);
+        return;
+      }
+      sidebarData.value = temp;
+    };
+    const onMenuItemClick = (item) => {
+      if (!item.index || props.itemTrigger != "click") {
+        return;
+      }
+      if (props.beforeClick && props.beforeClick(item) === false) {
+        return;
+      }
+      if (isExternalLink(item.index)) {
+        window.open(item.index);
+        return;
+      }
+      sidebarActive.value = item.index;
+      if (item.index !== unref(currentRoute).fullPath) {
+        push(item.index);
+      }
+    };
     watch(
       () => props.menus,
       () => {
@@ -446,8 +544,8 @@ const _sfc_main = defineComponent({
     });
     provide(LAYOUT_KEY, layoutProvide);
     return {
-      UNAUTHORIZED_TIP,
       authenticated,
+      watermark,
       contentRef,
       levelData,
       tabData,
@@ -464,6 +562,7 @@ const _sfc_main = defineComponent({
       sidebox,
       sidebar,
       layoutClass,
+      backTopSelector,
       sidebarCollapse,
       sidebarTheme,
       updateCollapse,
@@ -475,7 +574,10 @@ const _sfc_main = defineComponent({
       onSideMenuOpen,
       onSideMenuClose,
       onHeadMenuOpen,
-      onHeadMenuClose
+      onHeadMenuClose,
+      onNavItemClick,
+      onBoxItemClick,
+      onMenuItemClick
     };
   }
 });
@@ -486,25 +588,18 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const _hoisted_1 = { class: "ele-admin-main" };
-const _hoisted_2 = { class: "ele-admin-body" };
-const _hoisted_3 = {
-  key: 1,
+const _hoisted_1 = { class: "ele-admin-body" };
+const _hoisted_2 = {
   ref: "contentRef",
   class: "ele-admin-content"
 };
-const _hoisted_4 = {
-  key: 2,
-  class: "ele-admin-content",
-  style: { "padding": "16px" }
-};
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ProHeader = resolveComponent("ProHeader");
   const _component_ProSidebox = resolveComponent("ProSidebox");
   const _component_ProSidebar = resolveComponent("ProSidebar");
   const _component_ProTabs = resolveComponent("ProTabs");
   const _component_ProIframe = resolveComponent("ProIframe");
-  const _component_EleAlert = resolveComponent("EleAlert");
+  const _component_EleWatermark = resolveComponent("EleWatermark");
   const _component_ElBacktop = resolveComponent("ElBacktop");
   return openBlock(), createElementBlock("div", {
     class: normalizeClass(_ctx.layoutClass)
@@ -516,6 +611,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       ellipsis: _ctx.ellipsis,
       ellipsisProps: _ctx.ellipsisProps,
       menuTrigger: _ctx.menuTrigger,
+      itemTrigger: _ctx.navTrigger,
       collapse: _ctx.collapse,
       sidebar: _ctx.sidebar,
       titleSlot: _ctx.headerTitleSlot,
@@ -527,7 +623,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       isHome: _ctx.isHome,
       onLogoClick: _ctx.onLogoClick,
       onOpen: _ctx.onHeadMenuOpen,
-      onClsoe: _ctx.onHeadMenuClose
+      onClsoe: _ctx.onHeadMenuClose,
+      onItemClick: _ctx.onNavItemClick
     }, createSlots({ _: 2 }, [
       renderList(Object.keys(_ctx.$slots), (name) => {
         return {
@@ -537,69 +634,54 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           ])
         };
       })
-    ]), 1032, ["menus", "headerStyle", "active", "ellipsis", "ellipsisProps", "menuTrigger", "collapse", "sidebar", "titleSlot", "iconSlot", "levels", "breadcrumb", "breadcrumbSeparator", "homePath", "isHome", "onLogoClick", "onOpen", "onClsoe"]),
-    createElementVNode("div", _hoisted_1, [
-      _ctx.sidebox ? (openBlock(), createBlock(_component_ProSidebox, {
-        key: 0,
-        menus: _ctx.sideboxData,
-        sidebarStyle: _ctx.sidebarStyle,
-        colorfulIcon: _ctx.colorfulIcon,
-        active: _ctx.collapse ? _ctx.sidebarActive : _ctx.sideboxActive,
-        compact: _ctx.compact,
-        collapse: _ctx.collapse,
-        popperEffect: _ctx.tooltipEffect,
-        titleSlot: _ctx.sideboxTitleSlot,
-        iconSlot: _ctx.sideboxIconSlot
-      }, createSlots({ _: 2 }, [
-        renderList(Object.keys(_ctx.$slots), (name) => {
-          return {
-            name,
-            fn: withCtx((slotProps) => [
-              renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
-            ])
-          };
-        })
-      ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "compact", "collapse", "popperEffect", "titleSlot", "iconSlot"])) : createCommentVNode("", true),
-      _ctx.sidebar ? (openBlock(), createBlock(_component_ProSidebar, {
-        key: 1,
-        menus: _ctx.authenticated ? _ctx.sidebarData : [],
-        sidebarStyle: _ctx.sidebarTheme,
-        colorfulIcon: _ctx.colorfulIcon,
-        active: _ctx.sidebarActive,
-        collapse: _ctx.sidebarCollapse,
-        uniqueOpened: _ctx.uniqueOpened,
-        defaultOpeneds: _ctx.sidebarOpeneds,
-        popperEffect: _ctx.tooltipEffect,
-        titleSlot: _ctx.sidebarTitleSlot,
-        iconSlot: _ctx.sidebarIconSlot,
-        onOpen: _ctx.onSideMenuOpen,
-        onClsoe: _ctx.onSideMenuClose
-      }, createSlots({ _: 2 }, [
-        renderList(Object.keys(_ctx.$slots), (name) => {
-          return {
-            name,
-            fn: withCtx((slotProps) => [
-              renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
-            ])
-          };
-        })
-      ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "collapse", "uniqueOpened", "defaultOpeneds", "popperEffect", "titleSlot", "iconSlot", "onOpen", "onClsoe"])) : createCommentVNode("", true),
-      createElementVNode("div", _hoisted_2, [
-        _ctx.authenticated && _ctx.tabBar ? (openBlock(), createBlock(_component_ProTabs, {
+    ]), 1032, ["menus", "headerStyle", "active", "ellipsis", "ellipsisProps", "menuTrigger", "itemTrigger", "collapse", "sidebar", "titleSlot", "iconSlot", "levels", "breadcrumb", "breadcrumbSeparator", "homePath", "isHome", "onLogoClick", "onOpen", "onClsoe", "onItemClick"]),
+    createVNode(_component_EleWatermark, {
+      class: "ele-admin-main",
+      height: 68,
+      disabled: _ctx.authenticated,
+      fixed: true,
+      content: _ctx.watermark
+    }, {
+      default: withCtx(() => [
+        _ctx.sidebox ? (openBlock(), createBlock(_component_ProSidebox, {
           key: 0,
-          tabs: _ctx.tabData,
-          active: _ctx.tabActive,
-          tabStyle: _ctx.tabStyle,
-          fixedHome: _ctx.fixedHome,
-          homePath: _ctx.homeMenuPath,
-          isHome: _ctx.isHome,
-          tabContextMenu: _ctx.tabContextMenu,
-          tabContextMenus: _ctx.tabContextMenus,
-          tabSortable: _ctx.tabSortable,
-          onTabClick: _ctx.onTabClick,
-          onTabRemove: _ctx.onTabRemove,
-          onTabContextMenu: _ctx.onTabContextMenu,
-          onTabSortChange: _ctx.onTabSortChange
+          menus: _ctx.sideboxData,
+          sidebarStyle: _ctx.sidebarStyle,
+          colorfulIcon: _ctx.colorfulIcon,
+          active: _ctx.collapse ? _ctx.sidebarActive : _ctx.sideboxActive,
+          compact: _ctx.compact,
+          collapse: _ctx.collapse,
+          popperEffect: _ctx.tooltipEffect,
+          itemTrigger: _ctx.boxTrigger,
+          titleSlot: _ctx.sideboxTitleSlot,
+          iconSlot: _ctx.sideboxIconSlot,
+          onItemClick: _ctx.onBoxItemClick
+        }, createSlots({ _: 2 }, [
+          renderList(Object.keys(_ctx.$slots), (name) => {
+            return {
+              name,
+              fn: withCtx((slotProps) => [
+                renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
+              ])
+            };
+          })
+        ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "compact", "collapse", "popperEffect", "itemTrigger", "titleSlot", "iconSlot", "onItemClick"])) : createCommentVNode("", true),
+        _ctx.sidebar ? (openBlock(), createBlock(_component_ProSidebar, {
+          key: 1,
+          menus: _ctx.sidebarData,
+          sidebarStyle: _ctx.sidebarTheme,
+          colorfulIcon: _ctx.colorfulIcon,
+          active: _ctx.sidebarActive,
+          collapse: _ctx.sidebarCollapse,
+          uniqueOpened: _ctx.uniqueOpened,
+          defaultOpeneds: _ctx.sidebarOpeneds,
+          popperEffect: _ctx.tooltipEffect,
+          itemTrigger: _ctx.itemTrigger,
+          titleSlot: _ctx.sidebarTitleSlot,
+          iconSlot: _ctx.sidebarIconSlot,
+          onOpen: _ctx.onSideMenuOpen,
+          onClsoe: _ctx.onSideMenuClose,
+          onItemClick: _ctx.onMenuItemClick
         }, createSlots({ _: 2 }, [
           renderList(Object.keys(_ctx.$slots), (name) => {
             return {
@@ -609,28 +691,49 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ])
             };
           })
-        ]), 1032, ["tabs", "active", "tabStyle", "fixedHome", "homePath", "isHome", "tabContextMenu", "tabContextMenus", "tabSortable", "onTabClick", "onTabRemove", "onTabContextMenu", "onTabSortChange"])) : createCommentVNode("", true),
-        _ctx.authenticated ? (openBlock(), createElementBlock("div", _hoisted_3, [
-          _ctx.tabBar && _ctx.keepAlive ? (openBlock(), createBlock(_component_ProIframe, {
+        ]), 1032, ["menus", "sidebarStyle", "colorfulIcon", "active", "collapse", "uniqueOpened", "defaultOpeneds", "popperEffect", "itemTrigger", "titleSlot", "iconSlot", "onOpen", "onClsoe", "onItemClick"])) : createCommentVNode("", true),
+        createElementVNode("div", _hoisted_1, [
+          _ctx.tabBar ? (openBlock(), createBlock(_component_ProTabs, {
             key: 0,
-            keepAlive: _ctx.keepAlive,
-            transitionName: _ctx.transitionName,
-            transitionDelay: _ctx.transitionDelay,
-            tabData: _ctx.tabData,
-            tabActive: _ctx.tabActive
-          }, null, 8, ["keepAlive", "transitionName", "transitionDelay", "tabData", "tabActive"])) : createCommentVNode("", true),
-          renderSlot(_ctx.$slots, "default"),
-          !_ctx.hideFooter ? renderSlot(_ctx.$slots, "footer", { key: 1 }) : createCommentVNode("", true)
-        ], 512)) : (openBlock(), createElementBlock("div", _hoisted_4, [
-          createVNode(_component_EleAlert, {
-            type: "warning",
-            showIcon: true,
-            closable: false,
-            title: _ctx.UNAUTHORIZED_TIP
-          }, null, 8, ["title"])
-        ]))
-      ])
-    ]),
+            tabs: _ctx.tabData,
+            active: _ctx.tabActive,
+            tabStyle: _ctx.tabStyle,
+            fixedHome: _ctx.fixedHome,
+            homePath: _ctx.homeMenuPath,
+            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), (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),
+          createElementVNode("div", _hoisted_2, [
+            _ctx.tabBar && _ctx.keepAlive ? (openBlock(), createBlock(_component_ProIframe, {
+              key: 0,
+              keepAlive: _ctx.keepAlive,
+              transitionName: _ctx.transitionName,
+              transitionDelay: _ctx.transitionDelay,
+              tabData: _ctx.tabData,
+              tabActive: _ctx.tabActive
+            }, null, 8, ["keepAlive", "transitionName", "transitionDelay", "tabData", "tabActive"])) : createCommentVNode("", true),
+            renderSlot(_ctx.$slots, "default"),
+            !_ctx.hideFooter ? renderSlot(_ctx.$slots, "footer", { key: 1 }) : createCommentVNode("", true)
+          ], 512)
+        ])
+      ]),
+      _: 3
+    }, 8, ["disabled", "content"]),
     createElementVNode("div", {
       class: "ele-admin-mask",
       onClick: _cache[0] || (_cache[0] = (...args) => _ctx.updateCollapse && _ctx.updateCollapse(...args))
@@ -640,7 +743,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       right: _ctx.backTopRight,
       bottom: _ctx.backTopBottom,
       visibilityHeight: _ctx.backTopVisibilityHeight,
-      target: _ctx.fixedBody ? ".ele-admin-layout .ele-admin-content" : void 0
+      target: _ctx.backTopSelector
     }, null, 8, ["right", "bottom", "visibilityHeight", "target"])) : createCommentVNode("", true)
   ], 2);
 }

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

@@ -2,7 +2,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-file-list/types';
-import type { MenuItem, TabItem, Layout, SidebarLayout, HeaderStyle, SidebarStyle, TabStyle, MenuI18n, TabItemEventOption, BodySizeChangeOption } from './types';
+import type { MenuItem, TabItem, Layout, SidebarLayout, HeaderStyle, SidebarStyle, TabStyle, MenuI18n, TabItemEventOption, BodySizeChangeOption, MenuItemTrigger, BeforeClick } from './types';
 /**
  * 属性
  */
@@ -40,6 +40,7 @@ export declare const proLayoutProps: {
         type: NumberConstructor;
         default: number;
     };
+    backTopTarget: StringConstructor;
     ellipsis: {
         type: BooleanConstructor;
         default: boolean;
@@ -131,6 +132,10 @@ export declare const proLayoutProps: {
         default: string;
     };
     tooltipEffect: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    navTrigger: PropType<MenuItemTrigger>;
+    boxTrigger: PropType<MenuItemTrigger>;
+    itemTrigger: PropType<MenuItemTrigger>;
+    beforeClick: PropType<BeforeClick>;
     keepAlive: BooleanConstructor;
     transitionName: StringConstructor;
     transitionDelay: {

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

@@ -44,6 +44,8 @@ const proLayoutProps = {
     type: Number,
     default: 60
   },
+  // 返回顶部的目标选择器
+  backTopTarget: String,
   // 顶栏菜单是否省略多余的子项
   ellipsis: {
     type: Boolean,
@@ -169,6 +171,14 @@ const proLayoutProps = {
   },
   // 菜单 tooltip 主题
   tooltipEffect: String,
+  // 顶栏菜单触发模式
+  navTrigger: String,
+  // 双侧栏一级菜单触发模式
+  boxTrigger: String,
+  // 侧栏菜单触发模式
+  itemTrigger: String,
+  // 菜单点击事件前钩子
+  beforeClick: Function,
   // 是否支持内链缓存
   keepAlive: Boolean,
   // 内链切换动画

package/es/ele-pro-layout/style/collapse.scss

@@ -19,21 +19,20 @@
     }
   }
 
-  &.ele-admin-mix-sidebar {
-    .ele-admin-sidebox {
-      box-shadow: eleVar('sidebar', 'shadow');
-    }
-
-    .ele-admin-sidebar {
-      width: 0;
+  &.ele-admin-mix-sidebar .ele-admin-sidebar {
+    width: 0;
 
-      & + .ele-admin-body {
-        width: calc(100% - #{eleVar('sidebox', 'width')});
-      }
+    & + .ele-admin-body {
+      width: calc(100% - #{eleVar('sidebox', 'width')});
     }
   }
 }
 
+.ele-admin-collapse.ele-admin-mix-sidebar .ele-admin-sidebox,
+.ele-admin-none-sidebar.ele-admin-mix-sidebar .ele-admin-sidebox {
+  box-shadow: eleVar('sidebar', 'shadow');
+}
+
 /* 折叠一级侧栏 */
 .ele-admin-compact.ele-admin-mix-sidebar {
   $collapseW: eleVar('sidebar', 'collapse-width');

package/es/ele-pro-layout/style/index.js

@@ -1,7 +1,6 @@
 import 'element-plus/es/components/backtop/style/index';
 import 'element-plus/es/components/icon/style/index';
 import 'element-plus/es/components/scrollbar/style/index';
-import '../../ele-alert/style/index';
 import '../../ele-page/style/index';
 import '../../ele-breadcrumb/style/index';
 import '../../ele-menus/style/index';

package/es/ele-pro-layout/style/layout-mobile.scss

@@ -8,6 +8,7 @@
     position: fixed !important;
     left: 0 !important;
     width: eleVar('sidebar', 'width') !important;
+    height: calc(100vh - #{eleVar('header', 'height')}) !important;
     z-index: calc(eleVar('layout', 'mask-index') + 1) !important;
   }
 

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

@@ -204,6 +204,14 @@ export type MenuTrigger = ElMenuProps['menuTrigger'];
  * 面包屑导航分隔符
  */
 export type BreadcrumbSeparator = ElBreadcrumbProps['separatorIcon'];
+/**
+ * 混合模式菜单切换模式
+ */
+export type MenuItemTrigger = 'route' | 'click';
+/**
+ * 菜单点击前钩子
+ */
+export type BeforeClick = (item: MenuItemProps) => boolean;
 /**
  * 内链数据
  */
@@ -221,3 +229,4 @@ export type TabTitleInstance = InstanceType<typeof TabTitle> | null;
  * 标签页组件实例
  */
 export type EleTabsInstance = InstanceType<typeof EleTabs> | null;
+export type { MenuItemProps };

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

@@ -72,8 +72,9 @@ export declare function getMixActive(matched?: MenuItem[]): MixActiveResult;
  * 获取选中菜单的子级
  * @param menus 菜单数据
  * @param active 选中地址
+ * @param childrenName 子级字段名称
  */
-export declare function getActiveChilds(menus: MenuItem[], active?: string): MenuItem[];
+export declare function getActiveChilds(menus: MenuItem[], active?: string, childrenName?: string): MenuItem[];
 /**
  * 绑定窗口事件监听
  */
@@ -93,5 +94,6 @@ export declare function useDisableTransition(): {
 /**
  * 菜单数据转换
  * @param menus 菜单数据
+ * @param link 是否使用超链接
  */
-export declare function getMenuItems(menus: MenuItem[]): MenuItemProps[];
+export declare function getMenuItems(menus: MenuItem[], link: boolean): MenuItemProps[];

package/es/ele-pro-layout/util.js

@@ -1,5 +1,5 @@
 import { onBeforeUnmount, onMounted, watch, nextTick } from "vue";
-import { eachTree, debounce, mapTree } from "../utils/core";
+import { eachTree, debounce, mapTree, omit } from "../utils/core";
 function isHomeRoute(route, homePath) {
   return route.path === homePath || route.fullPath === homePath;
 }
@@ -65,15 +65,17 @@ function getMatchedMenus(path, menus, parents) {
 function getMatchedLevels(matched, activeOther, route, menus, tabs) {
   var _a;
   const levels = [];
-  matched == null ? void 0 : matched.forEach((m) => {
-    var _a2;
-    if (m.meta && m.meta.title && m.meta.breadcrumb !== false) {
-      levels.push({
-        path: m.path,
-        title: ((_a2 = findTabByPath(m.path, tabs)) == null ? void 0 : _a2.title) || m.meta.title
-      });
-    }
-  });
+  if (matched) {
+    matched.forEach((m) => {
+      var _a2;
+      if (m.meta && m.meta.title && m.meta.breadcrumb !== false) {
+        levels.push({
+          path: m.path,
+          title: ((_a2 = findTabByPath(m.path, tabs)) == null ? void 0 : _a2.title) || m.meta.title
+        });
+      }
+    });
+  }
   if (activeOther) {
     const { path, fullPath, meta } = route;
     if ((!levels.length || fullPath !== levels[levels.length - 1].path) && meta.title) {
@@ -132,18 +134,19 @@ function getMixActive(matched) {
     active2: match2.path
   };
 }
-function getActiveChilds(menus, active) {
+function getActiveChilds(menus, active, childrenName) {
+  const key = childrenName || "children";
   if (!menus.length) {
     return [];
   }
   if (!active) {
-    return menus[0].children || [];
+    return menus[0][key] || [];
   }
   const temp = menus.find((m) => m.path === active);
   if (temp == null) {
-    return menus[0].children || [];
+    return menus[0][key] || [];
   }
-  return temp.children || [];
+  return temp[key] || [];
 }
 function useWindowListener(option, props) {
   const state = { timer: null };
@@ -242,7 +245,7 @@ function useDisableTransition() {
   });
   return { disableTransition };
 }
-function getMenuItems(menus) {
+function getMenuItems(menus, link) {
   return mapTree(menus, (m) => {
     const { path, meta } = m;
     const { hide, icon, title, props } = meta ?? {};
@@ -252,9 +255,9 @@ function getMenuItems(menus) {
     const item = {
       title,
       icon,
-      path,
+      path: link ? path : void 0,
       index: path,
-      ...props,
+      ...omit(props, ["title", "icon", "path", "index"]),
       meta
     };
     return item;