ele-admin-plus 1.1.4-beta.3 → 1.1.5-beta.1

package/lib/ele-pro-table/types/index.d.ts

@@ -1,12 +1,9 @@
-import type { Slot } from 'vue';
-import type { Sort } from 'element-plus/es/components/table/src/table/defaults';
-import type { ComponentProps, StyleValue, ElTableProps, ElColumnProps } from '../../ele-app/types';
+import type { StyleValue, ComponentProps } from '../../ele-app/types';
+import type { EleDataTableInstance, EleVirtualTableInstance } from '../../ele-app/types/components';
 import type { PaginationProps } from '../../ele-pagination/props';
 import type { ToolbarProps } from '../../ele-toolbar/props';
-/**
- * 数据
- */
-export type DataItem = Record<keyof any, any>;
+import type { DataItem, Column, Columns, Sorter, Filter, TableColumn, TableSize, ResolveFunction } from '../../ele-data-table/types';
+export type { DataItem, Column, Columns, Sorter, Filter, TableColumn, TableSize, ResolveFunction };
 /**
  * 搜索参数
  */
@@ -19,17 +16,6 @@ export type Orders = Record<string, OrderValue>;
  * 筛选参数
  */
 export type Filters = Record<string, any>;
-/**
- * 排序方式
- */
-export interface Sorter extends Partial<Sort> {
-    /** 列配置 */
-    column?: Column;
-}
-/**
- * 筛选条件
- */
-export type Filter = Record<string, any>;
 /**
  * 数据源方法参数
  */
@@ -127,31 +113,6 @@ export interface OrderItem {
     /** 自定义排序方法 */
     sortMethod?: (a: DataItem, b: DataItem) => number;
 }
-/**
- * 原始列数据
- */
-export type TableColumn = Partial<ElColumnProps>;
-/**
- * 列数据
- */
-export interface Column extends TableColumn {
-    /** 唯一标识 */
-    uid?: string;
-    /** 插槽名称 */
-    slot?: string;
-    /** 表头插槽名称 */
-    headerSlot?: string;
-    /** 是否隐藏 */
-    hideInTable?: boolean;
-    /** 是否不显示在列配置中 */
-    hideInSetting?: boolean;
-    /** 子级 */
-    children?: Columns;
-}
-/**
- * 列数据
- */
-export type Columns = Column[];
 /**
  * 渲染完成事件参数
  */
@@ -173,10 +134,6 @@ export type DoneFunction<T> = (
 result: DoneParams<T>, 
 /** 树形表格时父级数据 */
 parent?: T) => void;
-/**
- * 表格尺寸
- */
-export type TableSize = ElTableProps<DataItem>['size'];
 /**
  * 分页组件属性
  */
@@ -200,38 +157,19 @@ export type TableTool = 'reload' | 'size' | 'columns' | 'maximized';
 export interface ColItem {
     /** 列配置标识 */
     uid: string;
-    /** 字段名称 */
-    prop?: string;
-    /** 列数据标识 */
-    columnKey?: string;
     /** 标题 */
     label?: string;
     /** 是否选中 */
     checked?: boolean;
     /** 是否固定 */
     fixed?: boolean | string;
+    /** 子级数据 */
+    children?: ColItem[];
 }
 /**
  * 请求回调参数
  */
 export type FetchCallback = (options: DatasourceParams) => void;
-/**
- * 树表格懒加载方法
- */
-export type ResolveFunction = (data: DataItem[]) => void;
-/**
- * 缓存结果
- */
-export interface CacheResult {
-    /** 缓存的列配置 */
-    data: ColItem[];
-    /** 选中展示的列配置 */
-    checkedIds: string[];
-    /** 是否是全部选中 */
-    isChecked: boolean;
-    /** 是否是半选状态 */
-    isIndeterminate: boolean;
-}
 /**
  * 前端分页排序方法返回结果
  */
@@ -252,42 +190,10 @@ export interface ResponseResult {
     /** 总数量 */
     total?: number;
 }
-/**
- * 表格懒加载方法
- */
-export type TableLoad = ElTableProps<DataItem>['load'];
-/**
- * 多选时行点击选中
- */
-export type RowClickChecked = boolean | 'smart';
-/**
- * 获取插槽方法
- */
-export type GetSlotFunc = (name?: string) => Slot | undefined;
-/**
- * showOverflowTooltip 属性
- */
-export type ShowOverflowTooltip = Column['showOverflowTooltip'];
 /**
  * 复合属性类型
  */
 export type ProProps<T extends Record<keyof any, any>> = boolean | T;
-/**
- * 表格的 treeProps 属性
- */
-export interface TreeProps {
-    hasChildren?: string;
-    children?: string;
-}
-/**
- * 获取含表格状态的列配置的返回结果
- */
-export interface TableState {
-    /** 含筛选状态的列配置 */
-    cols: Columns;
-    /** 排序状态 */
-    sorter?: Sorter | null;
-}
 /**
  * 表格实例数据
  */
@@ -300,23 +206,9 @@ export interface TableCurrent {
     where: Where;
 }
 /**
- * 表格实例方法
+ * 表格组件实例
  */
-export interface TableIns {
-    clearSelection: () => void;
-    getSelectionRows: () => DataItem[] | undefined;
-    toggleRowSelection: (row: DataItem, selected?: boolean) => void;
-    toggleAllSelection: () => void;
-    toggleRowExpansion: (row: DataItem, expanded?: boolean) => void;
-    setCurrentRow: (row?: DataItem | null) => void;
-    clearSort: () => void;
-    clearFilter: (columnKeys?: string[]) => void;
-    doLayout: () => void;
-    sort: (prop: string, order: string) => void;
-    scrollTo: (options: number | ScrollToOptions, yCoord?: number | undefined) => void;
-    setScrollTop: (top?: number) => void;
-    setScrollLeft: (left?: number) => void;
-}
+export type TableViewInstance = EleDataTableInstance | EleVirtualTableInstance | null;
 /**
  * 国际化
  */

package/lib/ele-pro-table/util.d.ts

@@ -1,20 +1,12 @@
-import type { SetupContext } from 'vue';
-import type { ElTableInstance } from '../ele-app/types';
 import type { PaginationProps } from '../ele-pagination/props';
-import type { tableEmits } from './props';
-import type { DataItem, Column, Columns, Sorter, Orders, Filter, Filters, OrderItem, RequestOption, ResponseOption, TablePagination, DatasourceResult, ResponseResult, ReloadDataResult, TableSize, ColItem, CacheResult, ProProps, TreeProps, TableCurrent, TableIns, TableState } from './types';
+import type { DataItem, Column, Columns, Sorter, Filter, TableSize, TreeProps } from '../ele-data-table/types';
+import type { Orders, Filters, OrderItem, RequestOption, ResponseOption, TablePagination, DatasourceResult, ResponseResult, ReloadDataResult, ColItem, ProProps } from './types';
 /**
  * 合并复合属性
  * @param props 属性
  * @param globalProps 全局属性
  */
 export declare function mergeProps<T extends Record<keyof any, any>>(props?: ProProps<T> | null, globalProps?: ProProps<T> | null): ProProps<T>;
-/**
- * 获取数据某字段值
- * @param data 数据
- * @param field 字段, 可嵌套a.b.c
- */
-export declare function getValue<T>(data: unknown, field?: string | ((d: unknown) => T)): T | undefined;
 /**
  * 获取默认页码
  * @param pagination 分页组件属性
@@ -36,7 +28,7 @@ export declare function getTableLimit(pagination: boolean | TablePagination | un
  */
 export declare function getPaginationProps(size: TableSize, pagination: boolean | TablePagination | undefined, globalPagination: boolean | TablePagination | undefined, pageProps?: Pick<PaginationProps, 'total' | 'pageSize' | 'currentPage'>): Partial<PaginationProps> | null;
 /**
- * 获取是否开启自动修正页码
+ * 判断是否开启自动修正页码
  * @param pagination 分页组件属性
  * @param globalPagination 全局配置分页组件属性
  */
@@ -133,32 +125,21 @@ export declare function getInitCacheColumns(columns: Columns, cacheKey?: string,
  * 获取显示的列配置
  * @param columns 原始列数据
  * @param cols 列配置数据
- * @param checkedIds 选中数据的标识
  * @param sortable 是否进行排序
  */
-export declare function getCheckedColumns(columns: Columns | undefined, cols: ColItem[], checkedIds: string[], sortable?: boolean): Columns;
+export declare function getCheckedColumns(columns: Columns | undefined, cols: ColItem[], sortable?: boolean): Columns;
 /**
  * 获取列配置
  * @param columns 列数据
  * @param untitledText 未命名列文字
  * @param cacheKey 缓存的名称
  */
-export declare function getSettingCols(columns?: Columns, untitledText?: string, cacheKey?: string): CacheResult;
-/**
- * 获取列配置数据
- * @param cols 列配置
- */
-export declare function getColsResult(cols: ColItem[]): CacheResult;
-/**
- * 排序列配置数据
- * @param cols 列配置数据
- */
-export declare function sortCols(cols: ColItem[]): ColItem[];
+export declare function getSettingCols(columns?: Columns, untitledText?: string, cacheKey?: string): ColItem[];
 /**
  * 获取缓存的列配置下拉列表数据
  * @param cacheKey 缓存的名称
  */
-export declare function getCacheCols(cacheKey?: string): CacheResult | undefined;
+export declare function getCacheCols(cacheKey?: string): ColItem[] | undefined;
 /**
  * 获取列配置缓存的名称
  */
@@ -178,50 +159,3 @@ export declare function getCacheSize(cacheKey?: string): TableSize;
  * @param selections 当前选中的数据
  */
 export declare function selectionIsChange(rows: DataItem[], selections?: DataItem[]): boolean;
-/**
- * 判断行是否被禁用
- * @param row 行数据
- * @param index 行索引
- * @param columns 列配置
- */
-export declare function isDisableRow(row: DataItem, index: number, columns?: Columns): boolean;
-/**
- * 获取表格筛选值
- * @param tableRef 表格实例
- */
-export declare function getTableFilter(tableRef?: ElTableInstance): Filter | undefined;
-/**
- * 获取含表格状态的列配置
- * @param cols 表格的列
- * @param data 表格实例数据
- */
-export declare function getTableState(cols: Columns, data: TableCurrent): TableState;
-/**
- * 表格默认实例方法
- * @param getIns 获取表格实例
- */
-export declare function useTableMethods(getIns: () => ElTableInstance | undefined): TableIns;
-/**
- * 表格默认事件
- * @param emit 事件触发对象
- */
-export declare function useTableEvents(emit: SetupContext<typeof tableEmits>['emit']): {
-    onSelect: (selection: DataItem[], row: DataItem) => void;
-    onSelectAll: (selection: DataItem[]) => void;
-    onCellMouseEnter: (row: DataItem, column: Column, cell: HTMLTableCellElement, event: MouseEvent) => void;
-    onCellMouseLeave: (row: DataItem, column: Column, cell: HTMLTableCellElement, event: MouseEvent) => void;
-    onCellClick: (row: DataItem, column: Column, cell: HTMLTableCellElement, event: MouseEvent) => void;
-    onCellDblclick: (row: DataItem, column: Column, cell: HTMLTableCellElement, event: MouseEvent) => void;
-    onCellContextmenu: (row: DataItem, column: Column, cell: HTMLTableCellElement, event: MouseEvent) => void;
-    onRowClick: (row: DataItem, column: Column, event: MouseEvent) => void;
-    onRowContextmenu: (row: DataItem, column: Column, event: MouseEvent) => void;
-    onRowDblclick: (row: DataItem, column: Column, event: MouseEvent) => void;
-    onHeaderClick: (column: Column, event: MouseEvent) => void;
-    onHeaderContextmenu: (column: Column, event: MouseEvent) => void;
-    onHeaderDragend: (newWidth: number, oldWidth: number, column: Column, event: MouseEvent) => void;
-    onExpandChange: (row: DataItem, expanded: boolean) => void;
-    onSelectionChange: (selection: DataItem[]) => void;
-    onSortChange: (sorter: Sorter) => void;
-    onFilterChange: (filter: Filter) => void;
-    onCurrentChange: (currentRow: DataItem, oldCurrentRow: DataItem) => void;
-};