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

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

@@ -21,7 +21,7 @@ const proLayoutProps = {
   },
   /** 面包屑导航分隔符 */
   breadcrumbSeparator: {
-    type: [String, Object],
+    type: [String, Object, Function],
     default: "/"
   },
   /** 是否需要返回顶部 */

package/es/ele-pro-layout/style/layout-mobile.scss

@@ -20,6 +20,10 @@
     display: block !important;
   }
 
+  &:not(.ele-admin-collapse) .ele-admin-header {
+    z-index: auto !important;
+  }
+
   .ele-admin-body,
   .ele-admin-header {
     padding-left: 0 !important;

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

@@ -1,7 +1,7 @@
 import type { RouteMeta, RouteLocationMatched } from 'vue-router';
-import type { ElMenuProps, ElBreadcrumbProps } from '../../ele-app/types';
-import type { MenuItem as MenuItemProps } from '../../ele-menus/types';
+import type { ElMenuProps, ElBreadcrumbProps, EleMenuItemProps } from '../../ele-app/types';
 import type TabTitle from "../../ele-tabs/components/tab-title";
+export type MenuItemProps = EleMenuItemProps;
 /**
  * 菜单元数据
  */
@@ -9,7 +9,7 @@ export interface MenuMeta extends RouteMeta {
     /** 菜单标题 */
     title?: string;
     /** 菜单图标 */
-    icon?: MenuItemProps['icon'];
+    icon?: EleMenuItemProps['icon'];
     /** 菜单是否隐藏 */
     hide?: boolean;
     /** 选中其它菜单 */
@@ -29,7 +29,7 @@ export interface MenuMeta extends RouteMeta {
     /** 是否在面包屑中显示 */
     breadcrumb?: boolean;
     /** 菜单组件其它属性 */
-    props?: Partial<MenuItemProps>;
+    props?: EleMenuItemProps;
     /** 是否需要外层布局 */
     layout?: boolean;
     /** 路由地址 */
@@ -210,7 +210,7 @@ export type MenuItemTrigger = 'route' | 'click';
 /**
  * 菜单点击前钩子
  */
-export type BeforeClick = (item: MenuItemProps) => boolean;
+export type BeforeClick = (item: EleMenuItemProps) => boolean;
 /**
  * 内链数据
  */
@@ -224,4 +224,3 @@ export interface IframeItem {
  * 标签页标题组件实例
  */
 export type TabTitleInstance = InstanceType<typeof TabTitle> | null;
-export type { MenuItemProps };

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

@@ -1,5 +1,4 @@
 import type { RouteLocationMatched } from 'vue-router';
-import type { MenuItem as MenuItemProps } from '../ele-menus/types';
 import type { ProLayoutProps } from './props';
 import type { MenuMeta, MenuItem, TabItem, LevelItem, CurrentRoute, WindowListenerOption, MatchedResult, MixActiveResult } from './types';
 /**
@@ -96,4 +95,4 @@ export declare function useDisableTransition(): {
  * @param menus 菜单数据
  * @param link 是否使用超链接
  */
-export declare function getMenuItems(menus: MenuItem[], link: boolean): MenuItemProps[];
+export declare function getMenuItems(menus: MenuItem[], link: boolean): Partial<import("../ele-menus/types").MenuItem>[];

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

@@ -1,13 +1,13 @@
 import type { PropType } from 'vue';
 import type { Columns, TableSize } from '../../ele-data-table/types';
-import type { TableTool, TableLocale } from '../types';
+import type { TableLocale } from '../types';
 declare const _default: import("vue").DefineComponent<{
     /** 表格尺寸 */
     size: StringConstructor;
     /** 表格列数据 */
     columns: PropType<Columns>;
     /** 工具按钮布局 */
-    tools: PropType<TableTool[] | null>;
+    tools: PropType<string[] | null>;
     /** 是否开启列拖拽排序 */
     columnSortable: BooleanConstructor;
     /** 是否开启开关固定列 */
@@ -36,7 +36,7 @@ declare const _default: import("vue").DefineComponent<{
     /** 表格列数据 */
     columns: PropType<Columns>;
     /** 工具按钮布局 */
-    tools: PropType<TableTool[] | null>;
+    tools: PropType<string[] | null>;
     /** 是否开启列拖拽排序 */
     columnSortable: BooleanConstructor;
     /** 是否开启开关固定列 */

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

@@ -1,4 +1,4 @@
-import { defineComponent, computed, resolveComponent, openBlock, createElementBlock, Fragment, renderList, createBlock, withCtx, createVNode, createCommentVNode } from "vue";
+import { defineComponent, computed, resolveComponent, openBlock, createElementBlock, Fragment, renderList, createBlock, withCtx, createVNode, renderSlot, createCommentVNode } from "vue";
 import { ElIcon } from "element-plus";
 import { RefreshRight } from "@element-plus/icons-vue";
 import { ColumnHeightOutlined, FullscreenOutlined, FullscreenExitOutlined } from "../../icons";
@@ -106,8 +106,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           })
         ]),
         _: 2
-      }, 1032, ["placement", "title", "onClick"])) : createCommentVNode("", true),
-      tool === "size" ? (openBlock(), createBlock(_component_EleTool, {
+      }, 1032, ["placement", "title", "onClick"])) : tool === "size" ? (openBlock(), createBlock(_component_EleTool, {
         key: index + "-size",
         placement: _ctx.placement,
         title: _ctx.lang.sizes
@@ -140,8 +139,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           }, 8, ["modelValue", "items", "onCommand"])
         ]),
         _: 2
-      }, 1032, ["placement", "title"])) : createCommentVNode("", true),
-      tool === "columns" ? (openBlock(), createBlock(_component_ToolColumn, {
+      }, 1032, ["placement", "title"])) : tool === "columns" ? (openBlock(), createBlock(_component_ToolColumn, {
         key: index + "-columns",
         title: _ctx.lang.columns,
         placement: _ctx.placement,
@@ -155,8 +153,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         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"])) : createCommentVNode("", true),
-      tool === "maximized" ? (openBlock(), createBlock(_component_EleTool, {
+      }, null, 8, ["title", "placement", "checkAllText", "resetText", "untitledText", "fixedLeftText", "fixedRightText", "columns", "sortable", "allowFixed", "cacheKey", "onUpdate:columns"])) : tool === "maximized" ? (openBlock(), createBlock(_component_EleTool, {
         key: index + "-maximized",
         placement: _ctx.placement,
         title: _ctx.lang.maximized,
@@ -171,7 +168,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           })
         ]),
         _: 2
-      }, 1032, ["placement", "title", "onClick"])) : createCommentVNode("", true)
+      }, 1032, ["placement", "title", "onClick"])) : _ctx.$slots[tool] ? renderSlot(_ctx.$slots, tool, { key: 4 }) : createCommentVNode("", true)
     ], 64);
   }), 256);
 }

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

@@ -5,7 +5,7 @@ declare const _default: import("vue").DefineComponent<{
     /** 提示文字 */
     title: StringConstructor;
     /** 提示位置 */
-    placement: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown>>;
+    placement: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined>;
     /** 全选文字 */
     checkAllText: StringConstructor;
     /** 重置文字 */
@@ -50,7 +50,7 @@ declare const _default: import("vue").DefineComponent<{
     /** 提示文字 */
     title: StringConstructor;
     /** 提示位置 */
-    placement: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown>>;
+    placement: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined>;
     /** 全选文字 */
     checkAllText: StringConstructor;
     /** 重置文字 */

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

@@ -1,10 +1,7 @@
 import type { Ref } from 'vue';
-import type { ComponentProps } from '../ele-app/types';
-import type { LoadingProps } from '../ele-loading/props';
-import type { PaginationProps } from '../ele-pagination/props';
-import type { DataTableProps } from '../ele-data-table/props';
+import type { EleLoadingProps, ElePaginationProps, EleDataTableProps } from '../ele-app/types';
 import type { DataItem, Columns, Sorter, Filter, TableSize } from '../ele-data-table/types';
-import type { ReloadFunction, DoneParams, TableTool, FetchCallback, TableViewInstance } from './types';
+import type { ReloadFunction, DoneParams, FetchCallback, TableViewInstance } from './types';
 declare const _default: import("vue").DefineComponent<{
     loading: BooleanConstructor;
     datasource: {
@@ -26,11 +23,11 @@ declare const _default: import("vue").DefineComponent<{
     selections: import("vue").PropType<DataItem[]>;
     current: import("vue").PropType<DataItem | null>;
     toolbar: {
-        type: import("vue").PropType<boolean | import("./types").TableToolbar>;
+        type: import("vue").PropType<boolean | import("../ele-app/types").EleToolbarProps>;
         default: boolean;
     };
     tools: {
-        type: import("vue").PropType<boolean | TableTool[]>;
+        type: import("vue").PropType<boolean | string[]>;
         default: () => null;
     };
     columnSortable: {
@@ -49,13 +46,13 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<boolean | import("./types").TablePagination>;
         default: () => null;
     };
-    loadingProps: import("vue").PropType<Partial<LoadingProps>>;
+    loadingProps: import("vue").PropType<EleLoadingProps>;
     cacheKey: StringConstructor;
     virtual: BooleanConstructor;
     rowHeight: NumberConstructor;
     locale: import("vue").PropType<Partial<import("./types").TableLocale>>;
     size: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+        readonly type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -76,16 +73,17 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<Columns>;
         required: boolean;
     };
-    data: {
-        type: import("vue").PropType<any[]>;
-        default: () => never[];
-    };
     height: (StringConstructor | NumberConstructor)[];
     scrollbarAlwaysOn: {
         type: BooleanConstructor;
         default: boolean;
     };
     showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    emptyText: StringConstructor;
+    indent: {
+        type: NumberConstructor;
+        default: number;
+    };
     stripe: {
         type: BooleanConstructor;
         default: null;
@@ -111,7 +109,6 @@ declare const _default: import("vue").DefineComponent<{
     headerCellStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (StringConstructor | NumberConstructor)[];
-    emptyText: StringConstructor;
     expandRowKeys: import("vue").PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
@@ -130,10 +127,6 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    indent: {
-        type: NumberConstructor;
-        default: number;
-    };
     treeProps: {
         type: import("vue").PropType<{
             hasChildren?: string | undefined;
@@ -168,16 +161,17 @@ declare const _default: import("vue").DefineComponent<{
         default: () => null;
     };
     rowClickChecked: import("vue").PropType<import("../ele-data-table/types").RowClickChecked>;
+    reserveCurrent: BooleanConstructor;
+    selectedRowKeys: import("vue").PropType<import("../ele-data-table/types").DataKey[]>;
 }, {
     tableViewRef: Ref<TableViewInstance>;
     tableSize: Ref<"" | "default" | "small" | "large" | undefined>;
     tableMaximized: Ref<boolean>;
-    slotKeys: import("vue").ComputedRef<string[]>;
     tableIndex: import("vue").ComputedRef<number>;
-    paginationProps: import("vue").ComputedRef<Partial<PaginationProps> | null>;
-    tableProps: import("vue").ComputedRef<Partial<DataTableProps>>;
-    tableTools: import("vue").ComputedRef<TableTool[]>;
-    rootProps: import("vue").ComputedRef<ComponentProps<LoadingProps>>;
+    paginationProps: import("vue").ComputedRef<ElePaginationProps | null>;
+    tableProps: import("vue").ComputedRef<EleDataTableProps>;
+    tableTools: import("vue").ComputedRef<string[]>;
+    rootProps: import("vue").ComputedRef<EleLoadingProps>;
     onRefresh: () => void;
     onSizeChange: (size: TableSize) => void;
     onColumnsChange: (columns: Columns) => void;
@@ -204,18 +198,20 @@ declare const _default: import("vue").DefineComponent<{
     scrollTo: (options: number | ScrollToOptions, yCoord?: number | undefined) => void;
     setScrollTop: (top?: number | undefined) => void;
     setScrollLeft: (left?: number | undefined) => void;
+    setCurrentRowKey: (key?: import("../ele-data-table/types").DataKey | null | undefined) => void;
+    getCurrentRow: () => DataItem | undefined;
     setSelectedRows: (rows?: DataItem[] | undefined) => void;
-    setSelectedRowKeys: (keys?: string[] | number[] | undefined) => void;
-    toggleRowExpansionAll: (expanded?: boolean | undefined) => void;
+    setSelectedRowKeys: (keys?: import("../ele-data-table/types").DataKey[] | undefined, rows?: DataItem[] | undefined) => void; /** 数据请求状态 */
+    toggleRowExpansionAll: (expanded?: boolean | undefined) => void; /** 表格列配置 */
+    updateSelectedAndChecked: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    /** 当前页数据 */
     done: (_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => boolean;
     'update:selections': (_selections: DataItem[]) => boolean;
     'update:current': (_current?: DataItem | null | undefined) => boolean;
     columnsChange: (_columns: Columns) => boolean;
-    /** 每页显示数量 */
     sizeChange: (_size: "" | "default" | "small" | "large" | undefined) => boolean;
     maximizedChange: (_maximized: boolean) => boolean;
-    /** 数据总数量 */
     refresh: () => boolean;
     select: (_selection: DataItem[], _row: DataItem) => boolean;
     selectAll: (_selection: DataItem[]) => boolean;
@@ -228,13 +224,15 @@ declare const _default: import("vue").DefineComponent<{
     rowClick: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
     rowContextmenu: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
     rowDblclick: (_row: DataItem, _column: import("./types").Column, _e: MouseEvent) => boolean;
-    headerClick: (_column: import("./types").Column, _e: MouseEvent) => boolean;
+    headerClick: (_column: import("./types").Column, _e: MouseEvent) => boolean; /** 当前页码 */
     headerContextmenu: (_column: import("./types").Column, _e: MouseEvent) => boolean;
     sortChange: (_sorter: Sorter) => boolean;
     filterChange: (_filter: Filter) => boolean;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
     headerDragend: (_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => boolean;
     expandChange: (_row: DataItem, _expanded: boolean) => boolean;
+    'update:currentRowKey': (_currentRowKey?: import("../ele-data-table/types").DataKey | undefined) => boolean;
+    'update:selectedRowKeys': (_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => boolean;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     loading: BooleanConstructor;
     datasource: {
@@ -256,11 +254,11 @@ declare const _default: import("vue").DefineComponent<{
     selections: import("vue").PropType<DataItem[]>;
     current: import("vue").PropType<DataItem | null>;
     toolbar: {
-        type: import("vue").PropType<boolean | import("./types").TableToolbar>;
+        type: import("vue").PropType<boolean | import("../ele-app/types").EleToolbarProps>;
         default: boolean;
     };
     tools: {
-        type: import("vue").PropType<boolean | TableTool[]>;
+        type: import("vue").PropType<boolean | string[]>;
         default: () => null;
     };
     columnSortable: {
@@ -279,13 +277,13 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<boolean | import("./types").TablePagination>;
         default: () => null;
     };
-    loadingProps: import("vue").PropType<Partial<LoadingProps>>;
+    loadingProps: import("vue").PropType<EleLoadingProps>;
     cacheKey: StringConstructor;
     virtual: BooleanConstructor;
     rowHeight: NumberConstructor;
     locale: import("vue").PropType<Partial<import("./types").TableLocale>>;
     size: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
+        readonly type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -306,16 +304,17 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<Columns>;
         required: boolean;
     };
-    data: {
-        type: import("vue").PropType<any[]>;
-        default: () => never[];
-    };
     height: (StringConstructor | NumberConstructor)[];
     scrollbarAlwaysOn: {
         type: BooleanConstructor;
         default: boolean;
     };
     showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
+    emptyText: StringConstructor;
+    indent: {
+        type: NumberConstructor;
+        default: number;
+    };
     stripe: {
         type: BooleanConstructor;
         default: null;
@@ -341,7 +340,6 @@ declare const _default: import("vue").DefineComponent<{
     headerCellStyle: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
     currentRowKey: (StringConstructor | NumberConstructor)[];
-    emptyText: StringConstructor;
     expandRowKeys: import("vue").PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
@@ -360,10 +358,6 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    indent: {
-        type: NumberConstructor;
-        default: number;
-    };
     treeProps: {
         type: import("vue").PropType<{
             hasChildren?: string | undefined;
@@ -398,6 +392,8 @@ declare const _default: import("vue").DefineComponent<{
         default: () => null;
     };
     rowClickChecked: import("vue").PropType<import("../ele-data-table/types").RowClickChecked>;
+    reserveCurrent: BooleanConstructor;
+    selectedRowKeys: import("vue").PropType<import("../ele-data-table/types").DataKey[]>;
 }>> & {
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
@@ -417,8 +413,10 @@ declare const _default: import("vue").DefineComponent<{
     onCurrentChange?: ((_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => any) | undefined;
     onHeaderDragend?: ((_width: number, _old: number, _column: import("./types").Column, _e: MouseEvent) => any) | undefined;
     onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
-    onRefresh?: (() => any) | undefined;
+    "onUpdate:currentRowKey"?: ((_currentRowKey?: import("../ele-data-table/types").DataKey | undefined) => any) | undefined;
+    "onUpdate:selectedRowKeys"?: ((_selectedRowKeys?: import("../ele-data-table/types").DataKey[] | undefined) => any) | undefined;
     onDone?: ((_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => any) | undefined;
+    onRefresh?: (() => any) | undefined;
     "onUpdate:selections"?: ((_selections: DataItem[]) => any) | undefined;
     "onUpdate:current"?: ((_current?: DataItem | null | undefined) => any) | undefined;
     onColumnsChange?: ((_columns: Columns) => any) | undefined;
@@ -429,8 +427,8 @@ declare const _default: import("vue").DefineComponent<{
     fit: boolean;
     className: string;
     lazy: boolean;
-    data: any[];
     scrollbarAlwaysOn: boolean;
+    indent: number;
     stripe: boolean;
     border: boolean;
     showHeader: boolean;
@@ -438,7 +436,6 @@ declare const _default: import("vue").DefineComponent<{
     highlightCurrentRow: boolean;
     defaultExpandAll: boolean;
     selectOnIndeterminate: boolean;
-    indent: number;
     treeProps: {
         hasChildren?: string | undefined;
         children?: string | undefined;
@@ -450,10 +447,11 @@ declare const _default: import("vue").DefineComponent<{
     sticky: boolean;
     bottomLine: boolean;
     emptyProps: import("../ele-data-table/types").TableEmptyProps;
+    reserveCurrent: boolean;
+    toolbar: boolean | import("../ele-app/types").EleToolbarProps;
     loadOnCreated: boolean;
     loadOnChanged: boolean;
-    toolbar: boolean | import("./types").TableToolbar;
-    tools: boolean | TableTool[];
+    tools: boolean | string[];
     columnSortable: boolean;
     columnFixed: boolean;
     pagination: boolean | import("./types").TablePagination;