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

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,32 +1,13 @@
-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;
-/**
- * 生成打印设置的样式
+ * 打印 pdf
+ * @param option 打印参数
  */
-export declare function getOptionCss(opt: PrintOption): string;
+export declare function printPdf(option: PrintPdfOption): void;
 /**
  * 合并打印方法参数
  * @param options 参数
@@ -34,13 +15,11 @@ export declare function getOptionCss(opt: PrintOption): string;
  */
 export declare function mergeOptions(options?: any, userOptions?: any): any;
 /**
- * usePrinter
+ * 创建并获取打印容器
  */
-export declare function usePrinter(done: () => void): {
-    printId: string;
-};
+export declare function getPrintContainer(): Element;
 /**
- * 打印 pdf
- * @param option 打印参数
+ * usePrinter
+ * @param done 打印结束回调
  */
-export declare function printPdf(option: PrintPdfOption): void;
+export declare function usePrinter(done: () => void): (option: PrintOption, target?: PrintTarget | null) => void;

package/es/ele-printer/util.js

@@ -1,8 +1,52 @@
 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 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) {
@@ -13,28 +57,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;
@@ -68,7 +124,7 @@ function doPrintOnFrame(opt) {
         document.title = '${opt.title}';
       }
       window.print(${printOption});
-      window.parent.postMessage('elePrintDone_${opt.printId}', '*');
+      window.parent.postMessage('elePrintDone_${printId}', '*');
     };
   <\/script>
   `;
@@ -78,107 +134,60 @@ 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(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);
-  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();
-  }
+  onBeforeUnmount(() => {
+    window.removeEventListener("message", handleMessage);
+  });
+  window.addEventListener("message", handleMessage);
+  return doPrint;
 }
 export {
-  doPrint,
-  doPrintOnFrame,
-  getOptionCss,
   getPrintContainer,
-  getPrintFrame,
   mergeOptions,
   printContainerId,
   printFrameId,
   printPdf,
   printingClass,
-  removePrintFrame,
   usePrinter
 };

package/es/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>;
@@ -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; /** 菜单数据 */
-    };
+    }; /** 菜单数据 */
     fixedSidebar: {
         type: BooleanConstructor;
         default: boolean;
@@ -50,11 +50,12 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    logoInHeader: BooleanConstructor; /** 侧栏菜单数据 */
+    logoInHeader: BooleanConstructor;
+    /** 侧栏菜单数据 */
     fixedHome: {
         type: BooleanConstructor;
         default: boolean; /** 侧栏菜单选中 */
-    };
+    }; /** 侧栏菜单选中 */
     homePath: StringConstructor;
     redirectPath: {
         type: StringConstructor;
@@ -64,14 +65,12 @@ 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>; /** 主页地址 */
     itemTrigger: import('vue').PropType<import('./types').MenuItemTrigger>;
     menuHoverTimeout: {
@@ -79,7 +78,8 @@ declare const _default: import('vue').DefineComponent<{
         default: number;
     };
     beforeClick: import('vue').PropType<import('./types').BeforeClick>;
-    keepAlive: BooleanConstructor; /** 当前路由是否隐藏双侧栏一级 */
+    keepAlive: BooleanConstructor;
+    /** 当前路由是否隐藏双侧栏一级 */
     transitionName: StringConstructor;
     transitionDelay: {
         type: NumberConstructor;
@@ -209,7 +209,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;
@@ -217,7 +217,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>;
@@ -245,12 +245,12 @@ declare const _default: import('vue').DefineComponent<{
     };
     tabStyle: {
         type: import('vue').PropType<import('./types').TabStyle>;
-        default: string;
+        default: string; /** 布局组件 */
     };
     fixedHeader: {
         type: BooleanConstructor;
         default: boolean; /** 菜单数据 */
-    };
+    }; /** 菜单数据 */
     fixedSidebar: {
         type: BooleanConstructor;
         default: boolean;
@@ -259,11 +259,12 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    logoInHeader: BooleanConstructor; /** 侧栏菜单数据 */
+    logoInHeader: BooleanConstructor;
+    /** 侧栏菜单数据 */
     fixedHome: {
         type: BooleanConstructor;
         default: boolean; /** 侧栏菜单选中 */
-    };
+    }; /** 侧栏菜单选中 */
     homePath: StringConstructor;
     redirectPath: {
         type: StringConstructor;
@@ -273,14 +274,12 @@ 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>; /** 主页地址 */
     itemTrigger: import('vue').PropType<import('./types').MenuItemTrigger>;
     menuHoverTimeout: {
@@ -288,7 +287,8 @@ declare const _default: import('vue').DefineComponent<{
         default: number;
     };
     beforeClick: import('vue').PropType<import('./types').BeforeClick>;
-    keepAlive: BooleanConstructor; /** 当前路由是否隐藏双侧栏一级 */
+    keepAlive: BooleanConstructor;
+    /** 当前路由是否隐藏双侧栏一级 */
     transitionName: StringConstructor;
     transitionDelay: {
         type: NumberConstructor;

package/es/ele-pro-layout/index.js

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

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

@@ -13,7 +13,7 @@ export declare const proLayoutProps: {
     /** 高度 */
     height: {
         type: (StringConstructor | NumberConstructor)[];
-        default: string;
+        default: null;
     };
     /** 菜单数据 */
     menus: PropType<MenuItem[] | null>;

package/es/ele-pro-layout/props.js

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

package/es/ele-pro-table/components/table-tools.d.ts

@@ -73,12 +73,12 @@ declare const _default: import('vue').DefineComponent<{
     placement: import('vue').ComputedRef<"top" | "bottom">;
     reload: () => void;
     updateSize: (size: string) => void;
-    updateColumns: (columns: Columns) => void;
+    updateColumns: (columns: Columns, tableColumns: Columns) => void;
     toggleMaximized: () => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     reload: () => true;
     'update:size': (_size: TableSize) => true;
-    'update:columns': (_columns: Columns) => true;
+    'update:columns': (_columns: Columns, _tableColumns: Columns) => true;
     'update:maximized': (_maximized: boolean) => true;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 工具按钮布局 */
@@ -147,7 +147,7 @@ declare const _default: import('vue').DefineComponent<{
         required: true;
     };
 }>> & {
-    "onUpdate:columns"?: ((_columns: Columns) => any) | undefined;
+    "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns) => any) | undefined;
     onReload?: (() => any) | undefined;
     "onUpdate:size"?: ((_size: "" | "small" | "default" | "large" | undefined) => any) | undefined;
     "onUpdate:maximized"?: ((_maximized: boolean) => any) | undefined;

package/es/ele-pro-table/components/table-tools.js

@@ -84,14 +84,12 @@ const _sfc_main = defineComponent({
   emits: {
     reload: () => true,
     "update:size": (_size) => true,
-    "update:columns": (_columns) => true,
+    "update:columns": (_columns, _tableColumns) => true,
     "update:maximized": (_maximized) => true
   },
   setup(props, { emit }) {
     const { lang } = useLocale("table", props);
-    const placement = computed(() => {
-      return props.maximized ? "bottom" : "top";
-    });
+    const placement = computed(() => props.maximized ? "bottom" : "top");
     const reload = () => {
       emit("reload");
     };
@@ -101,8 +99,8 @@ const _sfc_main = defineComponent({
       }
       emit("update:size", size);
     };
-    const updateColumns = (columns) => {
-      emit("update:columns", columns);
+    const updateColumns = (columns, tableColumns) => {
+      emit("update:columns", columns, tableColumns);
     };
     const toggleMaximized = () => {
       emit("update:maximized", !props.maximized);
@@ -187,19 +185,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         _: 2
       }, 1032, ["placement", "title"])) : tool === "columns" ? (openBlock(), createBlock(_component_ToolColumn, {
         key: index + "-columns",
-        title: _ctx.lang.columns,
         placement: _ctx.placement,
-        checkAllText: _ctx.lang.columnTitle,
-        resetText: _ctx.lang.columnReset,
-        untitledText: _ctx.lang.columnUntitled,
-        fixedLeftText: _ctx.lang.columnFixedLeft,
-        fixedRightText: _ctx.lang.columnFixedRight,
+        locale: _ctx.lang,
         columns: _ctx.columns,
         sortable: _ctx.columnSortable,
         allowFixed: _ctx.columnFixed,
         cacheKey: _ctx.cacheKey,
         "onUpdate:columns": _ctx.updateColumns
-      }, null, 8, ["title", "placement", "checkAllText", "resetText", "untitledText", "fixedLeftText", "fixedRightText", "columns", "sortable", "allowFixed", "cacheKey", "onUpdate:columns"])) : tool === "maximized" ? (openBlock(), createBlock(_component_EleTool, {
+      }, null, 8, ["placement", "locale", "columns", "sortable", "allowFixed", "cacheKey", "onUpdate:columns"])) : tool === "maximized" ? (openBlock(), createBlock(_component_EleTool, {
         key: index + "-maximized",
         placement: _ctx.placement,
         title: _ctx.lang.maximized,

package/es/ele-pro-table/components/tool-column-list.d.ts

@@ -11,15 +11,15 @@ declare const _default: import('vue').DefineComponent<{
     /** 是否开启开关固定列 */
     allowFixed: BooleanConstructor;
 }, {
-    onSortChange: (colItems: ColItem[]) => void;
-    onCheckedChange: (colItem: ColItem, checked: boolean) => void;
-    onFixedLeft: (colItem: ColItem) => void;
-    onFixedRight: (colItem: ColItem) => void;
-    onFixedLeftTooltip: (e: MouseEvent) => void;
-    onFixedRightTooltip: (e: MouseEvent) => void;
-    onChildSortChange: (colItems: ColItem[], parent?: ColItem) => void;
-    onChildFixedLeftTooltip: (el: HTMLElement) => void;
-    onChildFixedRightTooltip: (el: HTMLElement) => void;
+    handleSortChange: (colItems: ColItem[]) => void;
+    handleCheckedChange: (colItem: ColItem, checked: boolean) => void;
+    handleFixedLeft: (colItem: ColItem) => void;
+    handleFixedRight: (colItem: ColItem) => void;
+    handleFixedLeftTooltip: (e: MouseEvent) => void;
+    handleFixedRightTooltip: (e: MouseEvent) => void;
+    handleChildSortChange: (colItems: ColItem[], parent?: ColItem) => void;
+    handleChildFixedLeftTooltip: (el: HTMLElement) => void;
+    handleChildFixedRightTooltip: (el: HTMLElement) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     sortChange: (_colItems: ColItem[], _parent?: ColItem) => true;
     checkedChange: (_item: ColItem, _checked: boolean) => true;