ele-admin-plus 1.1.5 → 1.1.6-beta.2

package/es/ele-file-list/components/file-table-item.js

@@ -181,11 +181,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         ], 4);
       }), 128))
     ], 32),
-    _ctx.contextMenus || _ctx.$slots.contextMenu ? (openBlock(), createBlock(_component_EleDropdown, mergeProps({ key: 0 }, _ctx.contextMenuProps, {
+    _ctx.contextMenus || _ctx.$slots.contextMenu ? (openBlock(), createBlock(_component_EleDropdown, mergeProps({
+      key: 0,
+      placement: "bottom-start",
+      popperClass: "ele-file-list-item-context"
+    }, _ctx.contextMenuProps, {
       ref: "dropdownRef",
       trigger: "click",
-      placement: "bottom-start",
-      popperClass: "ele-file-list-item-context",
       class: "ele-file-list-item-dropdown",
       items: _ctx.contextMenus,
       onCommand: _ctx.onItemContextMenu,

package/es/ele-file-list/components/file-table.d.ts

@@ -38,6 +38,7 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     itemRefs: Ref<TableItemInstance[]>;
     tableCols: import("vue").ComputedRef<ColumnItem[]>;
+    getContextMenus: (item: FileItem) => import("../../ele-dropdown/types").DropdownItem[] | undefined;
     onCheckAllChange: () => void;
     onItemClick: (item: FileItem) => void;
     onItemCheckChange: (item: FileItem) => void;

package/es/ele-file-list/components/file-table.js

@@ -73,6 +73,12 @@ const _sfc_main = defineComponent({
       ];
       return cols;
     });
+    const getContextMenus = (item) => {
+      if (typeof props.contextMenus === "function") {
+        return props.contextMenus(item);
+      }
+      return props.contextMenus;
+    };
     const onCheckAllChange = () => {
       emit("checkAllChange");
     };
@@ -106,6 +112,7 @@ const _sfc_main = defineComponent({
     return {
       itemRefs,
       tableCols,
+      getContextMenus,
       onCheckAllChange,
       onItemClick,
       onItemCheckChange,
@@ -200,7 +207,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           current: _ctx.current,
           icons: _ctx.icons,
           columns: _ctx.tableCols,
-          contextMenus: typeof _ctx.contextMenus === "function" ? _ctx.contextMenus(item) : _ctx.contextMenus,
+          contextMenus: _ctx.getContextMenus(item),
           contextMenuProps: _ctx.contextMenuProps,
           onClick: _ctx.onItemClick,
           onCheckChange: _ctx.onItemCheckChange,

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

@@ -89,7 +89,7 @@ declare const _default: import("vue").DefineComponent<{
     dialogRef: import("vue").Ref<ElDialogInstance>;
     container: import("vue").Ref<Element>;
     isFullscreen: import("vue").Ref<boolean>;
-    destroyed: import("vue").Ref<boolean>;
+    enable: import("vue").Ref<boolean>;
     dialogProps: import("vue").ComputedRef<ElDialogProps>;
     updateModelValue: (modelValue: boolean) => void;
     toggleFullscreen: (fullscreen?: boolean) => void;

package/es/ele-modal/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, unref, watch, onActivated, onDeactivated, nextTick, resolveComponent, openBlock, createBlock, Teleport, createVNode, mergeProps, createSlots, withCtx, createElementVNode, normalizeStyle, renderSlot, createTextVNode, toDisplayString, createElementBlock, createCommentVNode } from "vue";
+import { defineComponent, ref, computed, unref, watch, onActivated, onDeactivated, nextTick, resolveComponent, openBlock, createBlock, Teleport, createVNode, mergeProps, createSlots, withCtx, createElementVNode, normalizeStyle, createElementBlock, renderSlot, createTextVNode, toDisplayString, createCommentVNode } from "vue";
 import { ElDialog, ElIcon } from "element-plus";
 import { Close } from "@element-plus/icons-vue";
 import { CompressOutlined, ExpandOutlined } from "../icons";
@@ -19,7 +19,9 @@ const _sfc_main = defineComponent({
     const container = ref(getModalContainer());
     const isFullscreen = ref(props.fullscreen ?? false);
     const isActivated = ref(true);
-    const destroyed = ref(false);
+    const enable = ref(
+      props.destroyOnClose && !props.modelValue ? false : true
+    );
     const dialogClass = computed(() => {
       const layoutState = unref(layoutProvide);
       const classes = [wrapperClass];
@@ -93,6 +95,7 @@ const _sfc_main = defineComponent({
         showClose: false,
         draggable: false,
         alignCenter: false,
+        destroyOnClose: false,
         modalClass: dialogClass.value
       };
       return Object.assign({}, attrs, pick(props, dialogPropKeys), opt);
@@ -123,6 +126,9 @@ const _sfc_main = defineComponent({
       if (props.resetOnClose || props.destroyOnClose) {
         isFullscreen.value = props.fullscreen ?? false;
       }
+      if (!enable.value) {
+        enable.value = true;
+      }
       nextTick(() => {
         const modalEl = getModalEl();
         if (props.resetOnClose) {
@@ -156,6 +162,9 @@ const _sfc_main = defineComponent({
       emit("close");
     };
     const onClosed = () => {
+      if (enable.value) {
+        enable.value = false;
+      }
       emit("closed");
     };
     const onOpenAutoFocus = () => {
@@ -184,6 +193,18 @@ const _sfc_main = defineComponent({
         }
       }
     );
+    watch(
+      () => props.destroyOnClose,
+      (destroyOnClose) => {
+        if (destroyOnClose) {
+          if (!props.modelValue && enable.value) {
+            enable.value = false;
+          }
+        } else if (!enable.value) {
+          enable.value = true;
+        }
+      }
+    );
     onActivated(() => {
       isActivated.value = true;
     });
@@ -194,7 +215,7 @@ const _sfc_main = defineComponent({
       dialogRef,
       container,
       isFullscreen,
-      destroyed,
+      enable,
       dialogProps,
       updateModelValue,
       toggleFullscreen,
@@ -240,7 +261,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           class: "ele-modal-header",
           style: normalizeStyle(_ctx.headerStyle)
         }, [
-          createElementVNode("div", {
+          _ctx.enable ? (openBlock(), createElementBlock("div", {
+            key: 0,
             class: "ele-modal-title",
             style: normalizeStyle(_ctx.titleStyle)
           }, [
@@ -251,9 +273,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             }, () => [
               createTextVNode(toDisplayString(_ctx.title), 1)
             ])
-          ], 4),
-          _ctx.maxable ? (openBlock(), createElementBlock("div", {
-            key: 0,
+          ], 4)) : createCommentVNode("", true),
+          _ctx.enable && _ctx.maxable ? (openBlock(), createElementBlock("div", {
+            key: 1,
             class: "ele-modal-tool",
             style: normalizeStyle(_ctx.fullscreenBtnStyle),
             onClick: _cache[0] || (_cache[0] = ($event) => _ctx.toggleFullscreen())
@@ -267,8 +289,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               })
             ])
           ], 4)) : createCommentVNode("", true),
-          _ctx.showClose ? (openBlock(), createElementBlock("div", {
-            key: 1,
+          _ctx.enable && _ctx.showClose ? (openBlock(), createElementBlock("div", {
+            key: 2,
             class: "ele-modal-tool",
             style: normalizeStyle(_ctx.closeBtnStyle),
             onClick: close
@@ -285,24 +307,26 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         ], 4)
       ]),
       default: withCtx(() => [
-        createElementVNode("div", {
+        _ctx.enable ? (openBlock(), createElementBlock("div", {
+          key: 0,
           class: "ele-modal-body",
           style: normalizeStyle(_ctx.bodyStyle)
         }, [
           renderSlot(_ctx.$slots, "default")
-        ], 4)
+        ], 4)) : createCommentVNode("", true)
       ]),
       _: 2
     }, [
       _ctx.$slots.footer ? {
         name: "footer",
         fn: withCtx(() => [
-          createElementVNode("div", {
+          _ctx.enable ? (openBlock(), createElementBlock("div", {
+            key: 0,
             class: "ele-modal-footer",
             style: normalizeStyle(_ctx.footerStyle)
           }, [
             renderSlot(_ctx.$slots, "footer")
-          ], 4)
+          ], 4)) : createCommentVNode("", true)
         ]),
         key: "0"
       } : void 0

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

@@ -73,12 +73,10 @@ declare const _default: import("vue").DefineComponent<{
     title: StringConstructor;
     width: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
     popperClass: StringConstructor;
-    bg: StringConstructor;
-    arrowBg: StringConstructor; /** 文字提示属性 */
-    isPopover: BooleanConstructor;
     id: StringConstructor;
     role: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "menu" | "group" | "listbox" | "grid" | "tooltip" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
     strategy: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "fixed" | "absolute", unknown, "absolute", boolean>;
+    bg: StringConstructor;
     arrowOffset: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
     triggerKeys: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => string[], boolean>;
     virtualRef: {
@@ -95,8 +93,8 @@ declare const _default: import("vue").DefineComponent<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    rawContent: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     ariaLabel: StringConstructor;
+    className: StringConstructor;
     pure: BooleanConstructor;
     focusOnShow: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     trapping: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
@@ -117,7 +115,8 @@ declare const _default: import("vue").DefineComponent<{
     boundariesPadding: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     fallbackPlacements: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("element-plus").Placement[]) | (() => import("element-plus").Placement[]) | ((new (...args: any[]) => import("element-plus").Placement[]) | (() => import("element-plus").Placement[]))[], unknown, unknown, undefined, boolean>;
     gpuAcceleration: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    className: StringConstructor;
+    arrowBg: StringConstructor;
+    isPopover: BooleanConstructor;
 }, {
     tooltipRef: import("vue").Ref<EleTooltipInstance>;
     tooltipProps: import("vue").ComputedRef<Partial<TooltipProps>>;
@@ -212,12 +211,10 @@ declare const _default: import("vue").DefineComponent<{
     title: StringConstructor;
     width: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
     popperClass: StringConstructor;
-    bg: StringConstructor;
-    arrowBg: StringConstructor; /** 文字提示属性 */
-    isPopover: BooleanConstructor;
     id: StringConstructor;
     role: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "menu" | "group" | "listbox" | "grid" | "tooltip" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
     strategy: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "fixed" | "absolute", unknown, "absolute", boolean>;
+    bg: StringConstructor;
     arrowOffset: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
     triggerKeys: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => string[], boolean>;
     virtualRef: {
@@ -234,8 +231,8 @@ declare const _default: import("vue").DefineComponent<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    rawContent: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     ariaLabel: StringConstructor;
+    className: StringConstructor;
     pure: BooleanConstructor;
     focusOnShow: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     trapping: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
@@ -256,7 +253,8 @@ declare const _default: import("vue").DefineComponent<{
     boundariesPadding: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     fallbackPlacements: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("element-plus").Placement[]) | (() => import("element-plus").Placement[]) | ((new (...args: any[]) => import("element-plus").Placement[]) | (() => import("element-plus").Placement[]))[], unknown, unknown, undefined, boolean>;
     gpuAcceleration: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    className: StringConstructor;
+    arrowBg: StringConstructor;
+    isPopover: BooleanConstructor;
 }>> & {
     "onUpdate:visible"?: ((value: boolean) => any) | undefined;
     onConfirm?: ((_e: MouseEvent) => any) | undefined;
@@ -282,7 +280,6 @@ declare const _default: import("vue").DefineComponent<{
     virtualTriggering: boolean;
     open: boolean;
     content: string;
-    rawContent: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     persistent: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     visible: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown>;
     transition: string;

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

@@ -88,13 +88,11 @@ export declare const popconfirmProps: {
     autoClose: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     title: StringConstructor;
     width: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
-    popperClass: StringConstructor;
-    bg: StringConstructor;
-    arrowBg: StringConstructor;
-    isPopover: BooleanConstructor;
+    popperClass: StringConstructor; /** 确认按钮类型 */
     id: StringConstructor;
     role: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "menu" | "group" | "listbox" | "grid" | "tooltip" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
     strategy: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "fixed" | "absolute", unknown, "absolute", boolean>;
+    bg: StringConstructor;
     arrowOffset: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
     triggerKeys: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => string[], boolean>;
     virtualRef: {
@@ -111,8 +109,8 @@ export declare const popconfirmProps: {
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    rawContent: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     ariaLabel: StringConstructor;
+    className: StringConstructor;
     pure: BooleanConstructor;
     focusOnShow: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     trapping: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
@@ -133,7 +131,8 @@ export declare const popconfirmProps: {
     boundariesPadding: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     fallbackPlacements: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("element-plus").Placement[]) | (() => import("element-plus").Placement[]) | ((new (...args: any[]) => import("element-plus").Placement[]) | (() => import("element-plus").Placement[]))[], unknown, unknown, undefined, boolean>;
     gpuAcceleration: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    className: StringConstructor;
+    arrowBg: StringConstructor;
+    isPopover: BooleanConstructor;
 };
 export type PopconfirmProps = ExtractPropTypes<typeof popconfirmProps>;
 /**

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

@@ -3,8 +3,8 @@ import { EleTooltipInstance } from '../ele-app/types/components';
 declare const _default: import("vue").DefineComponent<{
     transition: {
         type: StringConstructor;
-        default: string; /** 文字提示属性 */
-    }; /** 文字提示属性 */
+        default: string;
+    };
     bodyClass: StringConstructor;
     bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
@@ -46,12 +46,10 @@ declare const _default: import("vue").DefineComponent<{
     title: StringConstructor;
     width: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
     popperClass: StringConstructor;
-    bg: StringConstructor;
-    arrowBg: StringConstructor;
-    isPopover: BooleanConstructor;
     id: StringConstructor;
     role: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "menu" | "group" | "listbox" | "grid" | "tooltip" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
     strategy: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "fixed" | "absolute", unknown, "absolute", boolean>;
+    bg: StringConstructor;
     arrowOffset: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
     triggerKeys: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => string[], boolean>;
     virtualRef: {
@@ -68,8 +66,8 @@ declare const _default: import("vue").DefineComponent<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    rawContent: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     ariaLabel: StringConstructor;
+    className: StringConstructor;
     pure: BooleanConstructor;
     focusOnShow: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     trapping: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
@@ -90,7 +88,8 @@ declare const _default: import("vue").DefineComponent<{
     boundariesPadding: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     fallbackPlacements: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("element-plus").Placement[]) | (() => import("element-plus").Placement[]) | ((new (...args: any[]) => import("element-plus").Placement[]) | (() => import("element-plus").Placement[]))[], unknown, unknown, undefined, boolean>;
     gpuAcceleration: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    className: StringConstructor;
+    arrowBg: StringConstructor;
+    isPopover: BooleanConstructor;
 }, {
     tooltipRef: import("vue").Ref<EleTooltipInstance>;
     tooltipProps: import("vue").ComputedRef<Partial<TooltipProps>>;
@@ -109,8 +108,8 @@ declare const _default: import("vue").DefineComponent<{
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     transition: {
         type: StringConstructor;
-        default: string; /** 文字提示属性 */
-    }; /** 文字提示属性 */
+        default: string;
+    };
     bodyClass: StringConstructor;
     bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
@@ -152,12 +151,10 @@ declare const _default: import("vue").DefineComponent<{
     title: StringConstructor;
     width: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
     popperClass: StringConstructor;
-    bg: StringConstructor;
-    arrowBg: StringConstructor;
-    isPopover: BooleanConstructor;
     id: StringConstructor;
     role: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "menu" | "group" | "listbox" | "grid" | "tooltip" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
     strategy: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "fixed" | "absolute", unknown, "absolute", boolean>;
+    bg: StringConstructor;
     arrowOffset: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
     triggerKeys: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => string[], boolean>;
     virtualRef: {
@@ -174,8 +171,8 @@ declare const _default: import("vue").DefineComponent<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    rawContent: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     ariaLabel: StringConstructor;
+    className: StringConstructor;
     pure: BooleanConstructor;
     focusOnShow: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     trapping: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
@@ -196,7 +193,8 @@ declare const _default: import("vue").DefineComponent<{
     boundariesPadding: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     fallbackPlacements: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("element-plus").Placement[]) | (() => import("element-plus").Placement[]) | ((new (...args: any[]) => import("element-plus").Placement[]) | (() => import("element-plus").Placement[]))[], unknown, unknown, undefined, boolean>;
     gpuAcceleration: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    className: StringConstructor;
+    arrowBg: StringConstructor;
+    isPopover: BooleanConstructor;
 }>> & {
     "onUpdate:visible"?: ((value: boolean) => any) | undefined;
     "onBefore-enter"?: (() => any) | undefined;
@@ -220,7 +218,6 @@ declare const _default: import("vue").DefineComponent<{
     virtualTriggering: boolean;
     open: boolean;
     content: string;
-    rawContent: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     persistent: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     visible: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown>;
     transition: string;

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

@@ -52,12 +52,10 @@ export declare const popoverProps: {
     title: StringConstructor;
     width: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
     popperClass: StringConstructor;
-    bg: StringConstructor;
-    arrowBg: StringConstructor;
-    isPopover: BooleanConstructor;
     id: StringConstructor;
     role: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "menu" | "group" | "listbox" | "grid" | "tooltip" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
     strategy: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "fixed" | "absolute", unknown, "absolute", boolean>;
+    bg: StringConstructor;
     arrowOffset: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
     triggerKeys: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => string[], boolean>;
     virtualRef: {
@@ -74,8 +72,8 @@ export declare const popoverProps: {
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    rawContent: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     ariaLabel: StringConstructor;
+    className: StringConstructor;
     pure: BooleanConstructor;
     focusOnShow: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     trapping: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
@@ -96,7 +94,8 @@ export declare const popoverProps: {
     boundariesPadding: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     fallbackPlacements: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("element-plus").Placement[]) | (() => import("element-plus").Placement[]) | ((new (...args: any[]) => import("element-plus").Placement[]) | (() => import("element-plus").Placement[]))[], unknown, unknown, undefined, boolean>;
     gpuAcceleration: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    className: StringConstructor;
+    arrowBg: StringConstructor;
+    isPopover: BooleanConstructor;
 };
 export type PopoverProps = ExtractPropTypes<typeof popoverProps>;
 /**

package/es/ele-popover/props.js

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

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

@@ -5,15 +5,16 @@ declare const _default: import("vue").DefineComponent<{
     footerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     title: StringConstructor;
     margin: (StringConstructor | NumberConstructor)[];
-    direction: import("vue").PropType<import("./types").PrintDirection | null>;
+    direction: import("vue").PropType<string | null>;
     orientation: import("vue").PropType<import("./types").PrintOrientation | null>;
     target: import("vue").PropType<import("./types").PrintTarget | null>;
     static: BooleanConstructor;
+    options: ObjectConstructor; /** 是否显示 */
 }, {
     container: import("vue").ShallowRef<Element>;
     visible: import("vue").Ref<boolean>;
     isStatic: import("vue").ComputedRef<boolean>;
-    print: () => void;
+    print: (options?: any) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     'update:modelValue': (_value: boolean) => boolean;
     done: () => boolean;
@@ -24,10 +25,11 @@ declare const _default: import("vue").DefineComponent<{
     footerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     title: StringConstructor;
     margin: (StringConstructor | NumberConstructor)[];
-    direction: import("vue").PropType<import("./types").PrintDirection | null>;
+    direction: import("vue").PropType<string | null>;
     orientation: import("vue").PropType<import("./types").PrintOrientation | null>;
     target: import("vue").PropType<import("./types").PrintTarget | null>;
     static: BooleanConstructor;
+    options: ObjectConstructor; /** 是否显示 */
 }>> & {
     "onUpdate:modelValue"?: ((_value: boolean) => any) | undefined;
     onDone?: (() => any) | undefined;

package/es/ele-printer/index.js

@@ -1,6 +1,6 @@
 import { defineComponent, shallowRef, ref, computed, watch, nextTick, openBlock, createBlock, Teleport, createElementVNode, normalizeClass, createElementBlock, normalizeStyle, renderSlot, createCommentVNode } from "vue";
 import { useLicense } from "../ele-config-provider/receiver";
-import { usePrinter, getPrintContainer, doPrintOnFrame, doPrint } from "./util";
+import { usePrinter, getPrintContainer, mergeOptions, doPrintOnFrame, doPrint } from "./util";
 import { printerProps, printerEmits } from "./props";
 const _sfc_main = defineComponent({
   name: "ElePrinter",
@@ -17,7 +17,7 @@ const _sfc_main = defineComponent({
     const isStatic = computed(() => {
       return props.static;
     });
-    const print = () => {
+    const print = (options) => {
       if (!authenticated.value) {
         updateModelValue(false);
         return;
@@ -29,7 +29,8 @@ const _sfc_main = defineComponent({
           title: props.title,
           margin: props.margin,
           direction: props.direction,
-          orientation: props.orientation
+          orientation: props.orientation,
+          options: mergeOptions(props.options, options)
         };
         if (props.target === "_iframe") {
           doPrintOnFrame(option);

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

@@ -1,5 +1,5 @@
 import type { PropType, ExtractPropTypes } from 'vue';
-import type { PrintDirection, PrintOrientation, PrintTarget } from './types';
+import type { PrintOrientation, PrintTarget } from './types';
 /**
  * 属性
  */
@@ -17,13 +17,15 @@ export declare const printerProps: {
     /** 页间距 */
     margin: (StringConstructor | NumberConstructor)[];
     /** 纸张方向 */
-    direction: PropType<PrintDirection | null>;
+    direction: PropType<string | null>;
     /** 纸张旋转 */
     orientation: PropType<PrintOrientation | null>;
     /** 打印位置 */
     target: PropType<PrintTarget | null>;
     /** 是否显示在文档流中 */
     static: BooleanConstructor;
+    /** 打印方法参数 */
+    options: ObjectConstructor;
 };
 export type PrinterProps = ExtractPropTypes<typeof printerProps>;
 /**

package/es/ele-printer/props.js

@@ -18,7 +18,9 @@ const printerProps = {
   /** 打印位置 */
   target: String,
   /** 是否显示在文档流中 */
-  static: Boolean
+  static: Boolean,
+  /** 打印方法参数 */
+  options: Object
 };
 const printerEmits = {
   /** 更新打印状态 */

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

@@ -1,7 +1,7 @@
 /**
  * 纸张方向
  */
-export type PrintDirection = 'landscape' | 'portrait';
+export type PrintDirection = 'landscape' | 'portrait' | string;
 /**
  * 纸张旋转
  */
@@ -24,6 +24,8 @@ export interface PrintOption {
     direction?: string | null;
     /** 纸张旋转 */
     orientation?: string | null;
+    /** 打印方法参数 */
+    options?: any;
 }
 /**
  * pdf 打印参数
@@ -37,4 +39,6 @@ export interface PrintPdfOption {
     done?: () => void;
     /** 错误回调 */
     error?: (status: number, result: string) => void;
+    /** 打印方法参数 */
+    options?: any;
 }

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

@@ -26,6 +26,12 @@ export declare function removePrintFrame(): void;
  * 生成打印设置的样式
  */
 export declare function getOptionCss(opt: PrintOption): string;
+/**
+ * 合并打印方法参数
+ * @param options 参数
+ * @param userOptions 自定义参数
+ */
+export declare function mergeOptions(options?: any, userOptions?: any): any;
 /**
  * usePrinter
  */

package/es/ele-printer/util.js

@@ -26,7 +26,7 @@ function doPrint(option) {
     if (option.title != null && option.title !== "") {
       document.title = option.title;
     }
-    window.print();
+    window.print(option.options);
     $html.classList.remove(printingClass);
     document.body.removeChild(elem);
     if (option.title != null) {
@@ -53,6 +53,7 @@ function doPrintOnFrame(opt) {
     el.setAttribute("value", el.value);
   });
   pDoc.open();
+  const printOption = opt.options ? `JSON.parse('${JSON.stringify(opt.options)}')` : "";
   const optHtml = `
   <style type="text/css" media="print">
     ${getOptionCss(opt)}
@@ -66,7 +67,7 @@ function doPrintOnFrame(opt) {
       if(${opt.title == null ? 0 : 1}) {
         document.title = '${opt.title}';
       }
-      window.print();
+      window.print(${printOption});
       window.parent.postMessage('elePrintDone_${opt.printId}', '*');
     };
   <\/script>
@@ -110,6 +111,12 @@ function getOptionCss(opt) {
   css.push("}");
   return css.join(" ");
 }
+function mergeOptions(options, userOptions) {
+  if (options == null) {
+    return userOptions;
+  }
+  return Object.assign({}, options, userOptions);
+}
 function usePrinter(done) {
   const printId = uuid(8);
   const onMessage = (e) => {
@@ -129,7 +136,7 @@ function printPdf(option) {
   pFrame.onload = () => {
     if (!!pFrame.getAttribute("src")) {
       pFrame.focus();
-      pFrame.contentWindow && pFrame.contentWindow.print();
+      pFrame.contentWindow && pFrame.contentWindow.print(option.options);
       option.done && option.done();
     }
   };
@@ -165,6 +172,7 @@ export {
   getOptionCss,
   getPrintContainer,
   getPrintFrame,
+  mergeOptions,
   printContainerId,
   printFrameId,
   printPdf,