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

package/lib/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/lib/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/lib/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/lib/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/lib/ele-popover/props.js

@@ -5,7 +5,7 @@ const core = require("../utils/core");
 const props = require("../ele-tooltip/props");
 const normalizeProps = core.omit(elementPlus.popoverProps, ["onUpdate:visible"]);
 const popoverProps = {
-  ...props.tooltipProps,
+  ...core.omit(props.tooltipProps, ["rawContent"]),
   popperClass: String,
   ...normalizeProps,
   transition: {

package/lib/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/lib/ele-printer/index.js

@@ -18,7 +18,7 @@ const _sfc_main = vue.defineComponent({
     const isStatic = vue.computed(() => {
       return props2.static;
     });
-    const print = () => {
+    const print = (options) => {
       if (!authenticated.value) {
         updateModelValue(false);
         return;
@@ -30,7 +30,8 @@ const _sfc_main = vue.defineComponent({
           title: props2.title,
           margin: props2.margin,
           direction: props2.direction,
-          orientation: props2.orientation
+          orientation: props2.orientation,
+          options: util.mergeOptions(props2.options, options)
         };
         if (props2.target === "_iframe") {
           util.doPrintOnFrame(option);

package/lib/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/lib/ele-printer/props.js

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

package/lib/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/lib/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/lib/ele-printer/util.js

@@ -28,7 +28,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) {
@@ -55,6 +55,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)}
@@ -68,7 +69,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>
@@ -112,6 +113,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 = core.uuid(8);
   const onMessage = (e) => {
@@ -131,7 +138,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();
     }
   };
@@ -166,6 +173,7 @@ exports.doPrintOnFrame = doPrintOnFrame;
 exports.getOptionCss = getOptionCss;
 exports.getPrintContainer = getPrintContainer;
 exports.getPrintFrame = getPrintFrame;
+exports.mergeOptions = mergeOptions;
 exports.printContainerId = printContainerId;
 exports.printFrameId = printFrameId;
 exports.printPdf = printPdf;

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

@@ -41,7 +41,7 @@ const _sfc_main = vue.defineComponent({
     /** 是否显示面包屑导航 */
     breadcrumb: Boolean,
     /** 面包屑导航分隔符 */
-    breadcrumbSeparator: [String, Object],
+    breadcrumbSeparator: [String, Object, Function],
     /** 主页路由地址 */
     homePath: String,
     /** 当前路由是否是主页 */
@@ -81,6 +81,7 @@ const _sfc_main = vue.defineComponent({
         const data = [];
         if (!props.isHome) {
           data.push({
+            key: props.homePath,
             to: props.homePath,
             icon: icons.HomeOutlined,
             iconStyle: {
@@ -182,14 +183,18 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         onClose: _ctx.onClose,
         onItemClick: _ctx.onItemClick
       }, vue.createSlots({ _: 2 }, [
-        _ctx.iconSlot && _ctx.$slots[_ctx.iconSlot] ? {
+        _ctx.iconSlot && !["logo", "left", "right", "center", "breadcrumb"].includes(
+          _ctx.iconSlot
+        ) && _ctx.$slots[_ctx.iconSlot] ? {
           name: "icon",
           fn: vue.withCtx((slotProps) => [
             vue.renderSlot(_ctx.$slots, _ctx.iconSlot, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
           ]),
           key: "0"
         } : void 0,
-        _ctx.titleSlot && _ctx.$slots[_ctx.titleSlot] ? {
+        _ctx.titleSlot && !["logo", "left", "right", "center", "breadcrumb"].includes(
+          _ctx.titleSlot
+        ) && _ctx.$slots[_ctx.titleSlot] ? {
           name: "title",
           fn: vue.withCtx((slotProps) => [
             vue.renderSlot(_ctx.$slots, _ctx.titleSlot, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))

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

@@ -82,7 +82,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       class: "ele-admin-menus"
     }, {
       default: vue.withCtx(() => [
-        vue.createVNode(_component_EleMenus, {
+        _ctx.menuItems.length ? (vue.openBlock(), vue.createBlock(_component_EleMenus, {
+          key: 0,
           items: _ctx.menuItems,
           theme: _ctx.sidebarStyle,
           colorful: _ctx.colorfulIcon,
@@ -96,21 +97,21 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           onClose: _ctx.onClose,
           onItemClick: _ctx.onItemClick
         }, vue.createSlots({ _: 2 }, [
-          _ctx.iconSlot && _ctx.$slots[_ctx.iconSlot] ? {
+          _ctx.iconSlot && !["top", "bottom"].includes(_ctx.iconSlot) && _ctx.$slots[_ctx.iconSlot] ? {
             name: "icon",
             fn: vue.withCtx((slotProps) => [
               vue.renderSlot(_ctx.$slots, _ctx.iconSlot, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
             ]),
             key: "0"
           } : void 0,
-          _ctx.titleSlot && _ctx.$slots[_ctx.titleSlot] ? {
+          _ctx.titleSlot && !["top", "bottom"].includes(_ctx.titleSlot) && _ctx.$slots[_ctx.titleSlot] ? {
             name: "title",
             fn: vue.withCtx((slotProps) => [
               vue.renderSlot(_ctx.$slots, _ctx.titleSlot, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
             ]),
             key: "1"
           } : void 0
-        ]), 1032, ["items", "theme", "colorful", "collapse", "defaultActive", "defaultOpeneds", "uniqueOpened", "popperEffect", "onOpen", "onClose", "onItemClick"])
+        ]), 1032, ["items", "theme", "colorful", "collapse", "defaultActive", "defaultOpeneds", "uniqueOpened", "popperEffect", "onOpen", "onClose", "onItemClick"])) : vue.createCommentVNode("", true)
       ]),
       _: 3
     }, 512),

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

@@ -72,7 +72,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       class: "ele-admin-menus"
     }, {
       default: vue.withCtx(() => [
-        vue.createVNode(_component_EleMenus, {
+        _ctx.menuItems.length ? (vue.openBlock(), vue.createBlock(_component_EleMenus, {
+          key: 0,
           items: _ctx.menuItems,
           theme: _ctx.sidebarStyle,
           popupColorful: _ctx.colorfulIcon,
@@ -85,21 +86,21 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           tooltipDisabled: !_ctx.compact,
           onItemClick: _ctx.onItemClick
         }, vue.createSlots({ _: 2 }, [
-          _ctx.iconSlot && _ctx.$slots[_ctx.iconSlot] ? {
+          _ctx.iconSlot && !["boxTop", "boxBottom"].includes(_ctx.iconSlot) && _ctx.$slots[_ctx.iconSlot] ? {
             name: "icon",
             fn: vue.withCtx((slotProps) => [
               vue.renderSlot(_ctx.$slots, _ctx.iconSlot, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
             ]),
             key: "0"
           } : void 0,
-          _ctx.titleSlot && _ctx.$slots[_ctx.titleSlot] ? {
+          _ctx.titleSlot && !["boxTop", "boxBottom"].includes(_ctx.titleSlot) && _ctx.$slots[_ctx.titleSlot] ? {
             name: "title",
             fn: vue.withCtx((slotProps) => [
               vue.renderSlot(_ctx.$slots, _ctx.titleSlot, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
             ]),
             key: "1"
           } : void 0
-        ]), 1032, ["items", "theme", "popupColorful", "collapse", "defaultActive", "popperEffect", "tooltipDisabled", "onItemClick"])
+        ]), 1032, ["items", "theme", "popupColorful", "collapse", "defaultActive", "popperEffect", "tooltipDisabled", "onItemClick"])) : vue.createCommentVNode("", true)
       ]),
       _: 3
     }, 512),

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

@@ -59,13 +59,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_EleTabTool = vue.resolveComponent("EleTabTool");
   return vue.openBlock(), vue.createBlock(_component_EleTabTool, null, {
     default: vue.withCtx(() => [
-      vue.createVNode(_component_EleDropdown, vue.mergeProps(_ctx.dropdownProps, {
-        ref: "dropdownRef",
+      vue.createVNode(_component_EleDropdown, vue.mergeProps({
         placement: "bottom-end",
         popperClass: "ele-tab-popup",
         popperOptions: {
           modifiers: [{ name: "offset", options: { offset: [12, 8] } }]
-        },
+        }
+      }, _ctx.dropdownProps, {
+        ref: "dropdownRef",
         items: _ctx.items,
         onCommand: _ctx.onCommand
       }), vue.createSlots({