@arim-aisdc/public-components 2.3.53 → 2.3.55

package/dist/components/TableMax/TableBody/OriginalRow.d.ts

@@ -32,7 +32,6 @@ type IRowProps = {
     onRowMouseLeave?: (row: any) => void;
     onRowMouseClick?: (row: any) => void;
     onRowMouseDoubleClick?: (row: any) => void;
-    rowHeight: number;
     disableDragRowIds?: any[];
     selectRowWhenClick: boolean;
     handleEditRowWhenDClick: (row: any) => void;
@@ -58,5 +57,5 @@ type IRowProps = {
     setRowSelection?: Function;
     openMemo?: boolean;
 };
-declare const OriginalRow: ({ tableBodyRef, table, tableId, row, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, reorderRow, canRowDrag, rowClassName, cellClassName, rowStyle, getCellProps, editting, rowEditing, renderSubComponent, selectedRowDragging, setSelectedRowDragging, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, rowHeight, disableDragRowIds, selectRowWhenClick, handleEditRowWhenDClick, canEditRowWhenDClick, theme, dragBeforeStart, onCellContextMenu, getRowHoverTipConfig, tableTooltip, changeHoverRow, clearHoverRowIndex, hoverRowIndex, dropSide, onEditValueChange, setRowSelection, openMemo }: IRowProps) => import("react/jsx-runtime").JSX.Element;
+declare const OriginalRow: ({ tableBodyRef, table, tableId, row, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, reorderRow, canRowDrag, rowClassName, cellClassName, rowStyle, getCellProps, editting, rowEditing, renderSubComponent, selectedRowDragging, setSelectedRowDragging, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, disableDragRowIds, selectRowWhenClick, handleEditRowWhenDClick, canEditRowWhenDClick, theme, dragBeforeStart, onCellContextMenu, getRowHoverTipConfig, tableTooltip, changeHoverRow, clearHoverRowIndex, hoverRowIndex, dropSide, onEditValueChange, setRowSelection, openMemo }: IRowProps) => import("react/jsx-runtime").JSX.Element;
 export { OriginalRow };

package/dist/components/TableMax/TableBody/OriginalRow.js

@@ -59,7 +59,6 @@ var OriginalRow = function OriginalRow(_ref) {
     onRowMouseLeave = _ref.onRowMouseLeave,
     onRowMouseClick = _ref.onRowMouseClick,
     onRowMouseDoubleClick = _ref.onRowMouseDoubleClick,
-    rowHeight = _ref.rowHeight,
     disableDragRowIds = _ref.disableDragRowIds,
     selectRowWhenClick = _ref.selectRowWhenClick,
     handleEditRowWhenDClick = _ref.handleEditRowWhenDClick,
@@ -371,9 +370,7 @@ var OriginalRow = function OriginalRow(_ref) {
       })) || []), ['tbody-tr-td']).filter(Boolean).join(' ');
       return /*#__PURE__*/_jsx("td", _objectSpread(_objectSpread({
         className: cellClassNames,
-        style: _objectSpread({
-          height: rowHeight - 1
-        }, getPinningStyle(cell, table, false)),
+        style: _objectSpread({}, getPinningStyle(cell, table, false)),
         onContextMenu: function onContextMenu(e) {
           return handleCellRightClick(e, cell);
         }
@@ -412,7 +409,7 @@ var OriginalRow = function OriginalRow(_ref) {
     }
   }, [
   // 依赖项保持不变
-  row, row.id, rowEditing, tableId, editting, canRowDrag, disableDragRowIds, isDragging, selectedRowDragging, rowStyle, handleRowClick, rowMouseEnter, rowMouseLeave, rowClassNames, cellClassName, theme, rowHeight, table, handleCellRightClick, getCellProps, tableTooltip, onEditValueChange, dateFormat, row.getVisibleCells(), row.getIsSelected()]);
+  row, row.id, rowEditing, tableId, editting, canRowDrag, disableDragRowIds, isDragging, selectedRowDragging, rowStyle, handleRowClick, rowMouseEnter, rowMouseLeave, rowClassNames, cellClassName, theme, table, handleCellRightClick, getCellProps, tableTooltip, onEditValueChange, dateFormat, row.getVisibleCells(), row.getIsSelected()]);
   var rowCom = function rowCom() {
     var renderCell = function renderCell(cell) {
       var _cellClassName2;
@@ -445,9 +442,7 @@ var OriginalRow = function OriginalRow(_ref) {
       })) || []), ['tbody-tr-td']).filter(Boolean).join(' ');
       return /*#__PURE__*/_jsx("td", _objectSpread(_objectSpread({
         className: cellClassNames,
-        style: _objectSpread({
-          height: rowHeight - 1
-        }, getPinningStyle(cell, table, false)),
+        style: _objectSpread({}, getPinningStyle(cell, table, false)),
         onContextMenu: function onContextMenu(e) {
           return handleCellRightClick(e, cell);
         }

package/dist/components/TableMax/TableBody/OriginalTableBody.d.ts

@@ -72,5 +72,5 @@ export type TableBodyPropsType = {
     setRowSelection: Function;
     openMemo?: boolean;
 };
-declare const OriginalTableBody: ({ tableBodyRef, table, tableId, theme, reorderRow, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, tableContainerWidth, selectedRowDragging, setSelectedRowDragging, canRowDrag, rowKey, loading, rowClassName, cellClassName, rowStyle, getCellProps, rowHeight, renderSubComponent, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, disableDragRowIds, selectRowWhenClick, datas, canEditRowWhenDClick, editingRowId, handleEditRowWhenDClick, dragBeforeStart, getContextMenu, onClickContextMenu, getRowHoverTipConfig, tableTooltip, compactMode, onEditValueChange, hasTotalRow, totalDatas, setRowSelection, openMemo }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
+declare const OriginalTableBody: ({ tableBodyRef, table, tableId, theme, reorderRow, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, tableContainerWidth, selectedRowDragging, setSelectedRowDragging, canRowDrag, rowKey, loading, rowClassName, cellClassName, rowStyle, getCellProps, renderSubComponent, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, disableDragRowIds, selectRowWhenClick, datas, canEditRowWhenDClick, editingRowId, handleEditRowWhenDClick, dragBeforeStart, getContextMenu, onClickContextMenu, getRowHoverTipConfig, tableTooltip, compactMode, onEditValueChange, hasTotalRow, totalDatas, setRowSelection, openMemo }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
 export { OriginalTableBody };

package/dist/components/TableMax/TableBody/OriginalTableBody.js

@@ -54,7 +54,6 @@ var OriginalTableBody = function OriginalTableBody(_ref) {
     cellClassName = _ref.cellClassName,
     rowStyle = _ref.rowStyle,
     getCellProps = _ref.getCellProps,
-    rowHeight = _ref.rowHeight,
     renderSubComponent = _ref.renderSubComponent,
     onRowMouseEnter = _ref.onRowMouseEnter,
     onRowMouseLeave = _ref.onRowMouseLeave,
@@ -360,7 +359,6 @@ var OriginalTableBody = function OriginalTableBody(_ref) {
         onRowMouseLeave: onRowMouseLeave,
         onRowMouseClick: onRowMouseClick,
         onRowMouseDoubleClick: onRowMouseDoubleClick,
-        rowHeight: rowHeight,
         disableDragRowIds: disableDragRowIds,
         selectRowWhenClick: selectRowWhenClick,
         handleEditRowWhenDClick: handleEditRowWhenDClick,
@@ -384,9 +382,6 @@ var OriginalTableBody = function OriginalTableBody(_ref) {
     var _table$getRowModel$ro;
     return !loading && datas.length !== 0 && ((_table$getRowModel$ro = table.getRowModel().rows) === null || _table$getRowModel$ro === void 0 ? void 0 : _table$getRowModel$ro.length) !== 0;
   }, [loading, datas.length, (_table$getRowModel$ro2 = table.getRowModel().rows) === null || _table$getRowModel$ro2 === void 0 ? void 0 : _table$getRowModel$ro2.length]);
-
-  // console.log('rowHeight :>>', rowHeight);
-
   var TableRow = useMemo(function () {
     return table.getRowModel().rows;
   }, [table, table.getState().rowSelection]);
@@ -454,7 +449,6 @@ var OriginalTableBody = function OriginalTableBody(_ref) {
                 onRowMouseLeave: onRowMouseLeave,
                 onRowMouseClick: onRowMouseClick,
                 onRowMouseDoubleClick: onRowMouseDoubleClick,
-                rowHeight: rowHeight,
                 disableDragRowIds: disableDragRowIds,
                 selectRowWhenClick: selectRowWhenClick,
                 handleEditRowWhenDClick: handleEditRowWhenDClick,
@@ -475,8 +469,7 @@ var OriginalTableBody = function OriginalTableBody(_ref) {
             , /*#__PURE__*/_jsx(_Fragment, {
               children: hasTotalRow && /*#__PURE__*/_jsx(Total, {
                 table: table,
-                totalDatas: totalDatas,
-                rowHeight: rowHeight
+                totalDatas: totalDatas
               })
             })]
           })]

package/dist/components/TableMax/TableBody/TableBody.js

@@ -5,11 +5,11 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React from 'react';
-import { useTableComponents } from "../hooks/useTableComponents";
+import { VirtualTableBody } from "./VirtualTableBody";
 import { jsx as _jsx } from "react/jsx-runtime";
 export var TableBody = function TableBody(props) {
-  var _useTableComponents = useTableComponents(),
-    BodyComponent = _useTableComponents.TableBody;
-  return /*#__PURE__*/_jsx(BodyComponent, _objectSpread({}, props));
+  // const { TableBody: BodyComponent } = useTableComponents();
+  // return <BodyComponent {...props} />;
+  return /*#__PURE__*/_jsx(VirtualTableBody, _objectSpread({}, props));
 };
 export default TableBody;

package/dist/components/TableMax/TableBody/VirtualRow.d.ts

@@ -32,7 +32,6 @@ type IRowProps = {
     onRowMouseLeave?: (row: any) => void;
     onRowMouseClick?: (row: any) => void;
     onRowMouseDoubleClick?: (row: any) => void;
-    rowHeight: number;
     disableDragRowIds?: any[];
     selectRowWhenClick: boolean;
     handleEditRowWhenDClick: (row: any) => void;
@@ -59,5 +58,5 @@ type IRowProps = {
     openMemo?: boolean;
     virtualRowStart?: number;
 };
-declare const VirtualRow: ({ tableBodyRef, table, tableId, row, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, reorderRow, canRowDrag, rowClassName, cellClassName, rowStyle, getCellProps, editting, rowEditing, renderSubComponent, selectedRowDragging, setSelectedRowDragging, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, rowHeight, disableDragRowIds, selectRowWhenClick, handleEditRowWhenDClick, canEditRowWhenDClick, theme, dragBeforeStart, onCellContextMenu, getRowHoverTipConfig, tableTooltip, changeHoverRow, clearHoverRowIndex, hoverRowIndex, dropSide, onEditValueChange, setRowSelection, openMemo, virtualRowStart }: IRowProps) => import("react/jsx-runtime").JSX.Element;
+declare const VirtualRow: ({ tableBodyRef, table, tableId, row, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, reorderRow, canRowDrag, rowClassName, cellClassName, rowStyle, getCellProps, editting, rowEditing, renderSubComponent, selectedRowDragging, setSelectedRowDragging, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, disableDragRowIds, selectRowWhenClick, handleEditRowWhenDClick, canEditRowWhenDClick, theme, dragBeforeStart, onCellContextMenu, getRowHoverTipConfig, tableTooltip, changeHoverRow, clearHoverRowIndex, hoverRowIndex, dropSide, onEditValueChange, setRowSelection, openMemo, virtualRowStart }: IRowProps) => import("react/jsx-runtime").JSX.Element;
 export { VirtualRow };

package/dist/components/TableMax/TableBody/VirtualRow.js

@@ -26,7 +26,6 @@ import { EditableCell } from "../components/ColumnEdit";
 import "./index.less";
 import dayjs from 'dayjs';
 import { useConfig } from "../../ConfigProvider";
-import { useVirtualConfig, useVirtualState } from "../hooks/useVirtualScroll";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -60,7 +59,6 @@ var VirtualRow = function VirtualRow(_ref) {
     onRowMouseLeave = _ref.onRowMouseLeave,
     onRowMouseClick = _ref.onRowMouseClick,
     onRowMouseDoubleClick = _ref.onRowMouseDoubleClick,
-    rowHeight = _ref.rowHeight,
     disableDragRowIds = _ref.disableDragRowIds,
     selectRowWhenClick = _ref.selectRowWhenClick,
     handleEditRowWhenDClick = _ref.handleEditRowWhenDClick,
@@ -83,15 +81,6 @@ var VirtualRow = function VirtualRow(_ref) {
   var timerRef = useRef();
   var clickCountRef = useRef(0);
 
-  // 使用 Provider 中的虚拟化数据
-  var config = useVirtualConfig();
-  var state = useVirtualState();
-
-  // 从 Provider 中获取虚拟化数据
-  var virtualColumns = state.virtualColumns,
-    virtualPaddingLeft = state.virtualPaddingLeft,
-    virtualPaddingRight = state.virtualPaddingRight;
-
   // 优化：使用useMemo缓存计算结果
   var dropPreviewLineClassName = useMemo(function () {
     if (hoverRowIndex === row.index) {
@@ -125,21 +114,6 @@ var VirtualRow = function VirtualRow(_ref) {
     return row.getVisibleCells();
   }, [row, table.getState().columnVisibility]);
 
-  // 分离固定列和可滚动列的单元格
-  var _useMemo = useMemo(function () {
-      var leftPinned = row.getLeftVisibleCells();
-      var rightPinned = row.getRightVisibleCells();
-      var scrollable = row.getCenterVisibleCells();
-      return {
-        leftPinnedCells: leftPinned,
-        rightPinnedCells: rightPinned,
-        scrollableCells: scrollable
-      };
-    }, [row, table.getState().columnPinning, table.getState().columnVisibility]),
-    leftPinnedCells = _useMemo.leftPinnedCells,
-    rightPinnedCells = _useMemo.rightPinnedCells,
-    scrollableCells = _useMemo.scrollableCells;
-
   // 拖拽相关逻辑保持不变
   var _useDrop = useDrop({
       accept: 'TABLE_ROW',
@@ -209,110 +183,6 @@ var VirtualRow = function VirtualRow(_ref) {
     onCellContextMenu(e, cell);
   }, [onCellContextMenu]);
 
-  // 渲染单个单元格
-  var renderCell = useCallback(function (cell) {
-    var _cell$column, _cell$getValue, _cell$getValue2, _cellClassName;
-    // 确保 cell.column.columnDef 存在
-    if (!(cell !== null && cell !== void 0 && (_cell$column = cell.column) !== null && _cell$column !== void 0 && _cell$column.columnDef)) {
-      console.warn('Cell column definition missing', cell);
-      return null;
-    }
-    var _cell$column$columnDe = cell.column.columnDef,
-      columnEditable = _cell$column$columnDe.editable,
-      accessorKey = _cell$column$columnDe.accessorKey,
-      header = _cell$column$columnDe.header,
-      columnClassName = _cell$column$columnDe.columnClassName,
-      columnId = _cell$column$columnDe.id,
-      filterType = _cell$column$columnDe.filterType;
-    var columnEditing = rowEditing && columnEditable;
-    var rawValue = (_cell$getValue = (_cell$getValue2 = cell.getValue) === null || _cell$getValue2 === void 0 ? void 0 : _cell$getValue2.call(cell)) !== null && _cell$getValue !== void 0 ? _cell$getValue : '';
-
-    // 检查必要的函数是否存在
-    if (typeof cell.getContext !== 'function') {
-      console.warn('cell.getContext is not a function', cell);
-      return null;
-    }
-    var originalContext = cell.getContext();
-    var enhancedContext = _objectSpread(_objectSpread({}, originalContext), {}, {
-      getValue: function getValue() {
-        return rawValue;
-      },
-      getFormattedValue: function getFormattedValue() {
-        var _cell$column$columnDe2;
-        return isDateColumn(cell.column.columnDef) ? formatDate(rawValue, ((_cell$column$columnDe2 = cell.column.columnDef) === null || _cell$column$columnDe2 === void 0 || (_cell$column$columnDe2 = _cell$column$columnDe2.meta) === null || _cell$column$columnDe2 === void 0 ? void 0 : _cell$column$columnDe2.dateFormat) || dateFormat) : rawValue;
-      },
-      renderValue: function renderValue() {
-        return enhancedContext.getFormattedValue();
-      }
-    });
-    var cellClassNames = [columnEditing ? 'tbody-tr-td-editting' : '', columnClassName ? columnClassName.join(' ') : ''].concat(_toConsumableArray((cellClassName === null || cellClassName === void 0 || (_cellClassName = cellClassName(cell)) === null || _cellClassName === void 0 ? void 0 : _cellClassName.map(function (item) {
-      return "".concat(item, "-").concat(theme);
-    })) || []), ['tbody-tr-td']).filter(Boolean).join(' ');
-    return /*#__PURE__*/_jsx("td", _objectSpread(_objectSpread({
-      className: cellClassNames,
-      style: _objectSpread(_objectSpread({
-        height: rowHeight - 1,
-        width: "".concat(cell.column.getSize(), "px")
-      }, getPinningStyle(cell, table, false)), {}, {
-        boxSizing: 'border-box'
-      }),
-      onContextMenu: function onContextMenu(e) {
-        return handleCellRightClick(e, cell);
-      }
-    }, getCellProps === null || getCellProps === void 0 ? void 0 : getCellProps(cell.getContext())), {}, {
-      children: EditableCell(_objectSpread(_objectSpread({}, cell.column.columnDef), {}, {
-        width: cell.column.getSize(),
-        tableTooltip: tableTooltip,
-        editing: columnEditing,
-        dataIndex: accessorKey,
-        title: header,
-        onEditValueChange: onEditValueChange,
-        children: flexRender(cell.column.columnDef.cell, enhancedContext)
-      }))
-    }), cell.id);
-  }, [rowEditing, cellClassName, theme, rowHeight, table, handleCellRightClick, getCellProps, tableTooltip, onEditValueChange, dateFormat]);
-
-  // 渲染左侧固定列
-  var renderLeftPinnedCells = useCallback(function () {
-    return leftPinnedCells.map(function (cell) {
-      return renderCell(cell);
-    });
-  }, [leftPinnedCells, renderCell]);
-
-  // 渲染右侧固定列
-  var renderRightPinnedCells = useCallback(function () {
-    return rightPinnedCells.map(function (cell) {
-      return renderCell(cell);
-    });
-  }, [rightPinnedCells, renderCell]);
-
-  // 渲染虚拟滚动列
-  var renderVirtualScrollCells = useCallback(function () {
-    if (!config.openVirtualColumns) {
-      return scrollableCells.map(function (cell) {
-        return renderCell(cell);
-      });
-    }
-    return /*#__PURE__*/_jsxs(_Fragment, {
-      children: [virtualPaddingLeft > 0 && /*#__PURE__*/_jsx("td", {
-        style: {
-          width: "".concat(virtualPaddingLeft, "px"),
-          padding: 0,
-          border: 'none'
-        }
-      }, "virtual-padding-left"), virtualColumns.map(function (virtualColumn) {
-        var cell = scrollableCells[virtualColumn.index];
-        return cell ? renderCell(cell) : null;
-      }), virtualPaddingRight > 0 && /*#__PURE__*/_jsx("td", {
-        style: {
-          width: "".concat(virtualPaddingRight, "px"),
-          padding: 0,
-          border: 'none'
-        }
-      }, "virtual-padding-right")]
-    });
-  }, [config.openVirtualColumns, virtualColumns, scrollableCells, virtualPaddingLeft, virtualPaddingRight, renderCell]);
-
   // 行样式（支持虚拟行定位）
   var rowStyles = useMemo(function () {
     var baseStyle = _objectSpread({
@@ -321,7 +191,7 @@ var VirtualRow = function VirtualRow(_ref) {
     }, rowStyle);
 
     // 如果是虚拟行，添加定位样式
-    if (config.openVirtualRows && virtualRowStart !== undefined) {
+    if (virtualRowStart !== undefined) {
       return _objectSpread(_objectSpread({}, baseStyle), {}, {
         position: 'absolute',
         top: 0,
@@ -331,7 +201,7 @@ var VirtualRow = function VirtualRow(_ref) {
       });
     }
     return baseStyle;
-  }, [isDragging, selectedRowDragging, row.getIsSelected(), canRowDrag, editting, disableDragRowIds, row.id, rowStyle, config.openVirtualRows, virtualRowStart]);
+  }, [isDragging, selectedRowDragging, row.getIsSelected(), canRowDrag, editting, disableDragRowIds, row.id, rowStyle, virtualRowStart]);
 
   // 点击事件处理逻辑保持不变
   var handleRowClick = useCallback(function (evt) {
@@ -417,10 +287,142 @@ var VirtualRow = function VirtualRow(_ref) {
       }
     };
   }, []);
+  var rowComMemo = useMemo(function () {
+    // 添加数据验证
+    if (!(row !== null && row !== void 0 && row.getVisibleCells)) {
+      console.warn('Row data not ready');
+      return null;
+    }
+    var renderCell = function renderCell(cell) {
+      var _cell$column, _cell$getValue, _cell$getValue2, _cellClassName;
+      // 确保 cell.column.columnDef 存在
+      if (!(cell !== null && cell !== void 0 && (_cell$column = cell.column) !== null && _cell$column !== void 0 && _cell$column.columnDef)) {
+        console.warn('Cell column definition missing', cell);
+        return null;
+      }
+      var _cell$column$columnDe = cell.column.columnDef,
+        columnEditable = _cell$column$columnDe.editable,
+        accessorKey = _cell$column$columnDe.accessorKey,
+        header = _cell$column$columnDe.header,
+        columnClassName = _cell$column$columnDe.columnClassName,
+        columnId = _cell$column$columnDe.id,
+        filterType = _cell$column$columnDe.filterType;
+
+      // 多重保障确保列ID不为undefined
+      var safeColumnId = columnId || accessorKey || (cell === null || cell === void 0 ? void 0 : cell.id) || "cell-".concat(Math.random().toString(36).slice(2, 9));
+      var columnEditing = rowEditing && columnEditable;
+      var rawValue = (_cell$getValue = (_cell$getValue2 = cell.getValue) === null || _cell$getValue2 === void 0 ? void 0 : _cell$getValue2.call(cell)) !== null && _cell$getValue !== void 0 ? _cell$getValue : '';
+
+      // 检查必要的函数是否存在
+      if (typeof cell.getContext !== 'function') {
+        console.warn('cell.getContext is not a function', cell);
+        return null;
+      }
+      var originalContext = cell.getContext();
+      var enhancedContext = _objectSpread(_objectSpread({}, originalContext), {}, {
+        getValue: function getValue() {
+          return rawValue;
+        },
+        getFormattedValue: function getFormattedValue() {
+          var _cell$column$columnDe2;
+          return isDateColumn(cell.column.columnDef) ? formatDate(rawValue, ((_cell$column$columnDe2 = cell.column.columnDef) === null || _cell$column$columnDe2 === void 0 || (_cell$column$columnDe2 = _cell$column$columnDe2.meta) === null || _cell$column$columnDe2 === void 0 ? void 0 : _cell$column$columnDe2.dateFormat) || dateFormat) : rawValue;
+        },
+        renderValue: function renderValue() {
+          return enhancedContext.getFormattedValue();
+        }
+      });
+      var cellClassNames = [columnEditing ? 'tbody-tr-td-editting' : '', columnClassName ? columnClassName.join(' ') : ''].concat(_toConsumableArray((cellClassName === null || cellClassName === void 0 || (_cellClassName = cellClassName(cell)) === null || _cellClassName === void 0 ? void 0 : _cellClassName.map(function (item) {
+        return "".concat(item, "-").concat(theme);
+      })) || []), ['tbody-tr-td']).filter(Boolean).join(' ');
+      return /*#__PURE__*/_jsx("td", _objectSpread(_objectSpread({
+        className: cellClassNames,
+        style: _objectSpread({}, getPinningStyle(cell, table, false)),
+        onContextMenu: function onContextMenu(e) {
+          return handleCellRightClick(e, cell);
+        }
+      }, getCellProps === null || getCellProps === void 0 ? void 0 : getCellProps(cell.getContext())), {}, {
+        children: EditableCell(_objectSpread(_objectSpread({}, cell.column.columnDef), {}, {
+          width: cell.column.getSize(),
+          tableTooltip: tableTooltip,
+          editing: columnEditing,
+          dataIndex: accessorKey,
+          title: header,
+          onEditValueChange: onEditValueChange,
+          children: flexRender(cell.column.columnDef.cell, enhancedContext)
+        }))
+      }), cell.id);
+    };
+    try {
+      var cells = row.getVisibleCells();
+      return /*#__PURE__*/_jsx("tr", {
+        id: rowEditing ? "".concat(tableId, "-tbody-tr-editing") : undefined,
+        ref: function ref(node) {
+          dropRef(node && !editting ? node : null);
+          dragRef(node && canRowDrag && !editting && !(disableDragRowIds !== null && disableDragRowIds !== void 0 && disableDragRowIds.includes(row.id)) ? node : null);
+        },
+        style: rowStyles,
+        onClick: handleRowClick,
+        onMouseEnter: rowMouseEnter,
+        onMouseLeave: rowMouseLeave,
+        className: rowClassNames,
+        children: cells.map(renderCell)
+      });
+    } catch (error) {
+      console.error('Error rendering row:', error);
+      return null;
+    }
+  }, [
+  // 依赖项保持不变
+  row, row.id, rowEditing, tableId, editting, canRowDrag, disableDragRowIds, isDragging, selectedRowDragging, rowStyle, handleRowClick, rowMouseEnter, rowMouseLeave, rowClassNames, cellClassName, theme, table, handleCellRightClick, getCellProps, tableTooltip, onEditValueChange, dateFormat, row.getVisibleCells(), row.getIsSelected(), rowStyles]);
+  var rowCom = function rowCom() {
+    var renderCell = function renderCell(cell) {
+      var _cellClassName2;
+      var _cell$column$columnDe3 = cell.column.columnDef,
+        columnEditable = _cell$column$columnDe3.editable,
+        accessorKey = _cell$column$columnDe3.accessorKey,
+        header = _cell$column$columnDe3.header,
+        columnClassName = _cell$column$columnDe3.columnClassName,
+        id = _cell$column$columnDe3.id,
+        filterType = _cell$column$columnDe3.filterType;
+      var columnEditing = rowEditing && columnEditable;
+      var rawValue = cell.getValue();
 
-  // 渲染行的主要内容
-  var renderRowContent = useCallback(function () {
-    return /*#__PURE__*/_jsxs("tr", {
+      // 创建增强上下文
+      var originalContext = cell.getContext();
+      var enhancedContext = _objectSpread(_objectSpread({}, originalContext), {}, {
+        getValue: function getValue() {
+          return rawValue;
+        },
+        getFormattedValue: function getFormattedValue() {
+          var _cell$column$columnDe4;
+          return isDateColumn(cell.column.columnDef) ? formatDate(rawValue, ((_cell$column$columnDe4 = cell.column.columnDef) === null || _cell$column$columnDe4 === void 0 || (_cell$column$columnDe4 = _cell$column$columnDe4.meta) === null || _cell$column$columnDe4 === void 0 ? void 0 : _cell$column$columnDe4.dateFormat) || dateFormat) : rawValue;
+        },
+        renderValue: function renderValue() {
+          return enhancedContext.getFormattedValue();
+        }
+      });
+      var cellClassNames = [columnEditing ? 'tbody-tr-td-editting' : '', columnClassName ? columnClassName.join(' ') : ''].concat(_toConsumableArray((cellClassName === null || cellClassName === void 0 || (_cellClassName2 = cellClassName(cell)) === null || _cellClassName2 === void 0 ? void 0 : _cellClassName2.map(function (item) {
+        return "".concat(item, "-").concat(theme);
+      })) || []), ['tbody-tr-td']).filter(Boolean).join(' ');
+      return /*#__PURE__*/_jsx("td", _objectSpread(_objectSpread({
+        className: cellClassNames,
+        style: _objectSpread({}, getPinningStyle(cell, table, false)),
+        onContextMenu: function onContextMenu(e) {
+          return handleCellRightClick(e, cell);
+        }
+      }, getCellProps === null || getCellProps === void 0 ? void 0 : getCellProps(cell.getContext())), {}, {
+        children: EditableCell(_objectSpread(_objectSpread({}, cell.column.columnDef), {}, {
+          width: cell.column.getSize(),
+          tableTooltip: tableTooltip,
+          editing: columnEditing,
+          dataIndex: accessorKey,
+          title: header,
+          onEditValueChange: onEditValueChange,
+          children: flexRender(cell.column.columnDef.cell, enhancedContext)
+        }))
+      }), cell.id);
+    };
+    return /*#__PURE__*/_jsx("tr", {
       id: rowEditing ? "".concat(tableId, "-tbody-tr-editing") : undefined,
       ref: function ref(node) {
         dropRef(node && !editting ? node : null);
@@ -431,9 +433,9 @@ var VirtualRow = function VirtualRow(_ref) {
       onMouseEnter: rowMouseEnter,
       onMouseLeave: rowMouseLeave,
       className: rowClassNames,
-      children: [renderLeftPinnedCells(), renderVirtualScrollCells(), renderRightPinnedCells()]
+      children: row.getVisibleCells().map(renderCell)
     });
-  }, [rowEditing, tableId, editting, canRowDrag, disableDragRowIds, row.id, rowStyles, handleRowClick, rowMouseEnter, rowMouseLeave, rowClassNames, renderLeftPinnedCells, renderVirtualScrollCells, renderRightPinnedCells, virtualRowStart]);
+  };
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [!!getRowHoverTipConfig ? /*#__PURE__*/_jsx(Tooltip, _objectSpread(_objectSpread({}, tooltipConfig), {}, {
       onOpenChange: onOpenChange,
@@ -444,8 +446,8 @@ var VirtualRow = function VirtualRow(_ref) {
       getPopupContainer: function getPopupContainer() {
         return tableBodyRef.current || document.body;
       },
-      children: renderRowContent()
-    })) : renderRowContent(), row.getIsExpanded() && /*#__PURE__*/_jsx("tr", {
+      children: openMemo ? rowComMemo : rowCom()
+    })) : openMemo ? rowComMemo : rowCom(), row.getIsExpanded() && /*#__PURE__*/_jsx("tr", {
       className: "tbody-tr-subrow",
       children: /*#__PURE__*/_jsx("td", {
         colSpan: visibleCells.length,

package/dist/components/TableMax/TableBody/VirtualTableBody.d.ts

@@ -71,5 +71,5 @@ type TableBodyPropsType = {
     openVirtualColumns?: boolean;
     openVirtualRows?: boolean;
 };
-declare const VirtualTableBody: ({ tableBodyRef, tableContentRef, table, tableId, theme, reorderRow, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, tableContainerWidth, selectedRowDragging, setSelectedRowDragging, canRowDrag, rowKey, loading, rowClassName, cellClassName, rowStyle, getCellProps, rowHeight, renderSubComponent, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, disableDragRowIds, selectRowWhenClick, datas, canEditRowWhenDClick, editingRowId, handleEditRowWhenDClick, dragBeforeStart, getContextMenu, onClickContextMenu, getRowHoverTipConfig, tableTooltip, compactMode, onEditValueChange, hasTotalRow, totalDatas, setRowSelection, openMemo, openVirtualColumns, }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
+declare const VirtualTableBody: ({ tableBodyRef, tableContentRef, table, tableId, theme, reorderRow, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, tableContainerWidth, selectedRowDragging, setSelectedRowDragging, canRowDrag, rowKey, loading, rowClassName, cellClassName, rowStyle, getCellProps, rowHeight, renderSubComponent, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, disableDragRowIds, selectRowWhenClick, datas, canEditRowWhenDClick, editingRowId, handleEditRowWhenDClick, dragBeforeStart, getContextMenu, onClickContextMenu, getRowHoverTipConfig, tableTooltip, compactMode, onEditValueChange, hasTotalRow, totalDatas, setRowSelection, openMemo, openVirtualRows, }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
 export { VirtualTableBody };

package/dist/components/TableMax/TableBody/VirtualTableBody.js

@@ -20,11 +20,11 @@ import { createPortal } from 'react-dom';
 import { useConfig } from "../../ConfigProvider";
 import Empty from "../../Empty";
 import { VirtualRow } from "./VirtualRow";
+import { OriginalRow } from "./OriginalRow";
 import ContextMenu from "./contextMenu/ContextMenu";
 import "./index.less";
 import { Total } from "./components/Total";
-import { ColGroup } from "../TableHeader/VirtualTableHeader/ColGroup";
-import { useVirtualConfig, useVirtualState } from "../hooks/useVirtualScroll";
+import { useVirtualCalculations } from "../hooks/useVirtualCalculations";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -77,25 +77,21 @@ var VirtualTableBody = function VirtualTableBody(_ref) {
     totalDatas = _ref.totalDatas,
     setRowSelection = _ref.setRowSelection,
     openMemo = _ref.openMemo,
-    _ref$openVirtualColum = _ref.openVirtualColumns,
-    openVirtualColumns = _ref$openVirtualColum === void 0 ? false : _ref$openVirtualColum;
+    _ref$openVirtualRows = _ref.openVirtualRows,
+    openVirtualRows = _ref$openVirtualRows === void 0 ? false : _ref$openVirtualRows;
   var _useConfig = useConfig(),
     root = _useConfig.root;
   var headerGroups = table.getHeaderGroups();
   var headers = (headerGroups === null || headerGroups === void 0 || (_headerGroups = headerGroups[headerGroups.length - 1]) === null || _headerGroups === void 0 ? void 0 : _headerGroups.headers) || [];
   var visibleColumns = table.getVisibleLeafColumns();
-  var config = useVirtualConfig();
-  var state = useVirtualState();
-  var openVirtualRows = config.openVirtualRows;
+  var _useVirtualCalculatio = useVirtualCalculations(table, {
+      openVirtualRows: openVirtualRows,
+      rowHeight: rowHeight
+    }, tableBodyRef),
+    state = _useVirtualCalculatio.state;
 
   // 从 Provider 中获取虚拟化数据
-  var leftPinnedColumns = state.leftPinnedColumns,
-    rightPinnedColumns = state.rightPinnedColumns,
-    scrollableColumns = state.scrollableColumns,
-    virtualColumns = state.virtualColumns,
-    virtualPaddingLeft = state.virtualPaddingLeft,
-    virtualPaddingRight = state.virtualPaddingRight,
-    rowVirtualizer = state.rowVirtualizer,
+  var rowVirtualizer = state.rowVirtualizer,
     virtualRows = state.virtualRows;
   var _useState = useState({
       visible: false,
@@ -273,7 +269,6 @@ var VirtualTableBody = function VirtualTableBody(_ref) {
         onRowMouseLeave: onRowMouseLeave,
         onRowMouseClick: onRowMouseClick,
         onRowMouseDoubleClick: onRowMouseDoubleClick,
-        rowHeight: rowHeight,
         disableDragRowIds: disableDragRowIds,
         selectRowWhenClick: selectRowWhenClick,
         handleEditRowWhenDClick: handleEditRowWhenDClick,
@@ -304,7 +299,7 @@ var VirtualTableBody = function VirtualTableBody(_ref) {
   var renderNormalRows = function renderNormalRows() {
     return table.getRowModel().rows.map(function (row) {
       var rowEditing = row.id === editingRowId;
-      return /*#__PURE__*/_jsx(VirtualRow, {
+      return /*#__PURE__*/_jsx(OriginalRow, {
         tableBodyRef: tableBodyRef,
         table: table,
         tableId: tableId,
@@ -335,7 +330,6 @@ var VirtualTableBody = function VirtualTableBody(_ref) {
         onRowMouseLeave: onRowMouseLeave,
         onRowMouseClick: onRowMouseClick,
         onRowMouseDoubleClick: onRowMouseDoubleClick,
-        rowHeight: rowHeight,
         disableDragRowIds: disableDragRowIds,
         selectRowWhenClick: selectRowWhenClick,
         handleEditRowWhenDClick: handleEditRowWhenDClick,
@@ -377,13 +371,14 @@ var VirtualTableBody = function VirtualTableBody(_ref) {
       // }}
       ,
       children: /*#__PURE__*/_jsxs("table", {
-        children: [/*#__PURE__*/_jsx(ColGroup, {
-          leftPinnedColumns: leftPinnedColumns,
-          scrollableColumns: scrollableColumns,
-          rightPinnedColumns: rightPinnedColumns,
-          virtualColumns: virtualColumns,
-          virtualPaddingLeft: virtualPaddingLeft,
-          virtualPaddingRight: virtualPaddingRight
+        children: [/*#__PURE__*/_jsx("colgroup", {
+          children: headers.map(function (header) {
+            var _header$column;
+            var size = (header === null || header === void 0 || (_header$column = header.column) === null || _header$column === void 0 ? void 0 : _header$column.getSize()) || 120;
+            return /*#__PURE__*/_jsx("col", {
+              width: size
+            }, header.id);
+          })
         }), /*#__PURE__*/_jsxs("tbody", {
           id: "table-max-tableBody-tbody-".concat(tableId),
           style: {
@@ -393,8 +388,7 @@ var VirtualTableBody = function VirtualTableBody(_ref) {
           },
           children: [openVirtualRows ? renderVirtualRows() : renderNormalRows(), hasTotalRow && /*#__PURE__*/_jsx(Total, {
             table: table,
-            totalDatas: totalDatas,
-            rowHeight: rowHeight
+            totalDatas: totalDatas
           })]
         })]
       })

package/dist/components/TableMax/TableBody/components/Total.d.ts

@@ -1,6 +1,5 @@
 import '../../TableBody/index.less';
-export declare const Total: ({ table, totalDatas, rowHeight }: {
+export declare const Total: ({ table, totalDatas, }: {
     table: any;
     totalDatas: any;
-    rowHeight: any;
 }) => import("react/jsx-runtime").JSX.Element;