ele-admin-plus 1.2.1-beta.1 → 1.2.1-beta.2

package/es/ele-menus/util.js

@@ -8,6 +8,16 @@ const titleClass = "ele-menu-title";
 const triggerClass = "ele-menu-trigger";
 const overflowClass = "ele-menu-overflow";
 const ellipsisClass = "ele-sub-menu-ellipsis";
+function mergeClass(class1, class2) {
+  const classes = [];
+  if (class1 != null && class1 !== "") {
+    classes.push(class1);
+  }
+  if (class2 != null && class2 !== "") {
+    classes.push(class2);
+  }
+  return classes;
+}
 function getLinkNode(path) {
   if (isExternalLink(path)) {
     return h("a", {
@@ -98,7 +108,11 @@ function renderItems(items, sIcon, sTitle, tipDisabled, theme, popTheme, colorfu
             index: item.index || item.path,
             route: item.route,
             disabled: item.disabled,
-            class: item.overflow ? overflowClass : void 0,
+            class: mergeClass(
+              item.overflow ? overflowClass : void 0,
+              item.class
+            ),
+            style: item.style,
             onClick: () => {
             }
           },
@@ -124,30 +138,34 @@ function renderItems(items, sIcon, sTitle, tipDisabled, theme, popTheme, colorfu
     );
     if (item.group === true && !parentIsGroup) {
       nodes.push(
-        h(ElMenuItemGroup, { key }, {
-          default: () => {
-            return renderItems(
-              item.children,
-              sIcon,
-              sTitle,
-              tipDisabled,
-              theme,
-              popTheme,
-              colorful,
-              popupColorful,
-              firstPopClass,
-              first,
-              onItemClick,
-              onItemMouseenter,
-              onItemMouseleave,
-              webkit,
-              onParentMouseenter,
-              onParentMouseleave,
-              true
-            );
-          },
-          title: () => getNodes(iNodes, tNodes, bNode, parentTriggerNode)
-        })
+        h(
+          ElMenuItemGroup,
+          { key, style: item.style, class: item.class },
+          {
+            default: () => {
+              return renderItems(
+                item.children,
+                sIcon,
+                sTitle,
+                tipDisabled,
+                theme,
+                popTheme,
+                colorful,
+                popupColorful,
+                firstPopClass,
+                first,
+                onItemClick,
+                onItemMouseenter,
+                onItemMouseleave,
+                webkit,
+                onParentMouseenter,
+                onParentMouseleave,
+                true
+              );
+            },
+            title: () => getNodes(iNodes, tNodes, bNode, parentTriggerNode)
+          }
+        )
       );
       return;
     }
@@ -176,7 +194,11 @@ function renderItems(items, sIcon, sTitle, tipDisabled, theme, popTheme, colorfu
           expandOpenIcon: item.expandOpenIcon ?? ArrowDown,
           collapseCloseIcon: item.collapseCloseIcon ?? ArrowRight,
           collapseOpenIcon: item.collapseOpenIcon ?? ArrowRight,
-          class: item.overflow ? overflowClass : void 0
+          class: mergeClass(
+            item.overflow ? overflowClass : void 0,
+            item.class
+          ),
+          style: item.style
         },
         {
           default: () => {
@@ -342,6 +364,7 @@ export {
   getPopperClass,
   getTriggerNode,
   linkClass,
+  mergeClass,
   overflowClass,
   renderItems,
   titleClass,

package/es/ele-modal/index.d.ts

@@ -99,12 +99,12 @@ declare const _default: import('vue').DefineComponent<{
     handleResizeMousedown: (event: MouseEvent) => void;
     updateModelValue: (modelValue: boolean) => void;
     toggleFullscreen: (fullscreen?: boolean) => void;
-    onOpen: () => void;
-    onOpened: () => void;
-    onClose: () => void;
-    onClosed: () => void;
-    onOpenAutoFocus: () => void;
-    onCloseAutoFocus: () => void;
+    handleOpen: () => void;
+    handleOpened: () => void;
+    handleClose: () => void;
+    handleClosed: () => void;
+    handleOpenAutoFocus: () => void;
+    handleCloseAutoFocus: () => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     'update:fullscreen': (_fullscreen: boolean) => boolean;
     open: () => boolean;

package/es/ele-modal/index.js

@@ -144,7 +144,7 @@ const _sfc_main = defineComponent({
       });
       emit("update:fullscreen", isFullscreen.value);
     };
-    const onOpen = () => {
+    const handleOpen = () => {
       if (props.resetOnClose || props.destroyOnClose) {
         isFullscreen.value = props.fullscreen ?? false;
       }
@@ -159,27 +159,27 @@ const _sfc_main = defineComponent({
       });
       emit("open");
     };
-    const onOpened = () => {
+    const handleOpened = () => {
       const modalEl = getModalEl();
       if (modalEl) {
         modalEl.addEventListener("mousedown", mousedownListener);
       }
       emit("opened");
     };
-    const onClose = () => {
+    const handleClose = () => {
       const modalEl = getModalEl();
       if (modalEl) {
         modalEl.removeEventListener("mousedown", mousedownListener);
       }
       emit("close");
     };
-    const onClosed = () => {
+    const handleClosed = () => {
       emit("closed");
     };
-    const onOpenAutoFocus = () => {
+    const handleOpenAutoFocus = () => {
       emit("openAutoFocus");
     };
-    const onCloseAutoFocus = () => {
+    const handleCloseAutoFocus = () => {
       emit("closeAutoFocus");
     };
     watch(
@@ -209,12 +209,12 @@ const _sfc_main = defineComponent({
       handleResizeMousedown,
       updateModelValue,
       toggleFullscreen,
-      onOpen,
-      onOpened,
-      onClose,
-      onClosed,
-      onOpenAutoFocus,
-      onCloseAutoFocus
+      handleOpen,
+      handleOpened,
+      handleClose,
+      handleClosed,
+      handleOpenAutoFocus,
+      handleCloseAutoFocus
     };
   }
 });
@@ -261,12 +261,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       zIndex: _ctx.zIndex,
       headerAriaLevel: _ctx.headerAriaLevel,
       "onUpdate:modelValue": _ctx.updateModelValue,
-      onOpen: _ctx.onOpen,
-      onOpened: _ctx.onOpened,
-      onClose: _ctx.onClose,
-      onClosed: _ctx.onClosed,
-      onOpenAutoFocus: _ctx.onOpenAutoFocus,
-      onCloseAutoFocus: _ctx.onCloseAutoFocus
+      onOpen: _ctx.handleOpen,
+      onOpened: _ctx.handleOpened,
+      onClose: _ctx.handleClose,
+      onClosed: _ctx.handleClosed,
+      onOpenAutoFocus: _ctx.handleOpenAutoFocus,
+      onCloseAutoFocus: _ctx.handleCloseAutoFocus
     }), createSlots({
       header: withCtx(({ close, titleId, titleClass }) => [
         createElementVNode("div", {

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

@@ -34,8 +34,8 @@ declare const _default: import('vue').DefineComponent<{
     isInfinite: import('vue').ComputedRef<boolean>;
     pageTotal: import('vue').ComputedRef<number | undefined>;
     sizesPopperClass: import('vue').ComputedRef<string>;
-    onUpdateCurrentPage: (currentPage: number) => void;
-    onUpdatePageSize: (pageSize: number) => void;
+    handleUpdateCurrentPage: (currentPage: number) => void;
+    handleUpdatePageSize: (pageSize: number) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     'update:currentPage': (_currentPage: number) => boolean;
     'update:pageSize': (_pageSize: number) => boolean;

package/es/ele-pagination/index.js

@@ -28,18 +28,18 @@ const _sfc_main = defineComponent({
       }
       return classes.join(" ");
     });
-    const onUpdateCurrentPage = (currentPage) => {
+    const handleUpdateCurrentPage = (currentPage) => {
       emit("update:currentPage", currentPage);
     };
-    const onUpdatePageSize = (pageSize) => {
+    const handleUpdatePageSize = (pageSize) => {
       emit("update:pageSize", pageSize);
     };
     return {
       isInfinite,
       pageTotal,
       sizesPopperClass,
-      onUpdateCurrentPage,
-      onUpdatePageSize
+      handleUpdateCurrentPage,
+      handleUpdatePageSize
     };
   }
 });
@@ -77,8 +77,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       { "is-circle": _ctx.type === "circle" },
       { "is-infinite": _ctx.isInfinite }
     ]),
-    "onUpdate:currentPage": _ctx.onUpdateCurrentPage,
-    "onUpdate:pageSize": _ctx.onUpdatePageSize
+    "onUpdate:currentPage": _ctx.handleUpdateCurrentPage,
+    "onUpdate:pageSize": _ctx.handleUpdatePageSize
   }, createSlots({ _: 2 }, [
     renderList(Object.keys(_ctx.$slots), (name) => {
       return {

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

@@ -54,12 +54,6 @@ declare const _default: import('vue').DefineComponent<{
     visible: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown, null, boolean>;
     tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, 0, boolean>;
     content: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
-    popperStyle: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => string | false | import('vue').CSSProperties | import('vue').StyleValue[]) | (() => import('vue').StyleValue) | ((new (...args: any[]) => string | false | import('vue').CSSProperties | import('vue').StyleValue[]) | (() => import('vue').StyleValue))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
     enterable: {
         readonly default: true;
         readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>>;
@@ -72,6 +66,7 @@ declare const _default: import('vue').DefineComponent<{
     autoClose: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     showArrow: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    popperStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
     popperClass: StringConstructor;
     ariaLabel: StringConstructor;
     bg: StringConstructor;
@@ -104,11 +99,11 @@ declare const _default: import('vue').DefineComponent<{
     hidePopper: () => void;
     confirm: (e: MouseEvent) => void;
     cancel: (e: MouseEvent) => void;
-    onUpdateVisible: (visible: boolean) => void;
-    onPopBeforeEnter: () => void;
-    onPopBeforeLeave: () => void;
-    onPopAfterEnter: () => void;
-    onPopAfterLeave: () => void;
+    handleUpdateVisible: (visible: boolean) => void;
+    handlePopBeforeEnter: () => void;
+    handlePopBeforeLeave: () => void;
+    handlePopAfterEnter: () => void;
+    handlePopAfterLeave: () => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     confirm: (_e: MouseEvent) => boolean;
     cancel: (_e: MouseEvent) => boolean;
@@ -170,12 +165,6 @@ declare const _default: import('vue').DefineComponent<{
     visible: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown, null, boolean>;
     tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, 0, boolean>;
     content: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
-    popperStyle: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => string | false | import('vue').CSSProperties | import('vue').StyleValue[]) | (() => import('vue').StyleValue) | ((new (...args: any[]) => string | false | import('vue').CSSProperties | import('vue').StyleValue[]) | (() => import('vue').StyleValue))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
     enterable: {
         readonly default: true;
         readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>>;
@@ -188,6 +177,7 @@ declare const _default: import('vue').DefineComponent<{
     autoClose: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     showArrow: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    popperStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
     popperClass: StringConstructor;
     ariaLabel: StringConstructor;
     bg: StringConstructor;

package/es/ele-popconfirm/index.js

@@ -65,19 +65,19 @@ const _sfc_main = defineComponent({
       hidePopper();
       emit("cancel", e);
     };
-    const onUpdateVisible = (visible) => {
+    const handleUpdateVisible = (visible) => {
       emit("update:visible", visible);
     };
-    const onPopBeforeEnter = () => {
+    const handlePopBeforeEnter = () => {
       emit("before-enter");
     };
-    const onPopBeforeLeave = () => {
+    const handlePopBeforeLeave = () => {
       emit("before-leave");
     };
-    const onPopAfterEnter = () => {
+    const handlePopAfterEnter = () => {
       emit("after-enter");
     };
-    const onPopAfterLeave = () => {
+    const handlePopAfterLeave = () => {
       emit("after-leave");
     };
     return {
@@ -89,11 +89,11 @@ const _sfc_main = defineComponent({
       hidePopper,
       confirm,
       cancel,
-      onUpdateVisible,
-      onPopBeforeEnter,
-      onPopBeforeLeave,
-      onPopAfterEnter,
-      onPopAfterLeave
+      handleUpdateVisible,
+      handlePopBeforeEnter,
+      handlePopBeforeLeave,
+      handlePopAfterEnter,
+      handlePopAfterLeave
     };
   }
 });
@@ -114,11 +114,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createBlock(_component_EleTooltip, mergeProps({ tabindex: _ctx.tabindex }, _ctx.tooltipProps, {
     ref: "tooltipRef",
     isPopover: true,
-    "onUpdate:visible": _ctx.onUpdateVisible,
-    onBeforeShow: _ctx.onPopBeforeEnter,
-    onBeforeHide: _ctx.onPopBeforeLeave,
-    onShow: _ctx.onPopAfterEnter,
-    onHide: _ctx.onPopAfterLeave
+    "onUpdate:visible": _ctx.handleUpdateVisible,
+    onBeforeShow: _ctx.handlePopBeforeEnter,
+    onBeforeHide: _ctx.handlePopBeforeLeave,
+    onShow: _ctx.handlePopAfterEnter,
+    onHide: _ctx.handlePopAfterLeave
   }), {
     body: withCtx(() => [
       createElementVNode("div", {

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

@@ -49,7 +49,7 @@ export declare const popconfirmProps: {
     transition: {
         type: StringConstructor;
         default: string;
-    };
+    }; /** 取消按钮类型 */
     bodyClass: StringConstructor;
     bodyStyle: PropType<Partial<import('vue').CSSProperties>>;
     titleStyle: PropType<Partial<import('vue').CSSProperties>>;
@@ -71,12 +71,6 @@ export declare const popconfirmProps: {
     visible: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown, null, boolean>;
     tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, 0, boolean>;
     content: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
-    popperStyle: {
-        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => string | false | import('vue').CSSProperties | import('vue').StyleValue[]) | (() => import('vue').StyleValue) | ((new (...args: any[]) => string | false | import('vue').CSSProperties | import('vue').StyleValue[]) | (() => import('vue').StyleValue))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
     enterable: {
         readonly default: true;
         readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>>;
@@ -89,6 +83,7 @@ export declare const popconfirmProps: {
     autoClose: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     showArrow: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    popperStyle: PropType<Partial<import('vue').CSSProperties>>;
     popperClass: StringConstructor;
     ariaLabel: StringConstructor;
     bg: StringConstructor;

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

@@ -27,12 +27,6 @@ declare const _default: import('vue').DefineComponent<{
     trigger: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => "click" | "contextmenu" | "focus" | "hover" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => "click" | "contextmenu" | "focus" | "hover" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
     tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, 0, boolean>;
     content: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
-    popperStyle: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => string | false | import('vue').CSSProperties | import('vue').StyleValue[]) | (() => import('vue').StyleValue) | ((new (...args: any[]) => string | false | import('vue').CSSProperties | import('vue').StyleValue[]) | (() => import('vue').StyleValue))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
     enterable: {
         readonly default: true;
         readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>>;
@@ -45,6 +39,7 @@ declare const _default: import('vue').DefineComponent<{
     autoClose: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     showArrow: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    popperStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
     popperClass: StringConstructor;
     ariaLabel: StringConstructor;
     bg: StringConstructor;
@@ -72,11 +67,11 @@ declare const _default: import('vue').DefineComponent<{
     tooltipRef: import('vue').Ref<EleTooltipInstance>;
     tooltipProps: import('vue').ComputedRef<Partial<import('../ele-tooltip/props').TooltipProps>>;
     hide: () => void;
-    onUpdateVisible: (visible: boolean) => void;
-    onPopBeforeEnter: () => void;
-    onPopBeforeLeave: () => void;
-    onPopAfterEnter: () => void;
-    onPopAfterLeave: () => void;
+    handleUpdateVisible: (visible: boolean) => void;
+    handlePopBeforeEnter: () => void;
+    handlePopBeforeLeave: () => void;
+    handlePopAfterEnter: () => void;
+    handlePopAfterLeave: () => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     'update:visible': (value: boolean) => boolean;
     'before-enter': () => boolean;
@@ -110,12 +105,6 @@ declare const _default: import('vue').DefineComponent<{
     trigger: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => "click" | "contextmenu" | "focus" | "hover" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => "click" | "contextmenu" | "focus" | "hover" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
     tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, 0, boolean>;
     content: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
-    popperStyle: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => string | false | import('vue').CSSProperties | import('vue').StyleValue[]) | (() => import('vue').StyleValue) | ((new (...args: any[]) => string | false | import('vue').CSSProperties | import('vue').StyleValue[]) | (() => import('vue').StyleValue))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
     enterable: {
         readonly default: true;
         readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>>;
@@ -128,6 +117,7 @@ declare const _default: import('vue').DefineComponent<{
     autoClose: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     showArrow: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    popperStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
     popperClass: StringConstructor;
     ariaLabel: StringConstructor;
     bg: StringConstructor;

package/es/ele-popover/index.js

@@ -22,30 +22,30 @@ const _sfc_main = defineComponent({
     const hide = () => {
       tooltipRef.value && tooltipRef.value.hide();
     };
-    const onUpdateVisible = (visible) => {
+    const handleUpdateVisible = (visible) => {
       emit("update:visible", visible);
     };
-    const onPopBeforeEnter = () => {
+    const handlePopBeforeEnter = () => {
       emit("before-enter");
     };
-    const onPopBeforeLeave = () => {
+    const handlePopBeforeLeave = () => {
       emit("before-leave");
     };
-    const onPopAfterEnter = () => {
+    const handlePopAfterEnter = () => {
       emit("after-enter");
     };
-    const onPopAfterLeave = () => {
+    const handlePopAfterLeave = () => {
       emit("after-leave");
     };
     return {
       tooltipRef,
       tooltipProps,
       hide,
-      onUpdateVisible,
-      onPopBeforeEnter,
-      onPopBeforeLeave,
-      onPopAfterEnter,
-      onPopAfterLeave
+      handleUpdateVisible,
+      handlePopBeforeEnter,
+      handlePopBeforeLeave,
+      handlePopAfterEnter,
+      handlePopAfterLeave
     };
   }
 });
@@ -61,11 +61,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createBlock(_component_EleTooltip, mergeProps({ tabindex: _ctx.tabindex }, _ctx.tooltipProps, {
     ref: "tooltipRef",
     isPopover: true,
-    "onUpdate:visible": _ctx.onUpdateVisible,
-    onBeforeShow: _ctx.onPopBeforeEnter,
-    onBeforeHide: _ctx.onPopBeforeLeave,
-    onShow: _ctx.onPopAfterEnter,
-    onHide: _ctx.onPopAfterLeave
+    "onUpdate:visible": _ctx.handleUpdateVisible,
+    onBeforeShow: _ctx.handlePopBeforeEnter,
+    onBeforeHide: _ctx.handlePopBeforeLeave,
+    onShow: _ctx.handlePopAfterEnter,
+    onHide: _ctx.handlePopAfterLeave
   }), {
     body: withCtx(() => [
       createElementVNode("div", {

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

@@ -18,12 +18,6 @@ export declare const popoverProps: {
     contentStyle: PropType<Partial<import('vue').CSSProperties>>;
     width: import('element-plus/es/utils/index').EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
     title: StringConstructor;
-    popperStyle: {
-        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => string | false | import('vue').CSSProperties | import('vue').StyleValue[]) | (() => import('vue').StyleValue) | ((new (...args: any[]) => string | false | import('vue').CSSProperties | import('vue').StyleValue[]) | (() => import('vue').StyleValue))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
     showArrow: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     disabled: BooleanConstructor;
     trigger: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
@@ -52,6 +46,7 @@ export declare const popoverProps: {
     hideAfter: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
     autoClose: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, 0, boolean>;
+    popperStyle: PropType<Partial<import('vue').CSSProperties>>;
     popperClass: StringConstructor;
     className: StringConstructor;
     arrowOffset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;

package/es/ele-popover/props.js

@@ -4,6 +4,7 @@ import { tooltipProps } from "../ele-tooltip/props";
 const normalizeProps = omit(popoverProps$1, ["onUpdate:visible"]);
 const popoverProps = {
   ...omit(tooltipProps, ["rawContent"]),
+  popperStyle: [String, Array, Object],
   popperClass: String,
   ...normalizeProps,
   transition: {

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

@@ -16,7 +16,7 @@ declare const _default: import('vue').DefineComponent<{
     isStatic: import('vue').ComputedRef<boolean>;
     print: (options?: any) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    'update:modelValue': (_value: boolean) => boolean; /** 打印 */
+    'update:modelValue': (_value: boolean) => boolean;
     done: () => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     modelValue: BooleanConstructor;

package/es/ele-printer/index.js

@@ -1,6 +1,6 @@
-import { defineComponent, shallowRef, ref, computed, watch, nextTick, resolveComponent, openBlock, createBlock, Teleport, createElementVNode, normalizeClass, createElementBlock, normalizeStyle, renderSlot, createCommentVNode, createVNode, withCtx } from "vue";
+import { defineComponent, shallowRef, ref, computed, watch, onMounted, nextTick, resolveComponent, openBlock, createBlock, Teleport, createElementVNode, normalizeClass, createElementBlock, normalizeStyle, renderSlot, createCommentVNode, createVNode, withCtx } from "vue";
 import ReceiverView from "../ele-config-provider/components/receiver-view";
-import { usePrinter, getPrintContainer, mergeOptions, doPrintOnFrame, doPrint } from "./util";
+import { usePrinter, getPrintContainer, mergeOptions } from "./util";
 import { printerProps, printerEmits } from "./props";
 const _sfc_main = defineComponent({
   name: "ElePrinter",
@@ -8,38 +8,31 @@ const _sfc_main = defineComponent({
   props: printerProps,
   emits: printerEmits,
   setup(props, { emit }) {
-    const { printId } = usePrinter(() => {
+    const doPrint = usePrinter(() => {
+      visible.value = false;
       updateModelValue(false);
-      onDone();
+      handleDone();
     });
     const container = shallowRef(getPrintContainer());
     const visible = ref(false);
-    const isStatic = computed(() => {
-      return props.static;
-    });
+    const isStatic = computed(() => props.static);
     const print = (options) => {
+      if (visible.value) {
+        return;
+      }
       visible.value = true;
       nextTick(() => {
         const option = {
-          printId,
           title: props.title,
           margin: props.margin,
           direction: props.direction,
           orientation: props.orientation,
           options: mergeOptions(props.options, options)
         };
-        if (props.target === "_iframe") {
-          doPrintOnFrame(option);
-          visible.value = false;
-        } else {
-          doPrint(option);
-          visible.value = false;
-          updateModelValue(false);
-          onDone();
-        }
+        doPrint(option, props.target);
       });
     };
-    const onDone = () => {
+    const handleDone = () => {
       emit("done");
     };
     const updateModelValue = (value) => {
@@ -47,13 +40,17 @@ const _sfc_main = defineComponent({
     };
     watch(
       () => props.modelValue,
-      (value) => {
-        if (value) {
+      (modelValue) => {
+        if (modelValue) {
           print();
         }
-      },
-      { immediate: true }
+      }
     );
+    onMounted(() => {
+      if (props.modelValue) {
+        print();
+      }
+    });
     return { container, visible, isStatic, print };
   }
 });