@hi-ui/table 4.5.4 → 4.5.5

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @hi-ui/table
 
+## 4.5.5
+
+### Patch Changes
+
+- [#2867](https://github.com/XiaoMi/hiui/pull/2867) [`eec624313`](https://github.com/XiaoMi/hiui/commit/eec624313de88943869f592dd06248455bddedbc) Thanks [@aqiusen](https://github.com/aqiusen)! - 修复统计行中选中模式下显示异常问题(#2863)
+
+- [#2859](https://github.com/XiaoMi/hiui/pull/2859) [`a8d3a1f26`](https://github.com/XiaoMi/hiui/commit/a8d3a1f2687709b986fc54408cb6c69b9eb56318) Thanks [@zyprepare](https://github.com/zyprepare)! - fix: 修复 onDragStart 事件不触发问题
+
+- [#2847](https://github.com/XiaoMi/hiui/pull/2847) [`0e67d2263`](https://github.com/XiaoMi/hiui/commit/0e67d2263c7e1bf9213e1a2f74300ee201f3a52e) Thanks [@aqiusen](https://github.com/aqiusen)! - fix(table): 修复虚拟列表 maxHeight 无法支持字符串问题
+
+- Updated dependencies [[`5508758ec`](https://github.com/XiaoMi/hiui/commit/5508758ec2fe241d635949828065111c9a465ef8)]:
+  - @hi-ui/pagination@4.0.16
+
 ## 4.5.4
 
 ### Patch Changes

package/lib/cjs/BaseTable.js

@@ -32,6 +32,7 @@ var useEmbedExpand = require('./hooks/use-embed-expand.js');
 var TheadContent = require('./TheadContent.js');
 var ColGroupContent = require('./ColGroupContent.js');
 var TbodyContent = require('./TbodyContent.js');
+var Table = require('./Table.js');
 function _interopDefaultCompat(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
@@ -138,7 +139,8 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       };
       var hasAvgColumn = false;
       columns.forEach(function (column, index$1) {
-        if (index$1 === 0) {
+        // 行选中模式下，index=0是checkbox列，index=1才是第一列 ; fix issue: https://github.com/XiaoMi/hiui/issues/2863
+        if (index$1 === 0 || index$1 === 1 && columns[0].dataKey === Table.SELECTION_DATA_KEY) {
           // @ts-ignore
           avgRow.raw[column.dataKey] = i18n.get('table.average');
         }
@@ -166,7 +168,7 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       };
       var hasSumColumn = false;
       columns.forEach(function (column, index$1) {
-        if (index$1 === 0) {
+        if (index$1 === 0 || index$1 === 1 && columns[0].dataKey === Table.SELECTION_DATA_KEY) {
           // @ts-ignore
           sumRow.raw[column.dataKey] = i18n.get('table.total');
         }

package/lib/cjs/TableBody.js

@@ -33,7 +33,7 @@ var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var Scrollbar__default = /*#__PURE__*/_interopDefaultCompat(Scrollbar);
 var _role = 'table';
 var _prefix = classname.getPrefixCls(_role);
-var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
+var TableBody = /*#__PURE__*/React.forwardRef(function (_ref) {
   var _ref$prefixCls = _ref.prefixCls,
     prefixCls = _ref$prefixCls === void 0 ? _prefix : _ref$prefixCls,
     emptyContent = _ref.emptyContent;
@@ -54,6 +54,7 @@ var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     measureRowElementRef = _useTableContext.measureRowElementRef,
     scrollbar = _useTableContext.scrollbar,
     scrollLeft = _useTableContext.scrollLeft;
+  var virtualListRef = React.useRef(null);
   var cls = classname.cx(prefixCls + "-body");
   var getRequiredProps = useLatest.useLatestCallback(function (id) {
     return {
@@ -76,8 +77,9 @@ var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   }, [colWidths]);
   if (virtual) {
     // TODO： avg和summay row的逻辑
-    var realHeight = (_a = scrollBodyElementRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect().height;
-    var vMaxHeight = maxHeight ? !isNaN(Number(String(maxHeight).replace(/px/, ''))) ? Number(maxHeight) : realHeight : 300;
+    var realHeight = (_a = virtualListRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect().height;
+    var maxHeightNumStr = String(maxHeight).replace(/px$/, '');
+    var vMaxHeight = maxHeight ? !isNaN(Number(maxHeightNumStr)) ? Number(maxHeightNumStr) : realHeight : 300;
     return /*#__PURE__*/React__default["default"].createElement("div", {
       ref: scrollBodyElementRef,
       className: cls,
@@ -104,10 +106,12 @@ var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
         width: rowWidth
       }
     }), typeAssertion.isArrayNonEmpty(transitionData) ? ( /*#__PURE__*/React__default["default"].createElement("div", {
+      ref: virtualListRef,
       style: {
         width: '100%',
         position: 'sticky',
-        left: 0
+        left: 0,
+        maxHeight: maxHeight
       }
     }, /*#__PURE__*/React__default["default"].createElement(List["default"], {
       prefixCls: cls + "--virtual",

package/lib/cjs/use-table.js

@@ -78,6 +78,7 @@ var useTable = function useTable(_a) {
     stickyTop = _a$stickyTop === void 0 ? 0 : _a$stickyTop,
     _a$draggable = _a.draggable,
     draggable = _a$draggable === void 0 ? false : _a$draggable,
+    onDragStart = _a.onDragStart,
     onDropProp = _a.onDrop,
     onDropEnd = _a.onDropEnd,
     showColMenu = _a.showColMenu,
@@ -574,6 +575,7 @@ var useTable = function useTable(_a) {
     draggable: draggable,
     highlightColumns: [],
     dragRowRef: dragRowRef,
+    onDragStart: onDragStart,
     onDrop: onDrop,
     groupedColumns: groupedColumns,
     // 子树展开

package/lib/esm/BaseTable.js

@@ -26,6 +26,7 @@ import { useEmbedExpand } from './hooks/use-embed-expand.js';
 import { TheadContent } from './TheadContent.js';
 import { ColGroupContent } from './ColGroupContent.js';
 import { TbodyContent } from './TbodyContent.js';
+import { SELECTION_DATA_KEY } from './Table.js';
 var _role = 'table';
 var _prefix = getPrefixCls('table');
 var EMBED_DATA_KEY = "TABLE_EMBED_DATA_KEY_" + uuid();
@@ -125,7 +126,8 @@ var BaseTable = /*#__PURE__*/forwardRef(function (_a, ref) {
       };
       var hasAvgColumn = false;
       columns.forEach(function (column, index) {
-        if (index === 0) {
+        // 行选中模式下，index=0是checkbox列，index=1才是第一列 ; fix issue: https://github.com/XiaoMi/hiui/issues/2863
+        if (index === 0 || index === 1 && columns[0].dataKey === SELECTION_DATA_KEY) {
           // @ts-ignore
           avgRow.raw[column.dataKey] = i18n.get('table.average');
         }
@@ -153,7 +155,7 @@ var BaseTable = /*#__PURE__*/forwardRef(function (_a, ref) {
       };
       var hasSumColumn = false;
       columns.forEach(function (column, index) {
-        if (index === 0) {
+        if (index === 0 || index === 1 && columns[0].dataKey === SELECTION_DATA_KEY) {
           // @ts-ignore
           sumRow.raw[column.dataKey] = i18n.get('table.total');
         }

package/lib/esm/TableBody.js

@@ -7,7 +7,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React__default, { forwardRef, useMemo } from 'react';
+import React__default, { forwardRef, useRef, useMemo } from 'react';
 import List from './node_modules/rc-virtual-list/es/List.js';
 import { getPrefixCls, cx } from '@hi-ui/classname';
 import { __DEV__ } from '@hi-ui/env';
@@ -20,7 +20,7 @@ import { ColGroupContent } from './ColGroupContent.js';
 import { renderEmptyContent, TbodyContent } from './TbodyContent.js';
 var _role = 'table';
 var _prefix = getPrefixCls(_role);
-var TableBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
+var TableBody = /*#__PURE__*/forwardRef(function (_ref) {
   var _ref$prefixCls = _ref.prefixCls,
     prefixCls = _ref$prefixCls === void 0 ? _prefix : _ref$prefixCls,
     emptyContent = _ref.emptyContent;
@@ -41,6 +41,7 @@ var TableBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
     measureRowElementRef = _useTableContext.measureRowElementRef,
     scrollbar = _useTableContext.scrollbar,
     scrollLeft = _useTableContext.scrollLeft;
+  var virtualListRef = useRef(null);
   var cls = cx(prefixCls + "-body");
   var getRequiredProps = useLatestCallback(function (id) {
     return {
@@ -63,8 +64,9 @@ var TableBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, [colWidths]);
   if (virtual) {
     // TODO： avg和summay row的逻辑
-    var realHeight = (_a = scrollBodyElementRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect().height;
-    var vMaxHeight = maxHeight ? !isNaN(Number(String(maxHeight).replace(/px/, ''))) ? Number(maxHeight) : realHeight : 300;
+    var realHeight = (_a = virtualListRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect().height;
+    var maxHeightNumStr = String(maxHeight).replace(/px$/, '');
+    var vMaxHeight = maxHeight ? !isNaN(Number(maxHeightNumStr)) ? Number(maxHeightNumStr) : realHeight : 300;
     return /*#__PURE__*/React__default.createElement("div", {
       ref: scrollBodyElementRef,
       className: cls,
@@ -91,10 +93,12 @@ var TableBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
         width: rowWidth
       }
     }), isArrayNonEmpty(transitionData) ? ( /*#__PURE__*/React__default.createElement("div", {
+      ref: virtualListRef,
       style: {
         width: '100%',
         position: 'sticky',
-        left: 0
+        left: 0,
+        maxHeight: maxHeight
       }
     }, /*#__PURE__*/React__default.createElement(List, {
       prefixCls: cls + "--virtual",

package/lib/esm/use-table.js

@@ -66,6 +66,7 @@ var useTable = function useTable(_a) {
     stickyTop = _a$stickyTop === void 0 ? 0 : _a$stickyTop,
     _a$draggable = _a.draggable,
     draggable = _a$draggable === void 0 ? false : _a$draggable,
+    onDragStart = _a.onDragStart,
     onDropProp = _a.onDrop,
     onDropEnd = _a.onDropEnd,
     showColMenu = _a.showColMenu,
@@ -562,6 +563,7 @@ var useTable = function useTable(_a) {
     draggable: draggable,
     highlightColumns: [],
     dragRowRef: dragRowRef,
+    onDragStart: onDragStart,
     onDrop: onDrop,
     groupedColumns: groupedColumns,
     // 子树展开

package/lib/types/context.d.ts

@@ -26,6 +26,9 @@ export declare const TableProvider: import("react").Provider<(Omit<{
     draggable: boolean;
     highlightColumns: any;
     dragRowRef: import("react").MutableRefObject<any>;
+    onDragStart: ((evt: import("react").DragEvent<Element>, option: {
+        dragNode: object;
+    }) => void) | undefined;
     onDrop: (evt: any, sourceId: any, targetId: any, dragDirection: any) => void;
     groupedColumns: import("./types").FlattedTableColumnItemData[][];
     onExpandTreeRowsChange: (expandedNode: import("./types").TableRowEventData, shouldExpanded: boolean) => void;
@@ -138,6 +141,9 @@ export declare const useTableContext: () => Omit<{
     draggable: boolean;
     highlightColumns: any;
     dragRowRef: import("react").MutableRefObject<any>;
+    onDragStart: ((evt: import("react").DragEvent<Element>, option: {
+        dragNode: object;
+    }) => void) | undefined;
     onDrop: (evt: any, sourceId: any, targetId: any, dragDirection: any) => void;
     groupedColumns: import("./types").FlattedTableColumnItemData[][];
     onExpandTreeRowsChange: (expandedNode: import("./types").TableRowEventData, shouldExpanded: boolean) => void;

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

@@ -28,6 +28,9 @@ export declare const useTable: ({ data, columns: columnsProp, defaultFixedToColu
     draggable: boolean;
     highlightColumns: any;
     dragRowRef: React.MutableRefObject<any>;
+    onDragStart: ((evt: React.DragEvent, option: {
+        dragNode: object;
+    }) => void) | undefined;
     onDrop: (evt: any, sourceId: any, targetId: any, dragDirection: any) => void;
     groupedColumns: FlattedTableColumnItemData[][];
     onExpandTreeRowsChange: (expandedNode: TableRowEventData, shouldExpanded: boolean) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/table",
-  "version": "4.5.4",
+  "version": "4.5.5",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HiUI <mi-hiui@xiaomi.com>",
@@ -56,7 +56,7 @@
     "@hi-ui/icons": "^4.0.19",
     "@hi-ui/loading": "^4.2.1",
     "@hi-ui/object-utils": "^4.0.4",
-    "@hi-ui/pagination": "^4.0.15",
+    "@hi-ui/pagination": "^4.0.16",
     "@hi-ui/popper": "^4.1.5",
     "@hi-ui/react-utils": "^4.0.4",
     "@hi-ui/scrollbar": "^4.1.1",