@hi-ui/table 4.0.0-beta.44 → 4.0.0-beta.47

package/lib/cjs/Table.js

@@ -165,7 +165,7 @@ var Table = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       trySetCurrentPage = _useTablePagination.trySetCurrentPage; // 优化数据在第一页且数据一页内时，不展示 pagination 配置项
 
 
-  var hiddenPagination = !paginationProp || pagination.autoHide && currentPage === 1 && typeof pagination.pageSize === 'number' && data.length <= pagination.pageSize; // 获取 key 字段值
+  var hiddenPagination = !paginationProp || pagination.autoHide && currentPage === 1 && typeof pagination.pageSize === 'number' && typeof pagination.total === 'number' && pagination.total <= pagination.pageSize && data.length <= pagination.pageSize; // 获取 key 字段值
 
   var getRowKeyField = React.useCallback(function (item) {
     var val = item[fieldKey];

package/lib/cjs/TableAdvancedFilter.js

@@ -126,17 +126,20 @@ var FilterDropdown = function FilterDropdown(_ref3) {
       filterIcon = _column$raw2.filterIcon,
       filterDropdown = _column$raw2.filterDropdown,
       filterDropdownWidth = _column$raw2.filterDropdownWidth,
+      filterDropdownVisible = _column$raw2.filterDropdownVisible,
       onFilterDropdownVisibleChange = _column$raw2.onFilterDropdownVisibleChange,
       filterDropdownClassName = _column$raw2.filterDropdownClassName;
 
   var _useUncontrolledToggl = useToggle.useUncontrolledToggle({
+    defaultVisible: false,
+    visible: filterDropdownVisible,
     onOpen: function onOpen() {
       _onOpen === null || _onOpen === void 0 ? void 0 : _onOpen();
-      onFilterDropdownVisibleChange === null || onFilterDropdownVisibleChange === void 0 ? void 0 : onFilterDropdownVisibleChange(true, column);
+      onFilterDropdownVisibleChange === null || onFilterDropdownVisibleChange === void 0 ? void 0 : onFilterDropdownVisibleChange(true, column.raw);
     },
     onClose: function onClose() {
       _onClose === null || _onClose === void 0 ? void 0 : _onClose();
-      onFilterDropdownVisibleChange === null || onFilterDropdownVisibleChange === void 0 ? void 0 : onFilterDropdownVisibleChange(false, column);
+      onFilterDropdownVisibleChange === null || onFilterDropdownVisibleChange === void 0 ? void 0 : onFilterDropdownVisibleChange(false, column.raw);
     }
   }),
       menuVisible = _useUncontrolledToggl[0],
@@ -163,7 +166,7 @@ var FilterDropdown = function FilterDropdown(_ref3) {
       width: filterDropdownWidth
     }
   }, typeAssertion.isFunction(filterDropdown) ? filterDropdown({
-    columnData: column,
+    columnData: column.raw,
     setFilterDropdownVisible: menuVisibleAction.set
   }) : null)));
 };

package/lib/esm/Table.js

@@ -127,7 +127,7 @@ var Table = /*#__PURE__*/forwardRef(function (_a, ref) {
       trySetCurrentPage = _useTablePagination.trySetCurrentPage; // 优化数据在第一页且数据一页内时，不展示 pagination 配置项
 
 
-  var hiddenPagination = !paginationProp || pagination.autoHide && currentPage === 1 && typeof pagination.pageSize === 'number' && data.length <= pagination.pageSize; // 获取 key 字段值
+  var hiddenPagination = !paginationProp || pagination.autoHide && currentPage === 1 && typeof pagination.pageSize === 'number' && typeof pagination.total === 'number' && pagination.total <= pagination.pageSize && data.length <= pagination.pageSize; // 获取 key 字段值
 
   var getRowKeyField = useCallback(function (item) {
     var val = item[fieldKey];

package/lib/esm/TableAdvancedFilter.js

@@ -98,17 +98,20 @@ var FilterDropdown = function FilterDropdown(_ref3) {
       filterIcon = _column$raw2.filterIcon,
       filterDropdown = _column$raw2.filterDropdown,
       filterDropdownWidth = _column$raw2.filterDropdownWidth,
+      filterDropdownVisible = _column$raw2.filterDropdownVisible,
       onFilterDropdownVisibleChange = _column$raw2.onFilterDropdownVisibleChange,
       filterDropdownClassName = _column$raw2.filterDropdownClassName;
 
   var _useUncontrolledToggl = useUncontrolledToggle({
+    defaultVisible: false,
+    visible: filterDropdownVisible,
     onOpen: function onOpen() {
       _onOpen === null || _onOpen === void 0 ? void 0 : _onOpen();
-      onFilterDropdownVisibleChange === null || onFilterDropdownVisibleChange === void 0 ? void 0 : onFilterDropdownVisibleChange(true, column);
+      onFilterDropdownVisibleChange === null || onFilterDropdownVisibleChange === void 0 ? void 0 : onFilterDropdownVisibleChange(true, column.raw);
     },
     onClose: function onClose() {
       _onClose === null || _onClose === void 0 ? void 0 : _onClose();
-      onFilterDropdownVisibleChange === null || onFilterDropdownVisibleChange === void 0 ? void 0 : onFilterDropdownVisibleChange(false, column);
+      onFilterDropdownVisibleChange === null || onFilterDropdownVisibleChange === void 0 ? void 0 : onFilterDropdownVisibleChange(false, column.raw);
     }
   }),
       menuVisible = _useUncontrolledToggl[0],
@@ -135,7 +138,7 @@ var FilterDropdown = function FilterDropdown(_ref3) {
       width: filterDropdownWidth
     }
   }, isFunction(filterDropdown) ? filterDropdown({
-    columnData: column,
+    columnData: column.raw,
     setFilterDropdownVisible: menuVisibleAction.set
   }) : null)));
 };

package/lib/types/BaseTable.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { HiBaseHTMLProps } from '@hi-ui/core';
-import { TableExtra, TableRowFunc, TableHeaderRowFunc } from './types';
+import { TableExtra, TableColumnItem, TableOnRowReturn } from './types';
 import { UseTableProps } from './use-table';
 import { UseEmbedExpandProps } from './hooks/use-embed-expand';
 export declare const EMBED_DATA_KEY: string;
@@ -19,13 +19,13 @@ export interface BaseTableProps extends Omit<HiBaseHTMLProps<'div'>, 'onDrop' |
      */
     striped?: boolean;
     /**
-     * 表格内容行事件处理函数
+     * 表格内容行事件处理函数，对于统计行（合计或均值），rowData 为 null
      */
-    onRow?: TableRowFunc;
+    onRow?: (rowData: Record<string, any> | null, index: number) => TableOnRowReturn;
     /**
      * 行标题事件处理函数
      */
-    onHeaderRow?: TableHeaderRowFunc;
+    onHeaderRow?: (columns: TableColumnItem[], index: number) => TableOnRowReturn;
     /**
      *  数据为空时的展示内容
      */

package/lib/types/context.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { TableRowFunc } from './types';
+import { TableOnRowReturn } from './types';
 export declare const TableProvider: import("react").Provider<(Omit<{
     getColgroupProps: (column: import("./types").FlattedTableColumnItemData, index: number) => {
         style: {
@@ -38,7 +38,7 @@ export declare const TableProvider: import("react").Provider<(Omit<{
     isTree: boolean;
     cellRender: ((text: any) => import("react").ReactNode) | undefined;
     showColMenu: boolean | undefined;
-    onLoadChildren: any;
+    onLoadChildren: ((item: import("./types").TableRowEventData) => void | Promise<void | any[]>) | undefined;
     scrollLeft: number;
     scrollRight: number;
     rootProps: {
@@ -47,7 +47,6 @@ export declare const TableProvider: import("react").Provider<(Omit<{
         setting?: boolean | undefined;
         loading?: boolean | undefined;
         uniqueId?: string | undefined;
-        extra?: import("react").ReactNode;
     };
     activeSorterColumn: string | null;
     setActiveSorterColumn: import("react").Dispatch<import("react").SetStateAction<string | null>>;
@@ -101,7 +100,7 @@ export declare const TableProvider: import("react").Provider<(Omit<{
     hasAvgColumn: boolean;
     sumRow: Record<string, any>;
     hasSumColumn: boolean;
-    onRow?: TableRowFunc | undefined;
+    onRow?: ((rowData: Record<string, any> | null, index: number) => TableOnRowReturn) | undefined;
     striped: boolean;
 }) | null>;
 export declare const useTableContext: () => Omit<{
@@ -142,7 +141,7 @@ export declare const useTableContext: () => Omit<{
     isTree: boolean;
     cellRender: ((text: any) => import("react").ReactNode) | undefined;
     showColMenu: boolean | undefined;
-    onLoadChildren: any;
+    onLoadChildren: ((item: import("./types").TableRowEventData) => void | Promise<void | any[]>) | undefined;
     scrollLeft: number;
     scrollRight: number;
     rootProps: {
@@ -151,7 +150,6 @@ export declare const useTableContext: () => Omit<{
         setting?: boolean | undefined;
         loading?: boolean | undefined;
         uniqueId?: string | undefined;
-        extra?: import("react").ReactNode;
     };
     activeSorterColumn: string | null;
     setActiveSorterColumn: import("react").Dispatch<import("react").SetStateAction<string | null>>;
@@ -205,6 +203,6 @@ export declare const useTableContext: () => Omit<{
     hasAvgColumn: boolean;
     sumRow: Record<string, any>;
     hasSumColumn: boolean;
-    onRow?: TableRowFunc | undefined;
+    onRow?: ((rowData: Record<string, any> | null, index: number) => TableOnRowReturn) | undefined;
     striped: boolean;
 };

package/lib/types/types.d.ts

@@ -1,9 +1,14 @@
 import React from 'react';
-import { SelectProps } from '@hi-ui/select';
 import { PaginationProps } from '@hi-ui/pagination';
-export declare type TableAlign = 'left' | 'right' | 'center';
+export declare type TableColumnItemAlignEnum = 'left' | 'right' | 'center';
 export declare type TableFrozenColumnOptions = {
+    /**
+     * 表格从左侧冻结至某列
+     */
     left?: React.ReactText;
+    /**
+     * 表格从右侧冻结至某列
+     */
     right?: React.ReactText;
 };
 export declare type TableExtra = {
@@ -11,68 +16,136 @@ export declare type TableExtra = {
     header?: React.ReactNode;
 };
 export declare type TableCheckAllOptions = {
-    title?: React.ReactNode;
+    /**
+     * 添加全选按钮右侧过滤 icon
+     */
     filterIcon?: React.ReactNode;
+    /**
+     * 自定义渲染全选内容
+     */
     render?: (checkboxNode: React.ReactNode) => React.ReactNode;
 };
 export declare type TableRowSelection = {
+    /**
+     * 设置选中列列宽
+     */
     checkboxColWidth?: number;
+    /**
+     * 选中的行（受控
+     */
     selectedRowKeys?: React.ReactText[];
+    /**
+     *  行选择的配置项
+     */
     getCheckboxConfig?: (rowData: object) => {
         disabled?: boolean;
     };
-    onChange?: (selectedRowKeys: React.ReactText[], targetRow?: object | object[], shouldChecked?: boolean) => void;
     /**
-     *。暂不对外暴露
-     * @private
+     * 选中项发生变化时的回调
      */
+    onChange?: (selectedRowKeys: React.ReactText[], targetRow?: object | object[], shouldChecked?: boolean) => void;
     /**
      * 全选配置集合
      */
     checkAllOptions?: TableCheckAllOptions;
 };
-export declare type TableRowReturn = {
+export declare type TableOnRowReturn = {
+    /**
+     * 行点击事件
+     */
     onClick?: (event: React.MouseEvent) => void;
+    /**
+     * 行双击事件
+     */
     onDoubleClick?: (event: React.MouseEvent) => void;
+    /**
+     * 行右键菜单事件
+     */
     onContextMenu?: (event: React.MouseEvent) => void;
+    /**
+     * 行鼠标入场事件
+     */
     onMouseEnter?: (event: React.MouseEvent) => void;
+    /**
+     * 行鼠标出场事件
+     */
     onMouseLeave?: (event: React.MouseEvent) => void;
 };
-export declare type TableHeaderRowFunc = (columns: TableColumnItem[], index: number) => TableRowReturn;
-/**
- * 对于合计行或者均值行统计，rowData 为 null
- */
-export declare type TableRowFunc = (rowData: Record<string, any> | null, index: number) => TableRowReturn;
+export interface TableColumnItemRenderReturn {
+    children: React.ReactNode;
+    props: {
+        colSpan?: number;
+        rowSpan?: number;
+    };
+}
 export declare type TableColumnItem = {
-    title: React.ReactNode;
+    /**
+     * 列标题
+     */
+    title: React.ReactNode | ((column: TableColumnEventData) => React.ReactNode);
+    /**
+     * 列对应数据项的唯一标识
+     */
     dataKey?: string;
-    align?: TableAlign;
+    /**
+     * 该列宽度
+     */
+    width?: number;
+    /**
+     * 列对齐方式
+     */
+    align?: TableColumnItemAlignEnum;
+    /**
+     * 列排序函数
+     */
     sorter?: (a: any, b: any) => number;
+    /**
+     * 该列是否支持平均值
+     */
     avg?: boolean;
+    /**
+     * 该列是否支持合计
+     */
     total?: boolean;
-    width?: number;
+    /**
+     * 多级表头
+     */
     children?: TableColumnItem[];
     /**
-     * @deprecated
+     * 控制单元格自定义渲染
+     */
+    render?: (text: any, rowItem: Record<string, any>, rowIndex: number, dataKey: string) => React.ReactNode | TableColumnItemRenderReturn;
+    /**
+     * 列类名 className
      */
-    selectFilters?: SelectProps;
-    defaultSortOrder?: 'ascend' | 'descend';
     className?: string;
-    render?: (text: any, rowItem: Record<string, any>, rowIndex: number, dataKey: string) => React.ReactNode | {
-        children: React.ReactNode;
-        props: {
-            colSpan?: number;
-            rowSpan?: number;
-        };
-    };
+    /**
+     * 自定义 filter 图标
+     */
     filterIcon?: React.ReactNode;
+    /**
+     * 自定义筛选菜单宽度
+     */
     filterDropdownWidth?: number;
+    /**
+     * 受控控制 dropdown 显隐
+     */
+    filterDropdownVisible?: boolean;
+    /**
+     * 自定义筛选菜单 className
+     */
     filterDropdownClassName?: string;
+    /**
+     * 自定义筛选下拉选项显示状态改变时的回调方法
+     */
+    onFilterDropdownVisibleChange?: (filterDropdownVisible: boolean, item: TableColumnItem) => void;
+    /**
+     * 自定义筛选菜单，此函数只负责渲染图层，需要自行编写各种交互
+     */
     filterDropdown?: (props: {
         columnData: TableColumnItem;
         setFilterDropdownVisible: Function;
     }) => React.ReactNode;
-    onFilterDropdownVisibleChange?: (filterDropdownVisible: boolean, item: TableColumnItem) => void;
 };
 export declare type TableDataSource = {
     url: string;
@@ -150,9 +223,9 @@ export interface FlattedTableColumnItemData extends TableColumnItem {
     leftStickyWidth?: number;
     rightStickyWidth?: number;
 }
-export interface TableNodeRequiredProps {
+export interface TableColumnEventData extends FlattedTableColumnItemData {
 }
-export interface TableRowEventData extends FlattedTableRowData, TableNodeRequiredProps {
+export interface TableRowEventData extends FlattedTableRowData {
 }
 export interface TableRowRequiredProps {
     expanded: boolean;

package/lib/types/use-table.d.ts

@@ -39,7 +39,7 @@ export declare const useTable: ({ data, columns: columnsProp, defaultFixedToColu
     isTree: boolean;
     cellRender: ((text: any) => React.ReactNode) | undefined;
     showColMenu: boolean | undefined;
-    onLoadChildren: any;
+    onLoadChildren: ((item: TableRowEventData) => Promise<any[] | void> | void) | undefined;
     scrollLeft: number;
     scrollRight: number;
     rootProps: {
@@ -63,7 +63,6 @@ export declare const useTable: ({ data, columns: columnsProp, defaultFixedToColu
          * 唯一 id 前缀，废弃
          */
         uniqueId?: string | undefined;
-        extra?: React.ReactNode;
     };
     activeSorterColumn: string | null;
     setActiveSorterColumn: React.Dispatch<React.SetStateAction<string | null>>;
@@ -216,9 +215,15 @@ export interface UseTableProps {
      * 唯一 id 前缀，废弃
      */
     uniqueId?: string;
+    /**
+     * 开始拖拽时触发
+     */
     onDragStart?: (evt: React.DragEvent, option: {
         dragNode: object;
     }) => void;
+    /**
+     * 拖拽行放开时触发
+     */
     onDrop?: (evt: React.DragEvent, option: {
         dragNode: object;
         dropNode: object;
@@ -226,6 +231,9 @@ export interface UseTableProps {
             after: object;
         };
     }) => boolean | Promise<any>;
+    /**
+     * 拖拽成功时触发
+     */
     onDropEnd?: (option: {
         dragNode: object;
         dropNode: object;
@@ -237,11 +245,13 @@ export interface UseTableProps {
      * 初始时展开所有行
      */
     defaultExpandAll?: boolean;
-    extra?: React.ReactNode;
     /**
      * 全局控制单元格自定义渲染，优先级低于 column 的 render 方法
      */
     cellRender?: (text: any) => React.ReactNode;
-    onLoadChildren?: any;
+    /**
+     * 点击异步加载子项
+     */
+    onLoadChildren?: (item: TableRowEventData) => Promise<any[] | void> | void;
 }
 export declare type UseTableReturn = ReturnType<typeof useTable>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/table",
-  "version": "4.0.0-beta.44",
+  "version": "4.0.0-beta.47",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HIUI <mi-hiui@xiaomi.com>",
@@ -43,24 +43,24 @@
     "url": "https://github.com/XiaoMi/hiui/issues"
   },
   "dependencies": {
-    "@hi-ui/button": "^4.0.0-beta.12",
-    "@hi-ui/checkbox": "^4.0.0-beta.11",
+    "@hi-ui/button": "^4.0.0-beta.13",
+    "@hi-ui/checkbox": "^4.0.0-beta.12",
     "@hi-ui/classname": "^4.0.0-beta.0",
     "@hi-ui/core-css": "^4.0.0-beta.5",
     "@hi-ui/dom-utils": "^4.0.0-beta.5",
-    "@hi-ui/drawer": "^4.0.0-beta.24",
-    "@hi-ui/empty-state": "^4.0.0-beta.19",
+    "@hi-ui/drawer": "^4.0.0-beta.25",
+    "@hi-ui/empty-state": "^4.0.0-beta.20",
     "@hi-ui/env": "^4.0.0-beta.0",
     "@hi-ui/func-utils": "^4.0.0-beta.12",
     "@hi-ui/icon-button": "^4.0.0-beta.9",
     "@hi-ui/icons": "^4.0.0-beta.10",
-    "@hi-ui/loading": "^4.0.0-beta.17",
+    "@hi-ui/loading": "^4.0.0-beta.18",
     "@hi-ui/locale-context": "^4.0.0-beta.18",
     "@hi-ui/object-utils": "^4.0.0-beta.11",
-    "@hi-ui/pagination": "^4.0.0-beta.27",
-    "@hi-ui/popper": "^4.0.0-beta.13",
+    "@hi-ui/pagination": "^4.0.0-beta.29",
+    "@hi-ui/popper": "^4.0.0-beta.14",
     "@hi-ui/react-utils": "^4.0.0-beta.5",
-    "@hi-ui/select": "^4.0.0-beta.25",
+    "@hi-ui/select": "^4.0.0-beta.27",
     "@hi-ui/spinner": "^4.0.0-beta.9",
     "@hi-ui/times": "^4.0.0-beta.5",
     "@hi-ui/tree-utils": "^4.0.0-beta.4",
@@ -86,5 +86,5 @@
     "react": "^17.0.1",
     "react-dom": "^17.0.1"
   },
-  "gitHead": "7f47840510e6dfce429eeed1591c154e321cd14f"
+  "gitHead": "a7652ac98d2a5b7f66dc49a249ba7cecb4fcb318"
 }