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

package/lib/ele-printer/util.cjs

@@ -1,10 +1,17 @@
 "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 mergeOptions(options, userOptions) {
+  if (options == null) {
+    return userOptions;
+  }
+  return Object.assign({}, options, userOptions);
+}
 function getPrintContainer() {
   const container = document.getElementById(printContainerId);
   if (container) {
@@ -15,28 +22,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;
@@ -70,7 +100,7 @@ function doPrintOnFrame(opt) {
         document.title = '${opt.title}';
       }
       window.print(${printOption});
-      window.parent.postMessage('elePrintDone_${opt.printId}', '*');
+      window.parent.postMessage('elePrintDone_${printId}', '*');
     };
   <\/script>
   `;
@@ -80,80 +110,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 = core.uuid(8);
-  const onMessage = (e) => {
-    if (e.data === `elePrintDone_${printId}`) {
-      removePrintFrame();
+  printIdNum++;
+  const printId = printIdNum;
+  const [startPrintTimer] = hook.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);
   vue.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) {
@@ -162,7 +201,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);
@@ -170,15 +209,10 @@ function printPdf(option) {
     req.send();
   }
 }
-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;

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

@@ -511,7 +511,7 @@ const _sfc_main = vue.defineComponent({
       }
       return layoutRef.value.getContentEl();
     };
-    const onRouteChange = (route) => {
+    const handleRouteChange = (route) => {
       const { path, meta } = route;
       hideFooter.value = !!meta.hideFooter;
       const contentEl = getContentElem();
@@ -720,7 +720,7 @@ const _sfc_main = vue.defineComponent({
     vue.watch(
       currentRoute,
       (route) => {
-        onRouteChange(vue.unref(route));
+        handleRouteChange(vue.unref(route));
       },
       { immediate: true }
     );

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

@@ -8,7 +8,7 @@ import { Layout, SidebarLayout, TabBar, Maximized } from '../ele-admin-layout/ty
 declare const _default: import('vue').DefineComponent<{
     height: {
         type: (StringConstructor | NumberConstructor)[];
-        default: string;
+        default: null;
     };
     menus: import('vue').PropType<MenuItem[] | null>;
     tabs: import('vue').PropType<TabItem[] | null>;
@@ -40,7 +40,7 @@ declare const _default: import('vue').DefineComponent<{
     };
     fixedHeader: {
         type: BooleanConstructor;
-        default: boolean; /** 菜单数据 */
+        default: boolean;
     };
     fixedSidebar: {
         type: BooleanConstructor;
@@ -50,10 +50,10 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    logoInHeader: BooleanConstructor; /** 侧栏菜单数据 */
+    logoInHeader: BooleanConstructor;
     fixedHome: {
         type: BooleanConstructor;
-        default: boolean; /** 侧栏菜单选中 */
+        default: boolean;
     };
     homePath: StringConstructor;
     redirectPath: {
@@ -64,22 +64,20 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    /** 页签数据 */
     compressOnEsc: BooleanConstructor;
     autoScrollTop: {
         type: BooleanConstructor;
-        default: boolean; /** 面包屑导航数据 */
-    }; /** 面包屑导航数据 */
+        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;
         default: number;
     };
     beforeClick: import('vue').PropType<import('./types').BeforeClick>;
-    keepAlive: BooleanConstructor; /** 当前路由是否隐藏双侧栏一级 */
+    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>;
@@ -217,7 +215,7 @@ declare const _default: import('vue').DefineComponent<{
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     height: {
         type: (StringConstructor | NumberConstructor)[];
-        default: string;
+        default: null;
     };
     menus: import('vue').PropType<MenuItem[] | null>;
     tabs: import('vue').PropType<TabItem[] | null>;
@@ -249,7 +247,7 @@ declare const _default: import('vue').DefineComponent<{
     };
     fixedHeader: {
         type: BooleanConstructor;
-        default: boolean; /** 菜单数据 */
+        default: boolean;
     };
     fixedSidebar: {
         type: BooleanConstructor;
@@ -259,10 +257,10 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    logoInHeader: BooleanConstructor; /** 侧栏菜单数据 */
+    logoInHeader: BooleanConstructor;
     fixedHome: {
         type: BooleanConstructor;
-        default: boolean; /** 侧栏菜单选中 */
+        default: boolean;
     };
     homePath: StringConstructor;
     redirectPath: {
@@ -273,22 +271,20 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    /** 页签数据 */
     compressOnEsc: BooleanConstructor;
     autoScrollTop: {
         type: BooleanConstructor;
-        default: boolean; /** 面包屑导航数据 */
-    }; /** 面包屑导航数据 */
+        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;
         default: number;
     };
     beforeClick: import('vue').PropType<import('./types').BeforeClick>;
-    keepAlive: BooleanConstructor; /** 当前路由是否隐藏双侧栏一级 */
+    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/lib/ele-pro-layout/props.cjs

@@ -4,7 +4,7 @@ const proLayoutProps = {
   /** 高度 */
   height: {
     type: [String, Number],
-    default: "100vh"
+    default: null
   },
   /** 菜单数据 */
   menus: Array,

package/lib/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>;
 /**
  * 属性
@@ -13,7 +15,7 @@ export declare const proLayoutProps: {
     /** 高度 */
     height: {
         type: (StringConstructor | NumberConstructor)[];
-        default: string;
+        default: null;
     };
     /** 菜单数据 */
     menus: PropType<MenuItem[] | null>;
@@ -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;
     /** 面包屑导航分隔符 */