@hi-ui/table 4.3.0 → 4.3.2-alpha.0

package/lib/esm/utils/index.js

@@ -8,14 +8,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { isNumeric } from '@hi-ui/type-assertion';
-
 var setColumnsDefaultWidth = function setColumnsDefaultWidth(columns, defaultWidth) {
   var _columns = columns.concat();
-
   var setWidth = function setWidth(_columns) {
     _columns.forEach(function (item) {
       var children = item.children;
-
       if (children) {
         setWidth(children);
       } else if (item.dataKey) {
@@ -23,7 +20,6 @@ var setColumnsDefaultWidth = function setColumnsDefaultWidth(columns, defaultWid
       }
     });
   };
-
   setWidth(_columns);
   return _columns;
 };
@@ -31,36 +27,28 @@ var setColumnsDefaultWidth = function setColumnsDefaultWidth(columns, defaultWid
  * 获取每个 Column 的真实列宽度（排除合并列头）
  * 如果是多级表头，将会递归 children 得到叶子结点层每项的宽度
  */
-
-
 var getGroupItemWidth = function getGroupItemWidth(columns) {
   var baseColWidths = [];
-
   var dig = function dig(column) {
     column.forEach(function (_ref) {
       var children = _ref.children,
-          width = _ref.width;
-
+        width = _ref.width;
       if (Array.isArray(children)) {
         dig(children);
         return;
-      } // 如果没有设置列宽度，css 宽度默认是 `auto`，这里对于非数字 width 均设置为 0
-
-
+      }
+      // 如果没有设置列宽度，css 宽度默认是 `auto`，这里对于非数字 width 均设置为 0
       var colWidth = isNumeric(width) ? Number(width) : 0;
       baseColWidths.push(colWidth);
     });
   };
-
   dig(columns);
   return baseColWidths;
 };
-
 var parseFixedColumns = function parseFixedColumns(item, index, columns, arr, key, parentStickyWidth) {
   if (parentStickyWidth === void 0) {
     parentStickyWidth = 0;
   }
-
   var width = (arr[index - 1] || {
     width: 0
   }).width || 0;
@@ -69,11 +57,10 @@ var parseFixedColumns = function parseFixedColumns(item, index, columns, arr, ke
   })[key] || 0;
   item = Object.assign({}, item);
   item[key] = width + stickyWidth + parentStickyWidth;
-
   if (item.children) {
     var _parentStickyWidth = item[key];
     var _item = item,
-        children = _item.children;
+      children = _item.children;
     item.children = [];
     children.forEach(function (childrenItem, idx) {
       var child = parseFixedColumns(childrenItem, idx, columns, children, key, index === 0 ? 0 : _parentStickyWidth);
@@ -81,9 +68,9 @@ var parseFixedColumns = function parseFixedColumns(item, index, columns, arr, ke
       columns[child.index] = child;
     });
   }
-
   return item;
-}; // export const parseFixedColumnsByRoot = ({
+};
+// export const parseFixedColumnsByRoot = ({
 //   column,
 //   prevColumn,
 //   key,
@@ -110,71 +97,54 @@ var parseFixedColumns = function parseFixedColumns(item, index, columns, arr, ke
 //     })
 //   }
 // }
-
 /**
  * 生成 uuid
  */
-
-
 var uuid = function uuid() {
   return Math.random().toString(36).substring(5).split('').join('.');
 };
-
 var parseLocalArray = function parseLocalArray(_ref3) {
   var key = _ref3.key,
-      defaultValue = _ref3.defaultValue;
-
+    defaultValue = _ref3.defaultValue;
   if (key) {
     try {
       var localArr = window.localStorage.getItem(key);
-
       if (localArr) {
         localArr = JSON.parse(localArr);
-
         if (Array.isArray(localArr)) {
           return localArr;
         }
       }
     } catch (error) {}
   }
-
   return defaultValue;
-}; // 检查是否需要展示Total或average
-
-
+};
+// 检查是否需要展示Total或average
 var checkNeedTotalOrEvg = function checkNeedTotalOrEvg(_data, item, calcKey) {
   if (item[calcKey]) {
     // 当每一项都为数字类型字符串时，才进行求和计算
     var isDataKeyValueAllNumber = _data.every(function (dataItem) {
       return isNumeric(dataItem[item.dataKey]);
     });
-
     return isDataKeyValueAllNumber;
   }
-
   return false;
-}; // 获取总和或取平均值
-
-
+};
+// 获取总和或取平均值
 var getTotalOrEvgRowData = function getTotalOrEvgRowData(_data, c, isAvg) {
   var dataPointCountList = _data.map(function (dataItem) {
     var strNum = dataItem[c.dataKey] + '';
     var afterPonterStr = strNum.split('.')[1];
     return afterPonterStr ? afterPonterStr.length : 0;
   });
-
   var maxPointCount = dataPointCountList && dataPointCountList.length ? Math.max.apply(Math, dataPointCountList) : 0;
-
   var columnSumData = _data.reduce(function (acc, cur) {
     return acc += Number(cur[c.dataKey]);
   }, 0);
-
   if (isAvg) {
     var avgData = columnSumData / _data.length;
     return maxPointCount > 0 ? avgData.toFixed(maxPointCount) : avgData;
   }
-
   return maxPointCount > 0 ? columnSumData.toFixed(maxPointCount) : columnSumData;
 };
-
 export { checkNeedTotalOrEvg, getGroupItemWidth, getTotalOrEvgRowData, parseFixedColumns, parseLocalArray, setColumnsDefaultWidth, uuid };

package/lib/types/context.d.ts

@@ -41,6 +41,7 @@ export declare const TableProvider: import("react").Provider<(Omit<{
     showColMenu: boolean | undefined;
     onLoadChildren: ((item: import("./types").TableRowEventData) => void | Promise<void | any[]>) | undefined;
     setHeaderTableElement: import("react").Dispatch<import("react").SetStateAction<HTMLTableRowElement | null>>;
+    scrollbar: boolean | import("packages/ui/scrollbar/lib/types").ScrollbarProps | undefined;
     scrollLeft: number;
     scrollRight: number;
     measureRowElementRef: import("react").MutableRefObject<HTMLTableRowElement | null>;
@@ -148,6 +149,7 @@ export declare const useTableContext: () => Omit<{
     showColMenu: boolean | undefined;
     onLoadChildren: ((item: import("./types").TableRowEventData) => void | Promise<void | any[]>) | undefined;
     setHeaderTableElement: import("react").Dispatch<import("react").SetStateAction<HTMLTableRowElement | null>>;
+    scrollbar: boolean | import("packages/ui/scrollbar/lib/types").ScrollbarProps | undefined;
     scrollLeft: number;
     scrollRight: number;
     measureRowElementRef: import("react").MutableRefObject<HTMLTableRowElement | null>;

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

@@ -1,7 +1,8 @@
 import React from 'react';
-import { TableColumnItem, TableFrozenColumnOptions, TableRowEventData, TableRowSelection, FlattedTableColumnItemData, FlattedTableRowData } from './types';
 import { PaginationProps } from '@hi-ui/pagination';
-export declare const useTable: ({ data, columns: columnsProp, defaultFixedToColumn, fixedToColumn: fixedToColumnProp, onFixedToColumn, scrollWidth, resizable, errorRowKeys, highlightedColKeys: highlightedColKeysProp, highlightedRowKeys: highlightedRowKeysProp, showColHighlight, showRowHighlight, highlightRowOnDoubleClick, defaultExpandedRowKeys, expandedRowKeys: expandRowKeysProp, onExpand, defaultExpandAll, onLoadChildren, maxHeight, sticky, stickyTop, draggable, onDragStart, onDrop: onDropProp, onDropEnd, showColMenu, rowSelection, cellRender, footerRender, fieldKey, virtual, ...rootProps }: UseTableProps) => {
+import { ScrollbarProps } from '@hi-ui/scrollbar';
+import { TableColumnItem, TableFrozenColumnOptions, TableRowEventData, TableRowSelection, FlattedTableColumnItemData, FlattedTableRowData } from './types';
+export declare const useTable: ({ data, columns: columnsProp, defaultFixedToColumn, fixedToColumn: fixedToColumnProp, onFixedToColumn, scrollWidth, resizable, errorRowKeys, highlightedColKeys: highlightedColKeysProp, highlightedRowKeys: highlightedRowKeysProp, showColHighlight, showRowHighlight, highlightRowOnDoubleClick, defaultExpandedRowKeys, expandedRowKeys: expandRowKeysProp, onExpand, defaultExpandAll, onLoadChildren, maxHeight, sticky, stickyTop, draggable, onDragStart, onDrop: onDropProp, onDropEnd, showColMenu, rowSelection, cellRender, footerRender, fieldKey, virtual, scrollbar, ...rootProps }: UseTableProps) => {
     getColgroupProps: (column: FlattedTableColumnItemData, index: number) => {
         style: {
             width: number | undefined;
@@ -42,6 +43,7 @@ export declare const useTable: ({ data, columns: columnsProp, defaultFixedToColu
     showColMenu: boolean | undefined;
     onLoadChildren: ((item: TableRowEventData) => Promise<any[] | void> | void) | undefined;
     setHeaderTableElement: React.Dispatch<React.SetStateAction<HTMLTableRowElement | null>>;
+    scrollbar: boolean | ScrollbarProps | undefined;
     scrollLeft: number;
     scrollRight: number;
     measureRowElementRef: React.MutableRefObject<HTMLTableRowElement | null>;
@@ -273,5 +275,9 @@ export interface UseTableProps {
      * 自定义渲染页脚
      */
     footerRender?: (...nodes: React.ReactElement[]) => React.ReactNode;
+    /**
+     * 配置滚动条，滚动条样式使用HiUI自带的滚动条风格
+     */
+    scrollbar?: boolean | ScrollbarProps;
 }
 export declare type UseTableReturn = ReturnType<typeof useTable>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/table",
-  "version": "4.3.0",
+  "version": "4.3.2-alpha.0",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HiUI <mi-hiui@xiaomi.com>",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@hi-ui/array-utils": "^4.0.1",
-    "@hi-ui/button": "^4.0.5",
+    "@hi-ui/button": "^4.0.6",
     "@hi-ui/checkbox": "^4.0.5",
     "@hi-ui/classname": "^4.0.1",
     "@hi-ui/dom-utils": "^4.0.4",
@@ -52,11 +52,11 @@
     "@hi-ui/empty-state": "^4.0.4",
     "@hi-ui/env": "^4.0.1",
     "@hi-ui/func-utils": "^4.0.1",
-    "@hi-ui/icon-button": "^4.0.4",
+    "@hi-ui/icon-button": "^4.0.5",
     "@hi-ui/icons": "^4.0.14",
     "@hi-ui/loading": "^4.1.0",
     "@hi-ui/object-utils": "^4.0.1",
-    "@hi-ui/pagination": "^4.0.8",
+    "@hi-ui/pagination": "^4.0.11",
     "@hi-ui/popper": "^4.1.0",
     "@hi-ui/react-utils": "^4.0.1",
     "@hi-ui/select": "^4.2.2",
@@ -82,7 +82,7 @@
   },
   "devDependencies": {
     "@hi-ui/core": "^4.0.4",
-    "@hi-ui/core-css": "^4.1.1",
+    "@hi-ui/core-css": "^4.1.2",
     "@types/react-resizable": "^1.7.4",
     "react": "^17.0.1",
     "react-dom": "^17.0.1"