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

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

@@ -22,6 +22,8 @@ const _sfc_main = defineComponent({
     ellipsisProps: Object,
     // 子菜单触发方式
     menuTrigger: String,
+    // 菜单项触发模式
+    itemTrigger: String,
     // 侧栏是否折叠
     collapse: Boolean,
     // 当前是否有侧栏
@@ -47,11 +49,14 @@ const _sfc_main = defineComponent({
   emits: {
     logoClick: () => true,
     open: (_index, _indexPath) => true,
-    close: (_index, _indexPath) => true
+    close: (_index, _indexPath) => true,
+    itemClick: (_item) => true
   },
   setup(props, { emit }) {
     const levelItems = shallowRef([]);
-    const menuItems = computed(() => getMenuItems(props.menus));
+    const menuItems = computed(() => {
+      return getMenuItems(props.menus, props.itemTrigger != "click");
+    });
     const isDark = computed(() => props.headerStyle === "dark");
     const isPrimary = computed(() => props.headerStyle === "primary");
     const isIconSeparator = computed(() => {
@@ -66,6 +71,9 @@ const _sfc_main = defineComponent({
     const onClose = (index, indexPath) => {
       emit("close", index, indexPath);
     };
+    const onItemClick = (item) => {
+      emit("itemClick", item);
+    };
     watch(
       [() => props.isHome, () => props.homePath, () => props.levels],
       () => {
@@ -95,7 +103,8 @@ const _sfc_main = defineComponent({
       isIconSeparator,
       onLogoClick,
       onOpen,
-      onClose
+      onClose,
+      onItemClick
     };
   }
 });
@@ -169,7 +178,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         defaultActive: _ctx.active,
         menuTrigger: _ctx.menuTrigger,
         onOpen: _ctx.onOpen,
-        onClose: _ctx.onClose
+        onClose: _ctx.onClose,
+        onItemClick: _ctx.onItemClick
       }, createSlots({ _: 2 }, [
         _ctx.iconSlot && _ctx.$slots[_ctx.iconSlot] ? {
           name: "icon",
@@ -185,7 +195,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           ]),
           key: "1"
         } : void 0
-      ]), 1032, ["items", "theme", "popupTheme", "ellipsis", "ellipsisProps", "defaultActive", "menuTrigger", "onOpen", "onClose"])) : createCommentVNode("", true)
+      ]), 1032, ["items", "theme", "popupTheme", "ellipsis", "ellipsisProps", "defaultActive", "menuTrigger", "onOpen", "onClose", "onItemClick"])) : createCommentVNode("", true)
     ]),
     _ctx.$slots.right ? (openBlock(), createElementBlock("div", _hoisted_4, [
       renderSlot(_ctx.$slots, "right", { sidebar: _ctx.sidebar })

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

@@ -57,14 +57,17 @@ const _sfc_main = defineComponent({
         state.timer = null;
       }
     };
-    watch([() => props.tabActive, () => props.tabData], () => {
-      clearTimer();
-      if (visible.value) {
-        active.value = null;
-      } else {
-        onAfterLeave(props.transitionDelay);
+    watch(
+      () => props.tabActive,
+      () => {
+        clearTimer();
+        if (visible.value) {
+          active.value = null;
+        } else {
+          onAfterLeave(props.transitionDelay);
+        }
       }
-    });
+    );
     onBeforeUnmount(() => {
       clearTimer();
     });

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

@@ -1,6 +1,6 @@
 import type { PropType } from 'vue';
 import type { ElScrollbarInstance } from '../../ele-app/types';
-import type { MenuItem, SidebarStyle } from '../types';
+import type { MenuItem, SidebarStyle, MenuItemTrigger, MenuItemProps } from '../types';
 declare const _default: import("vue").DefineComponent<{
     menus: {
         type: PropType<MenuItem[]>;
@@ -13,16 +13,19 @@ declare const _default: import("vue").DefineComponent<{
     uniqueOpened: BooleanConstructor;
     defaultOpeneds: PropType<string[]>;
     popperEffect: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown>>;
+    itemTrigger: PropType<MenuItemTrigger>;
     titleSlot: StringConstructor;
     iconSlot: StringConstructor;
 }, {
     menusRef: import("vue").Ref<ElScrollbarInstance>;
-    menuItems: import("vue").ComputedRef<import("../../ele-menus/types").MenuItem[]>;
+    menuItems: import("vue").ComputedRef<MenuItemProps[]>;
     onOpen: (index: string, indexPath: string[]) => void;
     onClose: (index: string, indexPath: string[]) => void;
+    onItemClick: (item: MenuItemProps) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     open: (_index: string, _indexPath: string[]) => true;
     close: (_index: string, _indexPath: string[]) => true;
+    itemClick: (_item: MenuItemProps) => true;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     menus: {
         type: PropType<MenuItem[]>;
@@ -35,11 +38,13 @@ declare const _default: import("vue").DefineComponent<{
     uniqueOpened: BooleanConstructor;
     defaultOpeneds: PropType<string[]>;
     popperEffect: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown>>;
+    itemTrigger: PropType<MenuItemTrigger>;
     titleSlot: StringConstructor;
     iconSlot: StringConstructor;
 }>> & {
     onOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
+    onItemClick?: ((_item: MenuItemProps) => any) | undefined;
 }, {
     uniqueOpened: boolean;
     collapse: boolean;

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

@@ -25,6 +25,8 @@ const _sfc_main = defineComponent({
     defaultOpeneds: Array,
     // tooltip 主题
     popperEffect: String,
+    // 菜单项触发模式
+    itemTrigger: String,
     // 标题插槽名称
     titleSlot: String,
     // 图标插槽名称
@@ -32,7 +34,8 @@ const _sfc_main = defineComponent({
   },
   emits: {
     open: (_index, _indexPath) => true,
-    close: (_index, _indexPath) => true
+    close: (_index, _indexPath) => true,
+    itemClick: (_item) => true
   },
   setup(props, { emit }) {
     const { scrollIntoView } = useMenuScroll(() => {
@@ -40,13 +43,18 @@ const _sfc_main = defineComponent({
       return (_a = menusRef.value) == null ? void 0 : _a.$el;
     });
     const menusRef = ref(null);
-    const menuItems = computed(() => getMenuItems(props.menus));
+    const menuItems = computed(() => {
+      return getMenuItems(props.menus, props.itemTrigger != "click");
+    });
     const onOpen = (index, indexPath) => {
       emit("open", index, indexPath);
     };
     const onClose = (index, indexPath) => {
       emit("close", index, indexPath);
     };
+    const onItemClick = (item) => {
+      emit("itemClick", item);
+    };
     watch(
       () => props.active,
       () => {
@@ -55,7 +63,7 @@ const _sfc_main = defineComponent({
         });
       }
     );
-    return { menusRef, menuItems, onOpen, onClose };
+    return { menusRef, menuItems, onOpen, onClose, onItemClick };
   }
 });
 const _export_sfc = (sfc, props) => {
@@ -87,7 +95,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           popperEffect: _ctx.popperEffect,
           collapseTransition: false,
           onOpen: _ctx.onOpen,
-          onClose: _ctx.onClose
+          onClose: _ctx.onClose,
+          onItemClick: _ctx.onItemClick
         }, createSlots({ _: 2 }, [
           _ctx.iconSlot && _ctx.$slots[_ctx.iconSlot] ? {
             name: "icon",
@@ -103,7 +112,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ]),
             key: "1"
           } : void 0
-        ]), 1032, ["items", "theme", "colorful", "collapse", "defaultActive", "defaultOpeneds", "uniqueOpened", "popperEffect", "onOpen", "onClose"])
+        ]), 1032, ["items", "theme", "colorful", "collapse", "defaultActive", "defaultOpeneds", "uniqueOpened", "popperEffect", "onOpen", "onClose", "onItemClick"])
       ]),
       _: 3
     }, 512),

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

@@ -1,6 +1,6 @@
 import type { PropType } from 'vue';
 import type { ElScrollbarInstance } from '../../ele-app/types';
-import type { MenuItem, SidebarStyle } from '../types';
+import type { MenuItem, SidebarStyle, MenuItemTrigger, MenuItemProps } from '../types';
 declare const _default: import("vue").DefineComponent<{
     menus: {
         type: PropType<MenuItem[]>;
@@ -12,12 +12,16 @@ declare const _default: import("vue").DefineComponent<{
     compact: BooleanConstructor;
     collapse: BooleanConstructor;
     popperEffect: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown>>;
+    itemTrigger: PropType<MenuItemTrigger>;
     titleSlot: StringConstructor;
     iconSlot: StringConstructor;
 }, {
     menusRef: import("vue").Ref<ElScrollbarInstance>;
-    menuItems: import("vue").ComputedRef<import("../../ele-menus/types").MenuItem[]>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    menuItems: import("vue").ComputedRef<MenuItemProps[]>;
+    onItemClick: (item: MenuItemProps) => void;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    itemClick: (_item: MenuItemProps) => true;
+}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     menus: {
         type: PropType<MenuItem[]>;
         required: true;
@@ -28,9 +32,12 @@ declare const _default: import("vue").DefineComponent<{
     compact: BooleanConstructor;
     collapse: BooleanConstructor;
     popperEffect: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown>>;
+    itemTrigger: PropType<MenuItemTrigger>;
     titleSlot: StringConstructor;
     iconSlot: StringConstructor;
-}>>, {
+}>> & {
+    onItemClick?: ((_item: MenuItemProps) => any) | undefined;
+}, {
     collapse: boolean;
     compact: boolean;
     colorfulIcon: boolean;

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

@@ -23,18 +23,28 @@ const _sfc_main = defineComponent({
     collapse: Boolean,
     // tooltip 主题
     popperEffect: String,
+    // 菜单项触发模式
+    itemTrigger: String,
     // 标题插槽名称
     titleSlot: String,
     // 图标插槽名称
     iconSlot: String
   },
-  setup(props) {
+  emits: {
+    itemClick: (_item) => true
+  },
+  setup(props, { emit }) {
     const { scrollIntoView } = useMenuScroll(() => {
       var _a;
       return (_a = menusRef.value) == null ? void 0 : _a.$el;
     });
     const menusRef = ref(null);
-    const menuItems = computed(() => getMenuItems(props.menus));
+    const menuItems = computed(() => {
+      return getMenuItems(props.menus, props.itemTrigger != "click");
+    });
+    const onItemClick = (item) => {
+      emit("itemClick", item);
+    };
     watch(
       () => props.active,
       () => {
@@ -43,7 +53,7 @@ const _sfc_main = defineComponent({
         });
       }
     );
-    return { menusRef, menuItems };
+    return { menusRef, menuItems, onItemClick };
   }
 });
 const _export_sfc = (sfc, props) => {
@@ -74,7 +84,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           popperEffect: _ctx.popperEffect,
           collapseTransition: false,
           firstPopperClass: "ele-admin-sidebox-popup",
-          tooltipDisabled: !_ctx.compact
+          tooltipDisabled: !_ctx.compact,
+          onItemClick: _ctx.onItemClick
         }, createSlots({ _: 2 }, [
           _ctx.iconSlot && _ctx.$slots[_ctx.iconSlot] ? {
             name: "icon",
@@ -90,7 +101,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ]),
             key: "1"
           } : void 0
-        ]), 1032, ["items", "theme", "popupColorful", "collapse", "defaultActive", "popperEffect", "tooltipDisabled"])
+        ]), 1032, ["items", "theme", "popupColorful", "collapse", "defaultActive", "popperEffect", "tooltipDisabled", "onItemClick"])
       ]),
       _: 3
     }, 512),

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

@@ -63,10 +63,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         placement: "bottom-end",
         popperClass: "ele-tab-popup",
         popperOptions: {
-          modifiers: [
-            { name: "arrow", options: { padding: 12 } },
-            { name: "offset", options: { offset: [12, 8] } }
-          ]
+          modifiers: [{ name: "offset", options: { offset: [12, 8] } }]
         },
         items: _ctx.items,
         onCommand: _ctx.onCommand

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

@@ -1,6 +1,6 @@
 import type { Ref } from 'vue';
 import type { ClassValues } from '../ele-app/types';
-import type { MenuItem, TabItem, LevelItem, TabItemEventOption } from './types';
+import type { MenuItem, TabItem, LevelItem, TabItemEventOption, MenuItemProps } from './types';
 declare const _default: import("vue").DefineComponent<{
     menus: import("vue").PropType<MenuItem[] | null>;
     tabs: import("vue").PropType<TabItem[] | null>;
@@ -35,6 +35,7 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
+    backTopTarget: StringConstructor;
     ellipsis: {
         type: BooleanConstructor;
         default: boolean;
@@ -126,6 +127,10 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
     tooltipEffect: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    navTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
+    boxTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
+    itemTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
+    beforeClick: import("vue").PropType<import("./types").BeforeClick>;
     keepAlive: BooleanConstructor;
     transitionName: StringConstructor;
     transitionDelay: {
@@ -137,8 +142,8 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
 }, {
-    UNAUTHORIZED_TIP: string;
     authenticated: Ref<boolean>;
+    watermark: Ref<string[]>;
     contentRef: Ref<HTMLElement | null>;
     levelData: import("vue").ShallowRef<LevelItem[]>;
     tabData: import("vue").ShallowRef<TabItem[]>;
@@ -155,6 +160,7 @@ declare const _default: import("vue").DefineComponent<{
     sidebox: import("vue").ComputedRef<boolean>;
     sidebar: import("vue").ComputedRef<boolean>;
     layoutClass: import("vue").ComputedRef<ClassValues>;
+    backTopSelector: import("vue").ComputedRef<string | undefined>;
     sidebarCollapse: import("vue").ComputedRef<boolean>;
     sidebarTheme: import("vue").ComputedRef<"light" | "dark">;
     updateCollapse: (val?: boolean | MouseEvent) => void;
@@ -167,6 +173,9 @@ declare const _default: import("vue").DefineComponent<{
     onSideMenuClose: (index: string, indexPath: string[]) => void;
     onHeadMenuOpen: (index: string, indexPath: string[]) => void;
     onHeadMenuClose: (index: string, indexPath: string[]) => void;
+    onNavItemClick: (item: MenuItemProps) => void;
+    onBoxItemClick: (item: MenuItemProps) => void;
+    onMenuItemClick: (item: MenuItemProps) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     'update:collapse': (_collapse: boolean) => boolean;
     'update:maximized': (_val: boolean) => boolean;
@@ -215,6 +224,7 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
+    backTopTarget: StringConstructor;
     ellipsis: {
         type: BooleanConstructor;
         default: boolean;
@@ -306,6 +316,10 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
     tooltipEffect: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    navTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
+    boxTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
+    itemTrigger: import("vue").PropType<import("./types").MenuItemTrigger>;
+    beforeClick: import("vue").PropType<import("./types").BeforeClick>;
     keepAlive: BooleanConstructor;
     transitionName: StringConstructor;
     transitionDelay: {
@@ -335,6 +349,7 @@ declare const _default: import("vue").DefineComponent<{
     menuTrigger: import("element-plus/es/utils").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined;
     collapse: boolean;
     ellipsis: boolean;
+    transitionDelay: number;
     layout: import("./types").Layout;
     maximized: boolean;
     compact: boolean;
@@ -342,7 +357,6 @@ declare const _default: import("vue").DefineComponent<{
     tabBar: boolean;
     keepAlive: boolean;
     responsive: boolean;
-    transitionDelay: number;
     breadcrumb: boolean;
     breadcrumbSeparator: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) | ((new (...args: any[]) => (string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>) & {}) | (() => string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>))[], unknown, unknown> | undefined;
     backTop: boolean;