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

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

@@ -3,11 +3,6 @@ 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";
-/**
- * 打印 pdf
- * @param option 打印参数
- */
-export declare function printPdf(option: PrintPdfOption): void;
 /**
  * 合并打印方法参数
  * @param options 参数
@@ -23,3 +18,8 @@ export declare function getPrintContainer(): Element;
  * @param done 打印结束回调
  */
 export declare function usePrinter(done: () => void): (option: PrintOption, target?: PrintTarget | null) => void;
+/**
+ * 打印 pdf
+ * @param option 打印参数
+ */
+export declare function printPdf(option: PrintPdfOption): void;

package/es/ele-printer/util.js

@@ -4,43 +4,6 @@ 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;
@@ -74,18 +37,29 @@ function getOptionCss(opt) {
 }
 function removePrintFrame() {
   const pFrame = document.getElementById(printFrameId);
-  if (pFrame && pFrame.parentNode) {
-    pFrame.parentNode.removeChild(pFrame);
+  if (pFrame) {
+    if (pFrame.parentNode) {
+      pFrame.parentNode.removeChild(pFrame);
+    }
+    const url = pFrame.getAttribute("src");
+    if (url) {
+      try {
+        window.URL.revokeObjectURL(url);
+      } catch (e) {
+        console.error(e);
+      }
+    }
   }
 }
 function getPrintFrame() {
   removePrintFrame();
   const elem = document.createElement("iframe");
   elem.id = printFrameId;
-  elem.style.width = "0px";
-  elem.style.height = "0px";
+  elem.style.width = "66px";
+  elem.style.height = "66px";
   elem.style.position = "fixed";
-  elem.style.visibility = "hidden";
+  elem.style.left = "-666px";
+  elem.style.top = "-666px";
   document.body.appendChild(elem);
   elem.focus();
   return elem;
@@ -137,7 +111,7 @@ function doPrintOnFrame(opt, printId) {
 function usePrinter(done) {
   printIdNum++;
   const printId = printIdNum;
-  const [startPrintTimer] = useTimer(200);
+  const [startPrintTimer] = useTimer(400);
   const doPrint = (option, target) => {
     if (target === "_iframe") {
       doPrintOnFrame(option, printId);
@@ -182,6 +156,57 @@ function usePrinter(done) {
   window.addEventListener("message", handleMessage);
   return doPrint;
 }
+function printPdf(option) {
+  const pFrame = getPrintFrame();
+  pFrame.onload = () => {
+    const url = pFrame.getAttribute("src");
+    if (!url) {
+      return;
+    }
+    pFrame.focus();
+    try {
+      pFrame.contentWindow && pFrame.contentWindow.print(option.options);
+      option.done && option.done();
+      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 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) {
+    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();
+  }
+}
 export {
   getPrintContainer,
   mergeOptions,

package/es/ele-pro-layout/index.d.ts

@@ -36,12 +36,12 @@ declare const _default: import('vue').DefineComponent<{
     };
     tabStyle: {
         type: import('vue').PropType<import('./types').TabStyle>;
-        default: string; /** 布局组件 */
+        default: string;
     };
     fixedHeader: {
         type: BooleanConstructor;
-        default: boolean; /** 菜单数据 */
-    }; /** 菜单数据 */
+        default: boolean;
+    };
     fixedSidebar: {
         type: BooleanConstructor;
         default: boolean;
@@ -51,11 +51,10 @@ declare const _default: import('vue').DefineComponent<{
         default: boolean;
     };
     logoInHeader: BooleanConstructor;
-    /** 侧栏菜单数据 */
     fixedHome: {
         type: BooleanConstructor;
-        default: boolean; /** 侧栏菜单选中 */
-    }; /** 侧栏菜单选中 */
+        default: boolean;
+    };
     homePath: StringConstructor;
     redirectPath: {
         type: StringConstructor;
@@ -69,9 +68,9 @@ declare const _default: import('vue').DefineComponent<{
     autoScrollTop: {
         type: BooleanConstructor;
         default: boolean;
-    }; /** 面包屑导航数据 */
+    };
     navTrigger: import('vue').PropType<import('./types').MenuItemTrigger>;
-    boxTrigger: import('vue').PropType<import('./types').MenuItemTrigger>; /** 主页地址 */
+    boxTrigger: import('vue').PropType<import('./types').MenuItemTrigger>;
     itemTrigger: import('vue').PropType<import('./types').MenuItemTrigger>;
     menuHoverTimeout: {
         type: NumberConstructor;
@@ -79,7 +78,6 @@ declare const _default: import('vue').DefineComponent<{
     };
     beforeClick: import('vue').PropType<import('./types').BeforeClick>;
     keepAlive: BooleanConstructor;
-    /** 当前路由是否隐藏双侧栏一级 */
     transitionName: StringConstructor;
     transitionDelay: {
         type: NumberConstructor;
@@ -118,16 +116,16 @@ declare const _default: import('vue').DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    headerCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    sidebarCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    sideboxCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    tabsCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    contentCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    logoStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    logoTitleStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    headerMenusStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    sidebarMenusStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    sideboxMenusStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    headerCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    sidebarCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    sideboxCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    tabsCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    contentCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    logoStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    logoTitleStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    headerMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    sidebarMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    sideboxMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     headerMenuProps: import('vue').PropType<EleMenusProps>;
     sidebarMenuProps: import('vue').PropType<EleMenusProps>;
     sideboxMenuProps: import('vue').PropType<EleMenusProps>;
@@ -135,22 +133,22 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    ellipsisProps: import('vue').PropType<import('../ele-menus/types').EllipsisProps | undefined>;
-    menuTrigger: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "click" | "hover", unknown> | undefined>;
+    ellipsisProps: import('vue').PropType<EleMenusProps["ellipsisProps"]>;
+    menuTrigger: import('vue').PropType<EleMenusProps["menuTrigger"]>;
     sidebarOpeneds: import('vue').PropType<string[]>;
     uniqueOpened: {
         type: BooleanConstructor;
         default: boolean;
     };
     colorfulIcon: BooleanConstructor;
-    tooltipEffect: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    tooltipEffect: import('vue').PropType<EleMenusProps["popperEffect"]>;
     menuTextEllipsisTooltip: import('vue').PropType<import('../ele-menus/types').TextEllipsisTooltip | undefined>;
     expanded: BooleanConstructor;
     breadcrumbSeparator: import('vue').PropType<import('../ele-breadcrumb/types').BreadcrumbSeparator>;
     backTopVisibilityHeight: NumberConstructor;
     backTopRight: NumberConstructor;
     backTopBottom: NumberConstructor;
-    backTopTarget: StringConstructor; /** 当前路由布局风格 */
+    backTopTarget: StringConstructor;
 }, {
     layoutRef: import('vue').Ref<EleAdminLayoutInstance>;
     navActive: import('vue').Ref<string | undefined>;
@@ -209,7 +207,7 @@ declare const _default: import('vue').DefineComponent<{
     tabContextMenu: (_option: TabItemEventOption) => boolean;
     tabSortChange: (_data: TabItem[]) => boolean;
     logoClick: (_isHome: boolean, _e: MouseEvent) => boolean;
-    headMenuOpen: (_index: string, _indexPath: string[]) => boolean; /** 当前路由是否是仅双侧栏一级 */
+    headMenuOpen: (_index: string, _indexPath: string[]) => boolean;
     headMenuClose: (_index: string, _indexPath: string[]) => boolean;
     sideMenuOpen: (_index: string, _indexPath: string[]) => boolean;
     sideMenuClose: (_index: string, _indexPath: string[]) => boolean;
@@ -245,12 +243,12 @@ declare const _default: import('vue').DefineComponent<{
     };
     tabStyle: {
         type: import('vue').PropType<import('./types').TabStyle>;
-        default: string; /** 布局组件 */
+        default: string;
     };
     fixedHeader: {
         type: BooleanConstructor;
-        default: boolean; /** 菜单数据 */
-    }; /** 菜单数据 */
+        default: boolean;
+    };
     fixedSidebar: {
         type: BooleanConstructor;
         default: boolean;
@@ -260,11 +258,10 @@ declare const _default: import('vue').DefineComponent<{
         default: boolean;
     };
     logoInHeader: BooleanConstructor;
-    /** 侧栏菜单数据 */
     fixedHome: {
         type: BooleanConstructor;
-        default: boolean; /** 侧栏菜单选中 */
-    }; /** 侧栏菜单选中 */
+        default: boolean;
+    };
     homePath: StringConstructor;
     redirectPath: {
         type: StringConstructor;
@@ -278,9 +275,9 @@ declare const _default: import('vue').DefineComponent<{
     autoScrollTop: {
         type: BooleanConstructor;
         default: boolean;
-    }; /** 面包屑导航数据 */
+    };
     navTrigger: import('vue').PropType<import('./types').MenuItemTrigger>;
-    boxTrigger: import('vue').PropType<import('./types').MenuItemTrigger>; /** 主页地址 */
+    boxTrigger: import('vue').PropType<import('./types').MenuItemTrigger>;
     itemTrigger: import('vue').PropType<import('./types').MenuItemTrigger>;
     menuHoverTimeout: {
         type: NumberConstructor;
@@ -288,7 +285,6 @@ declare const _default: import('vue').DefineComponent<{
     };
     beforeClick: import('vue').PropType<import('./types').BeforeClick>;
     keepAlive: BooleanConstructor;
-    /** 当前路由是否隐藏双侧栏一级 */
     transitionName: StringConstructor;
     transitionDelay: {
         type: NumberConstructor;
@@ -327,16 +323,16 @@ declare const _default: import('vue').DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    headerCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    sidebarCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    sideboxCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    tabsCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    contentCustomStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    logoStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    logoTitleStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    headerMenusStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    sidebarMenusStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    sideboxMenusStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    headerCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    sidebarCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    sideboxCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    tabsCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    contentCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    logoStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    logoTitleStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    headerMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    sidebarMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    sideboxMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     headerMenuProps: import('vue').PropType<EleMenusProps>;
     sidebarMenuProps: import('vue').PropType<EleMenusProps>;
     sideboxMenuProps: import('vue').PropType<EleMenusProps>;
@@ -344,22 +340,22 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    ellipsisProps: import('vue').PropType<import('../ele-menus/types').EllipsisProps | undefined>;
-    menuTrigger: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "click" | "hover", unknown> | undefined>;
+    ellipsisProps: import('vue').PropType<EleMenusProps["ellipsisProps"]>;
+    menuTrigger: import('vue').PropType<EleMenusProps["menuTrigger"]>;
     sidebarOpeneds: import('vue').PropType<string[]>;
     uniqueOpened: {
         type: BooleanConstructor;
         default: boolean;
     };
     colorfulIcon: BooleanConstructor;
-    tooltipEffect: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    tooltipEffect: import('vue').PropType<EleMenusProps["popperEffect"]>;
     menuTextEllipsisTooltip: import('vue').PropType<import('../ele-menus/types').TextEllipsisTooltip | undefined>;
     expanded: BooleanConstructor;
     breadcrumbSeparator: import('vue').PropType<import('../ele-breadcrumb/types').BreadcrumbSeparator>;
     backTopVisibilityHeight: NumberConstructor;
     backTopRight: NumberConstructor;
     backTopBottom: NumberConstructor;
-    backTopTarget: StringConstructor; /** 当前路由布局风格 */
+    backTopTarget: StringConstructor;
 }>> & {
     onTabClick?: ((_option: TabItemEventOption) => any) | undefined;
     onTabRemove?: ((_option: TabItemEventOption) => any) | undefined;

package/es/ele-pro-layout/props.d.ts

@@ -1,10 +1,12 @@
 import { PropType, ExtractPropTypes, InjectionKey } from 'vue';
+import { StyleValue } from '../ele-app/types';
 import { EleMenusProps, EleBreadcrumbProps, EleDropdownProps, EleBacktopProps } from '../ele-app/plus';
 import { ContextMenus } from '../ele-tabs/types';
 import { BreadcrumbSeparator as Separator } from '../ele-breadcrumb/types';
 import { Layout, SidebarLayout, HeaderStyle, SidebarStyle, TabStyle, TabBar, Maximized } from '../ele-admin-layout/types';
 import { MenuItem, TabItem, MenuItemTrigger, MenuI18n, BeforeClick, TabItemEventOption, BodySizeChangeOption, ProLayoutProvide } from './types';
 
+type TextEllipsisTooltip = EleMenusProps['textEllipsisTooltip'];
 type ProLayoutKey = InjectionKey<ProLayoutProvide>;
 /**
  * 属性
@@ -165,25 +167,25 @@ export declare const proLayoutProps: {
         default: string;
     };
     /** 顶栏样式 */
-    headerCustomStyle: PropType<Partial<import('vue').CSSProperties>>;
+    headerCustomStyle: PropType<StyleValue>;
     /** 侧栏样式 */
-    sidebarCustomStyle: PropType<Partial<import('vue').CSSProperties>>;
+    sidebarCustomStyle: PropType<StyleValue>;
     /** 双侧栏一级样式 */
-    sideboxCustomStyle: PropType<Partial<import('vue').CSSProperties>>;
+    sideboxCustomStyle: PropType<StyleValue>;
     /** 页签栏样式 */
-    tabsCustomStyle: PropType<Partial<import('vue').CSSProperties>>;
+    tabsCustomStyle: PropType<StyleValue>;
     /** 内容区样式 */
-    contentCustomStyle: PropType<Partial<import('vue').CSSProperties>>;
+    contentCustomStyle: PropType<StyleValue>;
     /** logo样式 */
-    logoStyle: PropType<Partial<import('vue').CSSProperties>>;
+    logoStyle: PropType<StyleValue>;
     /** logo文字样式 */
-    logoTitleStyle: PropType<Partial<import('vue').CSSProperties>>;
+    logoTitleStyle: PropType<StyleValue>;
     /** 顶栏菜单样式 */
-    headerMenusStyle: PropType<Partial<import('vue').CSSProperties>>;
+    headerMenusStyle: PropType<StyleValue>;
     /** 侧栏菜单样式 */
-    sidebarMenusStyle: PropType<Partial<import('vue').CSSProperties>>;
+    sidebarMenusStyle: PropType<StyleValue>;
     /** 双侧栏一级菜单样式 */
-    sideboxMenusStyle: PropType<Partial<import('vue').CSSProperties>>;
+    sideboxMenusStyle: PropType<StyleValue>;
     /** 顶栏菜单属性 */
     headerMenuProps: PropType<EleMenusProps>;
     /** 侧栏菜单属性 */
@@ -196,9 +198,9 @@ export declare const proLayoutProps: {
         default: boolean;
     };
     /** 顶栏菜单省略项的属性 */
-    ellipsisProps: PropType<import('../ele-menus/types').EllipsisProps | undefined>;
+    ellipsisProps: PropType<EleMenusProps["ellipsisProps"]>;
     /** 顶栏子菜单触发方式 */
-    menuTrigger: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "click" | "hover", unknown> | undefined>;
+    menuTrigger: PropType<EleMenusProps["menuTrigger"]>;
     /** 侧栏默认展开的菜单 */
     sidebarOpeneds: PropType<string[]>;
     /** 侧栏是否只保持一个子菜单展开 */
@@ -209,9 +211,9 @@ export declare const proLayoutProps: {
     /** 侧栏菜单是否彩色图标 */
     colorfulIcon: BooleanConstructor;
     /** 菜单 tooltip 主题 */
-    tooltipEffect: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "light" | "dark", unknown> | undefined>;
+    tooltipEffect: PropType<EleMenusProps["popperEffect"]>;
     /** 是否开启菜单文本溢出提示 */
-    menuTextEllipsisTooltip: PropType<import('../ele-menus/types').TextEllipsisTooltip | undefined>;
+    menuTextEllipsisTooltip: PropType<TextEllipsisTooltip>;
     /** 内容区最大时不带页签栏 */
     expanded: BooleanConstructor;
     /** 面包屑导航分隔符 */