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

package/lib/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/lib/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/lib/ele-popover/index.cjs

@@ -23,30 +23,30 @@ const _sfc_main = vue.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
     };
   }
 });
@@ -62,11 +62,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return vue.openBlock(), vue.createBlock(_component_EleTooltip, vue.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: vue.withCtx(() => [
       vue.createElementVNode("div", {

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

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

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

@@ -9,38 +9,31 @@ const _sfc_main = vue.defineComponent({
   props: props.printerProps,
   emits: props.printerEmits,
   setup(props2, { emit }) {
-    const { printId } = util.usePrinter(() => {
+    const doPrint = util.usePrinter(() => {
+      visible.value = false;
       updateModelValue(false);
-      onDone();
+      handleDone();
     });
     const container = vue.shallowRef(util.getPrintContainer());
     const visible = vue.ref(false);
-    const isStatic = vue.computed(() => {
-      return props2.static;
-    });
+    const isStatic = vue.computed(() => props2.static);
     const print = (options) => {
+      if (visible.value) {
+        return;
+      }
       visible.value = true;
       vue.nextTick(() => {
         const option = {
-          printId,
           title: props2.title,
           margin: props2.margin,
           direction: props2.direction,
           orientation: props2.orientation,
           options: util.mergeOptions(props2.options, options)
         };
-        if (props2.target === "_iframe") {
-          util.doPrintOnFrame(option);
-          visible.value = false;
-        } else {
-          util.doPrint(option);
-          visible.value = false;
-          updateModelValue(false);
-          onDone();
-        }
+        doPrint(option, props2.target);
       });
     };
-    const onDone = () => {
+    const handleDone = () => {
       emit("done");
     };
     const updateModelValue = (value) => {
@@ -48,13 +41,17 @@ const _sfc_main = vue.defineComponent({
     };
     vue.watch(
       () => props2.modelValue,
-      (value) => {
-        if (value) {
+      (modelValue) => {
+        if (modelValue) {
           print();
         }
-      },
-      { immediate: true }
+      }
     );
+    vue.onMounted(() => {
+      if (props2.modelValue) {
+        print();
+      }
+    });
     return { container, visible, isStatic, print };
   }
 });

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

@@ -46,10 +46,10 @@ html.ele-printing > body {
   background: #fff !important;
   height: auto !important;
   min-height: auto !important;
-  max-height: auto !important;
+  max-height: none !important;
   width: auto !important;
   min-width: auto !important;
-  max-width: auto !important;
+  max-width: none !important;
   overflow: visible !important;
 }
 

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

@@ -17,8 +17,6 @@ export type PrintTarget = '_self' | '_blank' | '_iframe';
  * 打印参数
  */
 export interface PrintOption {
-  /** id */
-  printId: string;
   /** 页面标题 */
   title?: string;
   /** 页间距 */

package/lib/ele-printer/util.cjs

@@ -1,10 +1,54 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
-const core = require("../utils/core");
+const hook = require("../utils/hook");
 const printContainerId = "ele-printer-container";
 const printFrameId = "ele-printer-iframe";
 const printingClass = "ele-printing";
+let printIdNum = 0;
+function printPdf(option) {
+  const pFrame = getPrintFrame();
+  pFrame.onload = () => {
+    const url = pFrame.getAttribute("src");
+    if (!!url) {
+      pFrame.focus();
+      pFrame.contentWindow && pFrame.contentWindow.print(option.options);
+      option.done && option.done();
+      window.URL.revokeObjectURL(url);
+    }
+  };
+  const doPrint = (buffer) => {
+    const blob = new window.Blob([buffer], { type: "application/pdf" });
+    if (window.navigator && window.navigator["msSaveOrOpenBlob"]) {
+      window.navigator["msSaveOrOpenBlob"](blob, "print.pdf");
+      return;
+    }
+    pFrame.setAttribute("src", window.URL.createObjectURL(blob));
+  };
+  if (option.arraybuffer) {
+    doPrint(option.arraybuffer);
+    return;
+  }
+  if (option.url) {
+    const req = new window.XMLHttpRequest();
+    req.open("GET", option.url, true);
+    req.responseType = "arraybuffer";
+    req.onload = () => {
+      if ([200, 201].indexOf(req.status) !== -1) {
+        doPrint(req.response);
+        return;
+      }
+      option.error && option.error(req.status, req.statusText);
+    };
+    req.send();
+  }
+}
+function mergeOptions(options, userOptions) {
+  if (options == null) {
+    return userOptions;
+  }
+  return Object.assign({}, options, userOptions);
+}
 function getPrintContainer() {
   const container = document.getElementById(printContainerId);
   if (container) {
@@ -15,28 +59,40 @@ function getPrintContainer() {
   document.body.appendChild(elem);
   return elem;
 }
-function doPrint(option) {
-  const $html = document.querySelector("html");
-  if ($html) {
-    $html.classList.add(printingClass);
-    const elem = document.createElement("style");
-    elem.setAttribute("type", "text/css");
-    elem.setAttribute("media", "print");
-    elem.innerHTML = getOptionCss(option);
-    document.body.appendChild(elem);
-    const title = document.title;
-    if (option.title != null && option.title !== "") {
-      document.title = option.title;
-    }
-    window.print(option.options);
-    $html.classList.remove(printingClass);
-    document.body.removeChild(elem);
-    if (option.title != null) {
-      document.title = title;
-    }
+function getOptionCss(opt) {
+  const css = ["@page {"];
+  if (opt.margin != null && opt.margin !== "") {
+    const v = typeof opt.margin === "number" ? opt.margin + "px" : opt.margin;
+    css.push(`margin: ${v};`);
+  }
+  if (opt.direction != null && opt.direction !== "") {
+    css.push(`size: ${opt.direction};`);
   }
+  if (opt.orientation != null && opt.orientation !== "") {
+    css.push(`page-orientation: ${opt.orientation};`);
+  }
+  css.push("}");
+  return css.join(" ");
 }
-function doPrintOnFrame(opt) {
+function removePrintFrame() {
+  const pFrame = document.getElementById(printFrameId);
+  if (pFrame && pFrame.parentNode) {
+    pFrame.parentNode.removeChild(pFrame);
+  }
+}
+function getPrintFrame() {
+  removePrintFrame();
+  const elem = document.createElement("iframe");
+  elem.id = printFrameId;
+  elem.style.width = "0px";
+  elem.style.height = "0px";
+  elem.style.position = "fixed";
+  elem.style.visibility = "hidden";
+  document.body.appendChild(elem);
+  elem.focus();
+  return elem;
+}
+function doPrintOnFrame(opt, printId) {
   var _a;
   const pFrame = getPrintFrame();
   const pWin = pFrame.contentWindow;
@@ -70,7 +126,7 @@ function doPrintOnFrame(opt) {
         document.title = '${opt.title}';
       }
       window.print(${printOption});
-      window.parent.postMessage('elePrintDone_${opt.printId}', '*');
+      window.parent.postMessage('elePrintDone_${printId}', '*');
     };
   <\/script>
   `;
@@ -80,105 +136,58 @@ function doPrintOnFrame(opt) {
   pDoc.close();
   return pWin;
 }
-function getPrintFrame() {
-  removePrintFrame();
-  const elem = document.createElement("iframe");
-  elem.id = printFrameId;
-  elem.style.width = "0px";
-  elem.style.height = "0px";
-  elem.style.position = "fixed";
-  elem.style.visibility = "hidden";
-  document.body.appendChild(elem);
-  elem.focus();
-  return elem;
-}
-function removePrintFrame() {
-  const pFrame = document.getElementById(printFrameId);
-  if (pFrame && pFrame.parentNode) {
-    pFrame.parentNode.removeChild(pFrame);
-  }
-}
-function getOptionCss(opt) {
-  const css = ["@page {"];
-  if (opt.margin != null && opt.margin !== "") {
-    const v = typeof opt.margin === "number" ? opt.margin + "px" : opt.margin;
-    css.push(`margin: ${v};`);
-  }
-  if (opt.direction != null && opt.direction !== "") {
-    css.push(`size: ${opt.direction};`);
-  }
-  if (opt.orientation != null && opt.orientation !== "") {
-    css.push(`page-orientation: ${opt.orientation};`);
-  }
-  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) => {
-    if (e.data === `elePrintDone_${printId}`) {
-      removePrintFrame();
+  printIdNum++;
+  const printId = printIdNum;
+  const [startPrintTimer] = hook.useTimer(200);
+  const doPrint = (option, target) => {
+    if (target === "_iframe") {
+      doPrintOnFrame(option, printId);
+      return;
+    }
+    const $html = document.querySelector("html");
+    if (!$html) {
       done && done();
+      return;
     }
-  };
-  window.addEventListener("message", onMessage);
-  vue.onBeforeUnmount(() => {
-    window.removeEventListener("message", onMessage);
-  });
-  return { printId };
-}
-function printPdf(option) {
-  const pFrame = getPrintFrame();
-  pFrame.onload = () => {
-    const url = pFrame.getAttribute("src");
-    if (!!url) {
-      pFrame.focus();
-      pFrame.contentWindow && pFrame.contentWindow.print(option.options);
-      option.done && option.done();
-      URL.revokeObjectURL(url);
+    $html.classList.add(printingClass);
+    const elem = document.createElement("style");
+    elem.setAttribute("type", "text/css");
+    elem.setAttribute("media", "print");
+    elem.innerHTML = getOptionCss(option);
+    document.body.appendChild(elem);
+    const title = document.title;
+    if (option.title != null && option.title !== "") {
+      document.title = option.title;
     }
+    window.print(option.options);
+    startPrintTimer(() => {
+      $html.classList.remove(printingClass);
+      document.body.removeChild(elem);
+      if (option.title != null) {
+        document.title = title;
+      }
+      done && done();
+    });
   };
-  const doPrint2 = (buffer) => {
-    const blob = new window.Blob([buffer], { type: "application/pdf" });
-    if (window.navigator && window.navigator["msSaveOrOpenBlob"]) {
-      window.navigator["msSaveOrOpenBlob"](blob, "print.pdf");
-      return;
+  const handleMessage = (e) => {
+    if (e.data === `elePrintDone_${printId}`) {
+      startPrintTimer(() => {
+        removePrintFrame();
+        done && done();
+      });
     }
-    pFrame.setAttribute("src", window.URL.createObjectURL(blob));
   };
-  if (option.arraybuffer) {
-    doPrint2(option.arraybuffer);
-    return;
-  }
-  if (option.url) {
-    const req = new window.XMLHttpRequest();
-    req.open("GET", option.url, true);
-    req.responseType = "arraybuffer";
-    req.onload = () => {
-      if ([200, 201].indexOf(req.status) !== -1) {
-        doPrint2(req.response);
-        return;
-      }
-      option.error && option.error(req.status, req.statusText);
-    };
-    req.send();
-  }
+  vue.onBeforeUnmount(() => {
+    window.removeEventListener("message", handleMessage);
+  });
+  window.addEventListener("message", handleMessage);
+  return doPrint;
 }
-exports.doPrint = doPrint;
-exports.doPrintOnFrame = doPrintOnFrame;
-exports.getOptionCss = getOptionCss;
 exports.getPrintContainer = getPrintContainer;
-exports.getPrintFrame = getPrintFrame;
 exports.mergeOptions = mergeOptions;
 exports.printContainerId = printContainerId;
 exports.printFrameId = printFrameId;
 exports.printPdf = printPdf;
 exports.printingClass = printingClass;
-exports.removePrintFrame = removePrintFrame;
 exports.usePrinter = usePrinter;