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

package/lib/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/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>;
@@ -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/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

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

package/lib/ele-pro-table/components/table-tools.cjs

@@ -85,14 +85,12 @@ const _sfc_main = vue.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 } = receiver.useLocale("table", props);
-    const placement = vue.computed(() => {
-      return props.maximized ? "bottom" : "top";
-    });
+    const placement = vue.computed(() => props.maximized ? "bottom" : "top");
     const reload = () => {
       emit("reload");
     };
@@ -102,8 +100,8 @@ const _sfc_main = vue.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);
@@ -188,19 +186,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         _: 2
       }, 1032, ["placement", "title"])) : tool === "columns" ? (vue.openBlock(), vue.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" ? (vue.openBlock(), vue.createBlock(_component_EleTool, {
+      }, null, 8, ["placement", "locale", "columns", "sortable", "allowFixed", "cacheKey", "onUpdate:columns"])) : tool === "maximized" ? (vue.openBlock(), vue.createBlock(_component_EleTool, {
         key: index + "-maximized",
         placement: _ctx.placement,
         title: _ctx.lang.maximized,

package/lib/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/lib/ele-pro-table/components/tool-column-list.cjs

@@ -32,43 +32,43 @@ const _sfc_main = vue.defineComponent({
     fixedRightTooltip: (_el) => true
   },
   setup(props, { emit }) {
-    const onSortChange = (colItems) => {
-      onChildSortChange(colItems, props.parent);
+    const handleSortChange = (colItems) => {
+      handleChildSortChange(colItems, props.parent);
     };
-    const onCheckedChange = (colItem, checked) => {
+    const handleCheckedChange = (colItem, checked) => {
       emit("checkedChange", colItem, checked);
     };
-    const onFixedLeft = (colItem) => {
+    const handleFixedLeft = (colItem) => {
       emit("fixedLeft", colItem);
     };
-    const onFixedRight = (colItem) => {
+    const handleFixedRight = (colItem) => {
       emit("fixedRight", colItem);
     };
-    const onFixedLeftTooltip = (e) => {
-      onChildFixedLeftTooltip(e.currentTarget);
+    const handleFixedLeftTooltip = (e) => {
+      handleChildFixedLeftTooltip(e.currentTarget);
     };
-    const onFixedRightTooltip = (e) => {
-      onChildFixedRightTooltip(e.currentTarget);
+    const handleFixedRightTooltip = (e) => {
+      handleChildFixedRightTooltip(e.currentTarget);
     };
-    const onChildSortChange = (colItems, parent) => {
+    const handleChildSortChange = (colItems, parent) => {
       emit("sortChange", colItems, parent);
     };
-    const onChildFixedLeftTooltip = (el) => {
+    const handleChildFixedLeftTooltip = (el) => {
       emit("fixedLeftTooltip", el);
     };
-    const onChildFixedRightTooltip = (el) => {
+    const handleChildFixedRightTooltip = (el) => {
       emit("fixedRightTooltip", el);
     };
     return {
-      onSortChange,
-      onCheckedChange,
-      onFixedLeft,
-      onFixedRight,
-      onFixedLeftTooltip,
-      onFixedRightTooltip,
-      onChildSortChange,
-      onChildFixedLeftTooltip,
-      onChildFixedRightTooltip
+      handleSortChange,
+      handleCheckedChange,
+      handleFixedLeft,
+      handleFixedRight,
+      handleFixedLeftTooltip,
+      handleFixedRightTooltip,
+      handleChildSortChange,
+      handleChildFixedLeftTooltip,
+      handleChildFixedRightTooltip
     };
   }
 });
@@ -108,7 +108,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     handle: ".ele-tool-column-handle",
     componentData: { class: "ele-tool-column-list" },
     forceFallback: true,
-    "onUpdate:modelValue": _ctx.onSortChange
+    "onUpdate:modelValue": _ctx.handleSortChange
   }, {
     item: vue.withCtx(({ element: d }) => [
       vue.createElementVNode("div", _hoisted_1, [
@@ -125,7 +125,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             vue.createVNode(_component_ElCheckbox, {
               label: d.label,
               modelValue: d.checked,
-              "onUpdate:modelValue": (v) => _ctx.onCheckedChange(d, v)
+              "onUpdate:modelValue": (v) => _ctx.handleCheckedChange(d, v)
             }, null, 8, ["label", "modelValue", "onUpdate:modelValue"])
           ]),
           _ctx.allowFixed ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_5, [
@@ -134,8 +134,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 "ele-tool-column-fixed-item",
                 { "is-active": d.fixed === true || d.fixed === "left" }
               ]),
-              onClick: ($event) => _ctx.onFixedLeft(d),
-              onMouseover: _cache[0] || (_cache[0] = (...args) => _ctx.onFixedLeftTooltip && _ctx.onFixedLeftTooltip(...args))
+              onClick: ($event) => _ctx.handleFixedLeft(d),
+              onMouseover: _cache[0] || (_cache[0] = (...args) => _ctx.handleFixedLeftTooltip && _ctx.handleFixedLeftTooltip(...args))
             }, [
               vue.createVNode(_component_ElIcon, null, {
                 default: vue.withCtx(() => [
@@ -149,8 +149,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 "ele-tool-column-fixed-item",
                 { "is-active": d.fixed === "right" }
               ]),
-              onClick: ($event) => _ctx.onFixedRight(d),
-              onMouseover: _cache[1] || (_cache[1] = (...args) => _ctx.onFixedRightTooltip && _ctx.onFixedRightTooltip(...args))
+              onClick: ($event) => _ctx.handleFixedRight(d),
+              onMouseover: _cache[1] || (_cache[1] = (...args) => _ctx.handleFixedRightTooltip && _ctx.handleFixedRightTooltip(...args))
             }, [
               vue.createVNode(_component_ElIcon, null, {
                 default: vue.withCtx(() => [
@@ -166,12 +166,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           data: d.children,
           parent: d,
           sortable: _ctx.sortable,
-          onSortChange: _ctx.onChildSortChange,
-          onCheckedChange: _ctx.onCheckedChange,
-          onFixedLeft: _ctx.onFixedLeft,
-          onFixedRight: _ctx.onFixedRight,
-          onFixedLeftTooltip: _ctx.onChildFixedLeftTooltip,
-          onFixedRightTooltip: _ctx.onChildFixedRightTooltip
+          onSortChange: _ctx.handleChildSortChange,
+          onCheckedChange: _ctx.handleCheckedChange,
+          onFixedLeft: _ctx.handleFixedLeft,
+          onFixedRight: _ctx.handleFixedRight,
+          onFixedLeftTooltip: _ctx.handleChildFixedLeftTooltip,
+          onFixedRightTooltip: _ctx.handleChildFixedRightTooltip
         }, null, 8, ["data", "parent", "sortable", "onSortChange", "onCheckedChange", "onFixedLeft", "onFixedRight", "onFixedLeftTooltip", "onFixedRightTooltip"])) : vue.createCommentVNode("", true)
       ])
     ]),

package/lib/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;