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

package/lib/ele-modal/util.js

@@ -22,6 +22,8 @@ const singleSidebarClass = "ele-state-single-sidebar";
 const topLayoutClass = "ele-state-top-layout";
 const expandedClass = "ele-state-expanded";
 const mobileClass = "ele-state-mobile";
+const fixTop = 0.65;
+const fixLeft = 0.65;
 function initModalStyle(modalEl, resizable) {
   modalEl.style.top = modalEl.offsetTop + "px";
   modalEl.style.left = modalEl.offsetLeft + "px";
@@ -104,8 +106,8 @@ function handleMovable(event, props) {
       left: e.clientX - downX + downOL,
       top: e.clientY - downY + downOT
     };
-    const limitL = wrapEl.clientWidth - modalEl.clientWidth - 1;
-    const limitT = wrapEl.clientHeight - modalEl.clientHeight - 2;
+    const limitL = wrapEl.clientWidth - modalEl.clientWidth - fixLeft;
+    const limitT = wrapEl.clientHeight - modalEl.clientHeight - fixTop;
     if (!props.moveOut) {
       if (position.left < 0) {
         position.left = 0;
@@ -140,8 +142,8 @@ function handleMovable(event, props) {
         position.top = minLimitT;
       }
     }
-    modalEl.style.left = `${position.left}px`;
-    modalEl.style.top = `${position.top}px`;
+    modalEl.style.left = `${Math.floor(position.left)}px`;
+    modalEl.style.top = `${Math.floor(position.top)}px`;
   };
   const mouseupFn = function() {
     modalEl.style.userSelect = "";
@@ -184,7 +186,7 @@ function handleResizable(event, props) {
   const mousemoveFn = function(e) {
     if (props.resizable !== "vertical") {
       const w = e.clientX - downX + downW;
-      const maxW = wrapEl.clientWidth - modalEl.offsetLeft - 1;
+      const maxW = wrapEl.clientWidth - modalEl.offsetLeft - fixLeft;
       const nw = (w < props.minWidth ? props.minWidth : !canMoveOut(props.moveOut, "right") && w > maxW ? maxW : w) + "px";
       modalEl.style.width = nw;
       modalEl.style.maxWidth = nw;
@@ -192,7 +194,7 @@ function handleResizable(event, props) {
     }
     if (props.resizable !== "horizontal") {
       const h = e.clientY - downY + downH;
-      const maxH = wrapEl.clientHeight - modalEl.offsetTop - 1;
+      const maxH = wrapEl.clientHeight - modalEl.offsetTop - fixTop;
       const nh = (h < props.minHeight ? props.minHeight : !canMoveOut(props.moveOut, "bottom") && h > maxH ? maxH : h) + "px";
       modalEl.style.height = nh;
       modalEl.style.maxHeight = nh;
@@ -250,60 +252,71 @@ function setModalPosition(modalEl, resizable, position, moveOut) {
   if (!wrapEl) {
     return;
   }
+  const location = {};
   initModalStyle(modalEl, resizable);
   const canOutB = canMoveOut(moveOut, "bottom");
   const canOutR = canMoveOut(moveOut, "right");
-  const t = wrapEl.clientHeight - modalEl.clientHeight - (canOutB ? 0 : 2);
+  const t = wrapEl.clientHeight - modalEl.clientHeight - (canOutB ? 0 : fixTop);
   const maxTop = t < 0 ? 0 : t;
-  const l = wrapEl.clientWidth - modalEl.clientWidth - (canOutR ? 0 : 1);
+  const l = wrapEl.clientWidth - modalEl.clientWidth - (canOutR ? 0 : fixLeft);
   const maxLeft = l < 0 ? 0 : l;
   if (position === "top") {
-    modalEl.style.top = "0px";
-    modalEl.style.left = `${maxLeft / 2}px`;
+    location.top = 0;
+    location.left = maxLeft / 2;
   } else if (position === "bottom") {
-    modalEl.style.top = `${maxTop}px`;
-    modalEl.style.left = `${maxLeft / 2}px`;
+    location.top = maxTop;
+    location.left = maxLeft / 2;
   } else if (position === "left") {
-    modalEl.style.top = `${maxTop / 2}px`;
-    modalEl.style.left = "0px";
+    location.top = maxTop / 2;
+    location.left = 0;
   } else if (position === "right") {
-    modalEl.style.top = `${maxTop / 2}px`;
-    modalEl.style.left = `${maxLeft}px`;
+    location.top = maxTop / 2;
+    location.left = maxLeft;
   } else if (position === "leftTop") {
-    modalEl.style.top = "0px";
-    modalEl.style.left = "0px";
+    location.top = 0;
+    location.left = 0;
   } else if (position === "leftBottom") {
-    modalEl.style.top = `${maxTop}px`;
-    modalEl.style.left = "0px";
+    location.top = maxTop;
+    location.left = 0;
   } else if (position === "rightTop") {
-    modalEl.style.top = "0px";
-    modalEl.style.left = `${maxLeft}px`;
+    location.top = 0;
+    location.left = maxLeft;
   } else if (position === "rightBottom") {
-    modalEl.style.top = `${maxTop}px`;
-    modalEl.style.left = `${maxLeft}px`;
+    location.top = maxTop;
+    location.left = maxLeft;
   } else if (position === "center") {
-    modalEl.style.top = `${maxTop / 2}px`;
-    modalEl.style.left = `${maxLeft / 2}px`;
+    location.top = maxTop / 2;
+    location.left = maxLeft / 2;
   } else if (typeof position === "object") {
     if (position.top != null) {
       if (typeof position.top === "number") {
-        modalEl.style.top = `${position.top}px`;
+        location.top = position.top;
       } else {
-        modalEl.style.top = position.top;
+        location.topValue = position.top;
       }
     } else if (position.left != null) {
-      modalEl.style.top = `${maxTop / 2}px`;
+      location.top = maxTop / 2;
     }
     if (position.left != null) {
       if (typeof position.left === "number") {
-        modalEl.style.left = `${position.left}px`;
+        location.left = position.left;
       } else {
-        modalEl.style.left = position.left;
+        location.leftValue = position.left;
       }
     } else if (position.top != null) {
-      modalEl.style.left = `${maxLeft / 2}px`;
+      location.left = maxLeft / 2;
     }
   }
+  if (location.top != null) {
+    modalEl.style.top = `${Math.floor(location.top)}px`;
+  } else if (location.topValue != null) {
+    modalEl.style.top = location.topValue;
+  }
+  if (location.left != null) {
+    modalEl.style.left = `${Math.floor(location.left)}px`;
+  } else if (location.leftValue != null) {
+    modalEl.style.left = location.leftValue;
+  }
 }
 function setInitPosition(modalEl, resizable, position, moveOut, force) {
   const attr = "ele-position";

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

@@ -58,6 +58,7 @@ declare const _default: import("vue").DefineComponent<{
     popperClass: string;
     disabled: boolean;
     small: boolean;
+    background: boolean;
     pagerCount: number;
     layout: string;
     pageSizes: number[];
@@ -65,7 +66,6 @@ declare const _default: import("vue").DefineComponent<{
     prevIcon: 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>;
     nextText: string;
     nextIcon: 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>;
-    background: boolean;
     hideOnSinglePage: boolean;
 }, {}>;
 export default _default;

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

@@ -23,15 +23,15 @@ declare const _default: import("vue").DefineComponent<{
     hideIcon: BooleanConstructor;
     hideConfirmButton: BooleanConstructor;
     hideCancelButton: BooleanConstructor;
-    iconStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    iconStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     iconProps: import("vue").PropType<ElIconProps>;
     confirmButtonProps: import("vue").PropType<import("../ele-app/types").ElButtonProps>;
     cancelButtonProps: import("vue").PropType<import("../ele-app/types").ElButtonProps>;
-    footerStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    footerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     bodyClass: StringConstructor;
-    bodyStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    titleStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    contentStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    contentStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     offset: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, undefined, boolean>;
     effect: {
         readonly default: "light";
@@ -113,15 +113,15 @@ declare const _default: import("vue").DefineComponent<{
     hideIcon: BooleanConstructor;
     hideConfirmButton: BooleanConstructor;
     hideCancelButton: BooleanConstructor;
-    iconStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    iconStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     iconProps: import("vue").PropType<ElIconProps>;
     confirmButtonProps: import("vue").PropType<import("../ele-app/types").ElButtonProps>;
     cancelButtonProps: import("vue").PropType<import("../ele-app/types").ElButtonProps>;
-    footerStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    footerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     bodyClass: StringConstructor;
-    bodyStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    titleStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    contentStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    contentStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     offset: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, undefined, boolean>;
     effect: {
         readonly default: "light";

package/lib/ele-popconfirm/index.js

@@ -60,9 +60,15 @@ const _sfc_main = vue.defineComponent({
       }
       const classes = ["ele-popconfirm-icon"];
       if (options.class) {
-        classes.push(options.class);
+        if (Array.isArray(options.class)) {
+          options.class.forEach((c) => {
+            classes.push(c);
+          });
+        } else {
+          classes.push(options.class);
+        }
       }
-      options.class = classes.join(" ");
+      options.class = classes;
       return options;
     });
     const confirmText = vue.computed(() => {

package/lib/ele-popconfirm/props.d.ts

@@ -1,5 +1,5 @@
 import type { PropType, ExtractPropTypes } from 'vue';
-import type { StyleValue, ElIconProps, ElButtonProps } from '../ele-app/types';
+import type { ElIconProps, ElButtonProps } from '../ele-app/types';
 /**
  * 属性
  */
@@ -26,15 +26,15 @@ export declare const popconfirmProps: {
     hideIcon: BooleanConstructor;
     hideConfirmButton: BooleanConstructor;
     hideCancelButton: BooleanConstructor;
-    iconStyle: PropType<StyleValue>;
+    iconStyle: PropType<Partial<import("vue").CSSProperties>>;
     iconProps: PropType<ElIconProps>;
     confirmButtonProps: PropType<ElButtonProps>;
     cancelButtonProps: PropType<ElButtonProps>;
-    footerStyle: PropType<StyleValue>;
+    footerStyle: PropType<Partial<import("vue").CSSProperties>>;
     bodyClass: StringConstructor;
-    bodyStyle: PropType<StyleValue>;
-    titleStyle: PropType<StyleValue>;
-    contentStyle: PropType<StyleValue>;
+    bodyStyle: PropType<Partial<import("vue").CSSProperties>>;
+    titleStyle: PropType<Partial<import("vue").CSSProperties>>;
+    contentStyle: PropType<Partial<import("vue").CSSProperties>>;
     offset: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, undefined, boolean>;
     effect: {
         readonly default: "light";

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

@@ -1,9 +1,9 @@
 import type { ElPopoverProps, ElPopoverInstance, ElPopperInstance } from '../ele-app/types';
 declare const _default: import("vue").DefineComponent<{
     bodyClass: StringConstructor;
-    bodyStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    titleStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    contentStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    contentStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     offset: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, undefined, boolean>;
     trigger: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils").Arrayable<import("element-plus").TooltipTriggerType>) | ((new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils").Arrayable<import("element-plus").TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
     effect: {
@@ -60,9 +60,9 @@ declare const _default: import("vue").DefineComponent<{
     'after-leave': () => boolean;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     bodyClass: StringConstructor;
-    bodyStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    titleStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    contentStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    contentStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     offset: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, undefined, boolean>;
     trigger: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils").Arrayable<import("element-plus").TooltipTriggerType>) | ((new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils").Arrayable<import("element-plus").TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
     effect: {

package/lib/ele-popover/props.d.ts

@@ -1,13 +1,12 @@
 import type { PropType, ExtractPropTypes } from 'vue';
-import type { StyleValue } from '../ele-app/types';
 /**
  * 属性
  */
 export declare const popoverProps: {
     bodyClass: StringConstructor;
-    bodyStyle: PropType<StyleValue>;
-    titleStyle: PropType<StyleValue>;
-    contentStyle: PropType<StyleValue>;
+    bodyStyle: PropType<Partial<import("vue").CSSProperties>>;
+    titleStyle: PropType<Partial<import("vue").CSSProperties>>;
+    contentStyle: PropType<Partial<import("vue").CSSProperties>>;
     offset: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, undefined, boolean>;
     trigger: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils").Arrayable<import("element-plus").TooltipTriggerType>) | ((new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils").Arrayable<import("element-plus").TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
     effect: {

package/lib/ele-printer/index.d.ts

@@ -1,8 +1,8 @@
 declare const _default: import("vue").DefineComponent<{
     modelValue: BooleanConstructor;
-    headerStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    bodyStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    footerStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    headerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    footerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     title: StringConstructor;
     margin: (StringConstructor | NumberConstructor)[];
     direction: import("vue").PropType<import("./types").PrintDirection | null>;
@@ -12,15 +12,16 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     container: import("vue").ShallowRef<Element>;
     visible: import("vue").Ref<boolean>;
+    isStatic: import("vue").ComputedRef<boolean>;
     print: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     'update:modelValue': (_value: boolean) => boolean;
     done: () => boolean;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: BooleanConstructor;
-    headerStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    bodyStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    footerStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    headerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    footerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     title: StringConstructor;
     margin: (StringConstructor | NumberConstructor)[];
     direction: import("vue").PropType<import("./types").PrintDirection | null>;

package/lib/ele-printer/index.js

@@ -15,6 +15,9 @@ const _sfc_main = vue.defineComponent({
     });
     const container = vue.shallowRef(util.getPrintContainer());
     const visible = vue.ref(false);
+    const isStatic = vue.computed(() => {
+      return props2.static;
+    });
     const print = () => {
       if (!authenticated.value) {
         updateModelValue(false);
@@ -55,7 +58,7 @@ const _sfc_main = vue.defineComponent({
       },
       { immediate: true }
     );
-    return { container, visible, print };
+    return { container, visible, isStatic, print };
   }
 });
 const _export_sfc = (sfc, props2) => {
@@ -70,10 +73,14 @@ const _hoisted_2 = { key: 1 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return vue.openBlock(), vue.createBlock(vue.Teleport, {
     to: _ctx.container,
-    disabled: _ctx.static && !_ctx.visible
+    disabled: _ctx.isStatic && !_ctx.visible
   }, [
     vue.createElementVNode("table", {
-      class: vue.normalizeClass(["ele-printer", { "is-open": _ctx.visible }, { "is-static": _ctx.static }])
+      class: vue.normalizeClass([
+        "ele-printer",
+        { "is-open": _ctx.visible },
+        { "is-static": _ctx.isStatic }
+      ])
     }, [
       _ctx.$slots.header ? (vue.openBlock(), vue.createElementBlock("thead", _hoisted_1, [
         vue.createElementVNode("tr", null, [

package/lib/ele-printer/props.d.ts

@@ -1,14 +1,13 @@
 import type { PropType, ExtractPropTypes } from 'vue';
-import type { StyleValue } from '../ele-app/types';
 import type { PrintDirection, PrintOrientation, PrintTarget } from './types';
 /**
  * 属性
  */
 export declare const printerProps: {
     modelValue: BooleanConstructor;
-    headerStyle: PropType<StyleValue>;
-    bodyStyle: PropType<StyleValue>;
-    footerStyle: PropType<StyleValue>;
+    headerStyle: PropType<Partial<import("vue").CSSProperties>>;
+    bodyStyle: PropType<Partial<import("vue").CSSProperties>>;
+    footerStyle: PropType<Partial<import("vue").CSSProperties>>;
     title: StringConstructor;
     margin: (StringConstructor | NumberConstructor)[];
     direction: PropType<PrintDirection | null>;

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

@@ -1,7 +1,7 @@
 import type { PropType } from 'vue';
 import { BreadcrumbItem } from '../../ele-breadcrumb/types';
 import type { EllipsisProps } from '../../ele-menus/types';
-import type { MenuItem, LevelItem, HeaderStyle } from '../types';
+import type { MenuItem, LevelItem, HeaderStyle, MenuItemTrigger, MenuItemProps } from '../types';
 declare const _default: import("vue").DefineComponent<{
     menus: {
         type: PropType<MenuItem[]>;
@@ -12,6 +12,7 @@ declare const _default: import("vue").DefineComponent<{
     ellipsis: BooleanConstructor;
     ellipsisProps: PropType<EllipsisProps>;
     menuTrigger: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
+    itemTrigger: PropType<MenuItemTrigger>;
     collapse: BooleanConstructor;
     sidebar: BooleanConstructor;
     titleSlot: StringConstructor;
@@ -26,17 +27,19 @@ declare const _default: import("vue").DefineComponent<{
     isHome: BooleanConstructor;
 }, {
     levelItems: import("vue").ShallowRef<BreadcrumbItem[]>;
-    menuItems: import("vue").ComputedRef<import("../../ele-menus/types").MenuItem[]>;
+    menuItems: import("vue").ComputedRef<MenuItemProps[]>;
     isDark: import("vue").ComputedRef<boolean>;
     isPrimary: import("vue").ComputedRef<boolean>;
     isIconSeparator: import("vue").ComputedRef<boolean>;
     onLogoClick: () => void;
     onOpen: (index: string, indexPath: string[]) => void;
     onClose: (index: string, indexPath: string[]) => void;
+    onItemClick: (item: MenuItemProps) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     logoClick: () => true;
     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[]>;
@@ -47,6 +50,7 @@ declare const _default: import("vue").DefineComponent<{
     ellipsis: BooleanConstructor;
     ellipsisProps: PropType<EllipsisProps>;
     menuTrigger: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "hover" | "click", unknown> | undefined>;
+    itemTrigger: PropType<MenuItemTrigger>;
     collapse: BooleanConstructor;
     sidebar: BooleanConstructor;
     titleSlot: StringConstructor;
@@ -62,6 +66,7 @@ declare const _default: import("vue").DefineComponent<{
 }>> & {
     onOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
+    onItemClick?: ((_item: MenuItemProps) => any) | undefined;
     onLogoClick?: (() => any) | undefined;
 }, {
     collapse: boolean;

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

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

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

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

package/lib/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/lib/ele-pro-layout/components/pro-sidebar.js

@@ -26,6 +26,8 @@ const _sfc_main = vue.defineComponent({
     defaultOpeneds: Array,
     // tooltip 主题
     popperEffect: String,
+    // 菜单项触发模式
+    itemTrigger: String,
     // 标题插槽名称
     titleSlot: String,
     // 图标插槽名称
@@ -33,7 +35,8 @@ const _sfc_main = vue.defineComponent({
   },
   emits: {
     open: (_index, _indexPath) => true,
-    close: (_index, _indexPath) => true
+    close: (_index, _indexPath) => true,
+    itemClick: (_item) => true
   },
   setup(props, { emit }) {
     const { scrollIntoView } = util.useMenuScroll(() => {
@@ -41,13 +44,18 @@ const _sfc_main = vue.defineComponent({
       return (_a = menusRef.value) == null ? void 0 : _a.$el;
     });
     const menusRef = vue.ref(null);
-    const menuItems = vue.computed(() => util.getMenuItems(props.menus));
+    const menuItems = vue.computed(() => {
+      return util.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);
+    };
     vue.watch(
       () => props.active,
       () => {
@@ -56,7 +64,7 @@ const _sfc_main = vue.defineComponent({
         });
       }
     );
-    return { menusRef, menuItems, onOpen, onClose };
+    return { menusRef, menuItems, onOpen, onClose, onItemClick };
   }
 });
 const _export_sfc = (sfc, props) => {
@@ -88,7 +96,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
         }, vue.createSlots({ _: 2 }, [
           _ctx.iconSlot && _ctx.$slots[_ctx.iconSlot] ? {
             name: "icon",
@@ -104,7 +113,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),