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

package/es/ele-popover/index.js

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

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

@@ -1,4 +1,5 @@
 import { PropType, ExtractPropTypes } from 'vue';
+import { StyleValue } from '../ele-app/types';
 
 /**
  * 属性
@@ -11,25 +12,19 @@ export declare const popoverProps: {
     /** 自定义主体类名 */
     bodyClass: StringConstructor;
     /** 自定义主体样式 */
-    bodyStyle: PropType<Partial<import('vue').CSSProperties>>;
+    bodyStyle: PropType<StyleValue>;
     /** 自定义标题样式 */
-    titleStyle: PropType<Partial<import('vue').CSSProperties>>;
+    titleStyle: PropType<StyleValue>;
     /** 自定义内容样式 */
-    contentStyle: PropType<Partial<import('vue').CSSProperties>>;
+    contentStyle: PropType<StyleValue>;
     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>;
+    trigger: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType> & {}) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType> & {}) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
     content: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    visible: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown, null, boolean>;
+    visible: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (boolean | null) & {}) | (() => boolean | null) | ((new (...args: any[]) => (boolean | null) & {}) | (() => boolean | null))[], unknown, unknown, null, boolean>;
     teleported: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     effect: {
         readonly default: "light";
@@ -46,18 +41,19 @@ export declare const popoverProps: {
         readonly __epPropKey: true;
     };
     offset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, undefined, boolean>;
-    placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => "bottom" | "left" | "right" | "top" | "auto" | "auto-start" | "auto-end" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import('element-plus').Placement) | ((new (...args: any[]) => "bottom" | "left" | "right" | "top" | "auto" | "auto-start" | "auto-end" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
+    placement: import('element-plus/es/utils/index').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, "bottom", boolean>;
     popperOptions: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>) | ((new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>))[], unknown, unknown, () => {}, boolean>;
     showAfter: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     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>;
+    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<StyleValue>;
     popperClass: StringConstructor;
     className: StringConstructor;
     arrowOffset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
     triggerKeys: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => string[], boolean>;
     virtualRef: {
-        readonly type: PropType<import('element-plus').Measurable>;
+        readonly type: import('vue').PropType<import('element-plus').Measurable>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -65,7 +61,7 @@ export declare const popoverProps: {
     virtualTriggering: BooleanConstructor;
     ariaLabel: StringConstructor;
     appendTo: {
-        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement) | ((new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement))[], unknown, unknown>>;
+        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement) | ((new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement))[], unknown, unknown>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;

package/es/ele-popover/props.js

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

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

@@ -1,11 +1,11 @@
 declare const _default: import('vue').DefineComponent<{
     modelValue: BooleanConstructor;
-    headerStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    bodyStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    footerStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    headerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    bodyStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    footerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     title: StringConstructor;
     margin: (NumberConstructor | StringConstructor)[];
-    direction: import('vue').PropType<string | null>;
+    direction: import('vue').PropType<import('./types').PrintDirection | null>;
     orientation: import('vue').PropType<import('./types').PrintOrientation | null>;
     target: import('vue').PropType<import('./types').PrintTarget | null>;
     static: BooleanConstructor;
@@ -16,16 +16,16 @@ 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;
-    headerStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    bodyStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    footerStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    headerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    bodyStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    footerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     title: StringConstructor;
     margin: (NumberConstructor | StringConstructor)[];
-    direction: import('vue').PropType<string | null>;
+    direction: import('vue').PropType<import('./types').PrintDirection | null>;
     orientation: import('vue').PropType<import('./types').PrintOrientation | null>;
     target: import('vue').PropType<import('./types').PrintTarget | null>;
     static: BooleanConstructor;

package/es/ele-printer/index.js

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

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

@@ -1,5 +1,6 @@
 import { PropType, ExtractPropTypes } from 'vue';
-import { PrintOrientation, PrintTarget } from './types';
+import { StyleValue } from '../ele-app/types';
+import { PrintDirection, PrintOrientation, PrintTarget } from './types';
 
 /**
  * 属性
@@ -8,17 +9,17 @@ export declare const printerProps: {
     /** 是否打印 */
     modelValue: BooleanConstructor;
     /** 页眉样式 */
-    headerStyle: PropType<Partial<import('vue').CSSProperties>>;
+    headerStyle: PropType<StyleValue>;
     /** 内容样式 */
-    bodyStyle: PropType<Partial<import('vue').CSSProperties>>;
+    bodyStyle: PropType<StyleValue>;
     /** 页脚样式 */
-    footerStyle: PropType<Partial<import('vue').CSSProperties>>;
+    footerStyle: PropType<StyleValue>;
     /** 标题 */
     title: StringConstructor;
     /** 页间距 */
     margin: (StringConstructor | NumberConstructor)[];
     /** 纸张方向 */
-    direction: PropType<string | null>;
+    direction: PropType<PrintDirection | null>;
     /** 纸张旋转 */
     orientation: PropType<PrintOrientation | null>;
     /** 打印位置 */

package/es/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/es/ele-printer/types.d.ts

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

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

@@ -1,44 +1,23 @@
-import { PrintOption, PrintPdfOption } from './types';
+import { PrintOption, PrintTarget, PrintPdfOption } from './types';
 
 export declare const printContainerId = "ele-printer-container";
 export declare const printFrameId = "ele-printer-iframe";
 export declare const printingClass = "ele-printing";
-/**
- * 创建并获取打印容器
- */
-export declare function getPrintContainer(): Element;
-/**
- * 打印
- */
-export declare function doPrint(option: PrintOption): void;
-/**
- * 在子窗口中打印
- */
-export declare function doPrintOnFrame(opt: PrintOption): Window | undefined;
-/**
- * 创建并获取打印子窗口
- */
-export declare function getPrintFrame(): HTMLIFrameElement;
-/**
- * 移除打印子窗口
- */
-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;
+/**
+ * 创建并获取打印容器
+ */
+export declare function getPrintContainer(): Element;
 /**
  * usePrinter
+ * @param done 打印结束回调
  */
-export declare function usePrinter(done: () => void): {
-    printId: string;
-};
+export declare function usePrinter(done: () => void): (option: PrintOption, target?: PrintTarget | null) => void;
 /**
  * 打印 pdf
  * @param option 打印参数

package/es/ele-printer/util.js

@@ -1,8 +1,15 @@
 import { onBeforeUnmount } from "vue";
-import { uuid } from "../utils/core";
+import { useTimer } from "../utils/hook";
 const printContainerId = "ele-printer-container";
 const printFrameId = "ele-printer-iframe";
 const printingClass = "ele-printing";
+let printIdNum = 0;
+function mergeOptions(options, userOptions) {
+  if (options == null) {
+    return userOptions;
+  }
+  return Object.assign({}, options, userOptions);
+}
 function getPrintContainer() {
   const container = document.getElementById(printContainerId);
   if (container) {
@@ -13,28 +20,51 @@ 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;
+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 removePrintFrame() {
+  const pFrame = document.getElementById(printFrameId);
+  if (pFrame) {
+    if (pFrame.parentNode) {
+      pFrame.parentNode.removeChild(pFrame);
     }
-    window.print(option.options);
-    $html.classList.remove(printingClass);
-    document.body.removeChild(elem);
-    if (option.title != null) {
-      document.title = title;
+    const url = pFrame.getAttribute("src");
+    if (url) {
+      try {
+        window.URL.revokeObjectURL(url);
+      } catch (e) {
+        console.error(e);
+      }
     }
   }
 }
-function doPrintOnFrame(opt) {
+function getPrintFrame() {
+  removePrintFrame();
+  const elem = document.createElement("iframe");
+  elem.id = printFrameId;
+  elem.style.width = "66px";
+  elem.style.height = "66px";
+  elem.style.position = "fixed";
+  elem.style.left = "-666px";
+  elem.style.top = "-666px";
+  document.body.appendChild(elem);
+  elem.focus();
+  return elem;
+}
+function doPrintOnFrame(opt, printId) {
   var _a;
   const pFrame = getPrintFrame();
   const pWin = pFrame.contentWindow;
@@ -68,7 +98,7 @@ function doPrintOnFrame(opt) {
         document.title = '${opt.title}';
       }
       window.print(${printOption});
-      window.parent.postMessage('elePrintDone_${opt.printId}', '*');
+      window.parent.postMessage('elePrintDone_${printId}', '*');
     };
   <\/script>
   `;
@@ -78,80 +108,89 @@ 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 = uuid(8);
-  const onMessage = (e) => {
-    if (e.data === `elePrintDone_${printId}`) {
-      removePrintFrame();
+  printIdNum++;
+  const printId = printIdNum;
+  const [startPrintTimer] = useTimer(400);
+  const doPrint = (option, target) => {
+    if (target === "_iframe") {
+      doPrintOnFrame(option, printId);
+      return;
+    }
+    const $html = document.querySelector("html");
+    if (!$html) {
       done && done();
+      return;
+    }
+    $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 handleMessage = (e) => {
+    if (e.data === `elePrintDone_${printId}`) {
+      startPrintTimer(() => {
+        removePrintFrame();
+        done && done();
+      });
     }
   };
-  window.addEventListener("message", onMessage);
   onBeforeUnmount(() => {
-    window.removeEventListener("message", onMessage);
+    window.removeEventListener("message", handleMessage);
   });
-  return { printId };
+  window.addEventListener("message", handleMessage);
+  return doPrint;
 }
 function printPdf(option) {
   const pFrame = getPrintFrame();
   pFrame.onload = () => {
     const url = pFrame.getAttribute("src");
-    if (!!url) {
-      pFrame.focus();
+    if (!url) {
+      return;
+    }
+    pFrame.focus();
+    try {
       pFrame.contentWindow && pFrame.contentWindow.print(option.options);
       option.done && option.done();
-      URL.revokeObjectURL(url);
+      window.URL.revokeObjectURL(url);
+      return;
+    } catch (e) {
+      console.error(e);
+    }
+    if (!option.arraybuffer && option.url) {
+      window.URL.revokeObjectURL(url);
+      window.open(option.url);
+    } else {
+      window.open(url);
     }
+    option.done && option.done();
   };
-  const doPrint2 = (buffer) => {
+  const doPrint = (buffer) => {
     const blob = new window.Blob([buffer], { type: "application/pdf" });
     if (window.navigator && window.navigator["msSaveOrOpenBlob"]) {
       window.navigator["msSaveOrOpenBlob"](blob, "print.pdf");
+      option.done && option.done();
       return;
     }
     pFrame.setAttribute("src", window.URL.createObjectURL(blob));
   };
   if (option.arraybuffer) {
-    doPrint2(option.arraybuffer);
+    doPrint(option.arraybuffer);
     return;
   }
   if (option.url) {
@@ -160,7 +199,7 @@ function printPdf(option) {
     req.responseType = "arraybuffer";
     req.onload = () => {
       if ([200, 201].indexOf(req.status) !== -1) {
-        doPrint2(req.response);
+        doPrint(req.response);
         return;
       }
       option.error && option.error(req.status, req.statusText);
@@ -169,16 +208,11 @@ function printPdf(option) {
   }
 }
 export {
-  doPrint,
-  doPrintOnFrame,
-  getOptionCss,
   getPrintContainer,
-  getPrintFrame,
   mergeOptions,
   printContainerId,
   printFrameId,
   printPdf,
   printingClass,
-  removePrintFrame,
   usePrinter
 };