@arim-aisdc/public-components 2.3.56 → 2.3.58

package/dist/components/BaseInfo/BaseInfo.d.ts

@@ -17,7 +17,7 @@ export declare const foramtBaseInfoField: (data: any, dataField: BaseInfoFieldTy
     value: any;
     field: string;
     label?: string;
-    text: string | Element | JSX.Element;
+    text: string | JSX.Element | Element;
     units?: string;
     width?: string;
     labelWidth?: string;

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

@@ -225,7 +225,7 @@ var VirtualRow = function VirtualRow(_ref) {
         timerRef.current = undefined;
       }
     }
-  }, [row, table, canSelection, selectionWithoutChecked, setRowHighLightId, setRowSelectedId, selectedRowChange, onSelectChange, selectRowWhenClick, editting, onRowMouseClick, onRowMouseDoubleClick, canEditRowWhenDClick, handleEditRowWhenDClick]);
+  }, [row, table, canSelection, selectionWithoutChecked, setRowHighLightId, setRowSelectedId, selectedRowChange, onSelectChange, selectRowWhenClick, editting, onRowMouseClick, onRowMouseDoubleClick, canEditRowWhenDClick, handleEditRowWhenDClick, table.getState().columnSizing]);
   var handleSingleClick = useCallback(function (evt) {
     onRowMouseClick === null || onRowMouseClick === void 0 || onRowMouseClick(row);
     if (!row.getCanSelect()) {

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

@@ -16,7 +16,7 @@ type TableBodyPropsType = {
     canFilter: boolean;
     canSelection: boolean;
     selectionWithoutChecked?: boolean;
-    tableContainerWidth: number;
+    tableContainerWidth?: number;
     selectedRowDragging: boolean;
     setSelectedRowDragging: Dispatch<SetStateAction<boolean>>;
     rowHighLightId: string;
@@ -72,5 +72,5 @@ type TableBodyPropsType = {
     openVirtualRows?: boolean;
     tableKey: string;
 };
-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, tableKey }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
+declare const VirtualTableBody: ({ tableBodyRef, tableContentRef, table, tableId, theme, reorderRow, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, 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, tableKey }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
 export { VirtualTableBody };

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

@@ -44,7 +44,6 @@ var VirtualTableBody = function VirtualTableBody(_ref) {
     onSelectChange = _ref.onSelectChange,
     canSelection = _ref.canSelection,
     selectionWithoutChecked = _ref.selectionWithoutChecked,
-    tableContainerWidth = _ref.tableContainerWidth,
     selectedRowDragging = _ref.selectedRowDragging,
     setSelectedRowDragging = _ref.setSelectedRowDragging,
     canRowDrag = _ref.canRowDrag,
@@ -92,8 +91,9 @@ var VirtualTableBody = function VirtualTableBody(_ref) {
     state = _useVirtualCalculatio.state;
 
   // 从 Provider 中获取虚拟化数据
-  var rowVirtualizer = state.rowVirtualizer,
-    virtualRows = state.virtualRows;
+  var rowVirtualizer = state.rowVirtualizer;
+  var virtualRows = rowVirtualizer === null || rowVirtualizer === void 0 ? void 0 : rowVirtualizer.getVirtualItems();
+  console.log(rowVirtualizer, virtualRows, 'virtualRows');
   var _useState = useState({
       visible: false,
       clientX: 0,
@@ -349,7 +349,7 @@ var VirtualTableBody = function VirtualTableBody(_ref) {
     });
   };
   var tBodyHeight = useMemo(function () {
-    if (!openVirtualRows || !(rowVirtualizer !== null && rowVirtualizer !== void 0 && rowVirtualizer.getTotalSize())) return 'auto';
+    // if (!openVirtualRows || !rowVirtualizer?.getTotalSize()) return 'auto';
     return (rowVirtualizer === null || rowVirtualizer === void 0 ? void 0 : rowVirtualizer.getTotalSize()) + (hasTotalRow ? rowHeight : 0);
   }, [openVirtualRows, hasTotalRow, rowVirtualizer === null || rowVirtualizer === void 0 ? void 0 : rowVirtualizer.getTotalSize(), rowHeight]);
   return /*#__PURE__*/_jsxs(_Fragment, {
@@ -363,50 +363,44 @@ var VirtualTableBody = function VirtualTableBody(_ref) {
       table: table,
       tableId: tableId,
       compactMode: compactMode
-    }), root ? document.querySelector(root) : document.body), showTable ? /*#__PURE__*/_jsx("div", {
-      className: "table-max-table-body-table-wrapper",
-      ref: dropTableEmptyRef
-      // style={{
-      //   height: `${rowVirtualizer.getTotalSize()}px`,
-      //   position: 'relative'
-      // }}
-      ,
-      children: /*#__PURE__*/_jsxs("table", {
-        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: {
-            position: openVirtualRows ? 'relative' : 'static',
-            height: tBodyHeight,
-            paddingBottom: openVirtualRows && hasTotalRow ? "".concat(rowHeight, "px") : 0
-          },
-          children: [openVirtualRows ? renderVirtualRows() : renderNormalRows(), hasTotalRow && /*#__PURE__*/_jsx(Total, {
-            table: table,
-            totalDatas: totalDatas
-          })]
-        })]
-      })
-    }) : /*#__PURE__*/_jsx("div", {
-      className: "empty-container",
+    }), root ? document.querySelector(root) : document.body), showTable ?
+    /*#__PURE__*/
+    // <div
+    //   className="table-max-table-body-table-wrapper"
+    //   ref={dropTableEmptyRef}
+    // >
+    //   <table>
+    //     <colgroup>
+    //       {headers.map((header: any) => {
+    //         let size: number = header?.column?.getSize() || 120;
+    //         return <col key={header.id} width={size}></col>;
+    //       })}
+    //     </colgroup>
+    _jsxs("tbody", {
+      ref: dropTableEmptyRef,
+      id: "table-max-tableBody-tbody-".concat(tableId),
       style: {
-        width: table.getTotalSize()
+        position: openVirtualRows ? 'relative' : 'static',
+        height: tBodyHeight,
+        paddingBottom: openVirtualRows && hasTotalRow ? "".concat(rowHeight, "px") : 0
       },
-      children: /*#__PURE__*/_jsx("div", {
-        className: "empty-wrapper",
-        style: {
-          width: "".concat(tableContainerWidth - 10, "px")
-        },
-        children: loading ? /*#__PURE__*/_jsx(Spin, {}) : /*#__PURE__*/_jsx("span", {
-          className: "empty-content",
-          ref: dropEmptyRef,
-          children: /*#__PURE__*/_jsx(Empty, {})
+      children: [openVirtualRows ? renderVirtualRows() : renderNormalRows(), hasTotalRow && /*#__PURE__*/_jsx(Total, {
+        table: table,
+        totalDatas: totalDatas
+      })]
+    })
+    //   // {/* </table> */}
+    // </div>
+    : /*#__PURE__*/_jsx("tbody", {
+      ref: dropEmptyRef,
+      children: /*#__PURE__*/_jsx("tr", {
+        className: "empty-container",
+        children: /*#__PURE__*/_jsx("td", {
+          className: "empty-wrapper",
+          children: loading ? /*#__PURE__*/_jsx(Spin, {}) : /*#__PURE__*/_jsx("span", {
+            className: "empty-content",
+            children: /*#__PURE__*/_jsx(Empty, {})
+          })
         })
       })
     }), /*#__PURE__*/_jsx(ContextMenu, _objectSpread(_objectSpread({}, contextMenuData), {}, {

package/dist/components/TableMax/TableBody/index.less

@@ -138,10 +138,14 @@ table {
 }
 
 .empty-container {
-  height: 100%;
+  // height: 100%;
+  // width: var(--table-width);
 
   .empty-wrapper {
-    height: 100%;
+    width: var(--table-body-width);
+    height: var(--table-body-height);
+
+    // height: 100%;
     min-height: 120px;
     display: flex;
     flex-direction: column;

package/dist/components/TableMax/TableHeader/OriginalTableHeader.js

@@ -9,7 +9,6 @@ import "./index.less";
 import { getPinningStyle } from "./utils";
 import { useWhyDidYouUpdate } from 'ahooks';
 import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 var OriginalTableHeader = function OriginalTableHeader(_ref) {
   var _headerGroups;
   var tableContentRef = _ref.tableContentRef,
@@ -41,16 +40,16 @@ var OriginalTableHeader = function OriginalTableHeader(_ref) {
     headerRowNum: headerRowNum,
     manualFiltering: manualFiltering
   });
-  return /*#__PURE__*/_jsxs("table", {
-    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__*/_jsx("thead", {
+  return (
+    /*#__PURE__*/
+    // <table>
+    //   <colgroup>
+    //     {headers.map((header: any) => {
+    //       let size: number = header?.column?.getSize() || 120;
+    //       return <col key={header.id} width={size}></col>;
+    //     })}
+    //   </colgroup>
+    _jsx("thead", {
       children: headerGroups === null || headerGroups === void 0 ? void 0 : headerGroups.map(function (headerGroup) {
         return /*#__PURE__*/_jsx("tr", {
           className: "table-thead-tr cus-table-thead-tr",
@@ -80,7 +79,8 @@ var OriginalTableHeader = function OriginalTableHeader(_ref) {
           })
         }, headerGroup.id);
       })
-    })]
-  });
+    })
+    // </table>
+  );
 };
 export { OriginalTableHeader };

package/dist/components/TableMax/TableHeader/index.less

@@ -222,4 +222,19 @@ table {
   transform: translate3d(0, 0, 0);
   contain: strict;
   cursor: ew-resize;
+}
+
+thead {
+  position: sticky;
+  top: 0;
+  left: 0;
+  z-index: 202;
+
+  .cell-wapper {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: var(--cell-padding);
+    height: var(--cell-height);
+  }
 }

package/dist/components/TableMax/TableMax.js

@@ -27,8 +27,6 @@ import { cloneDeep, debounce } from 'lodash';
 import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { useTranslation } from "../../hooks/useTranslation";
 import { useConfig } from "../ConfigProvider";
-import TableBody from "./TableBody";
-import TableHeader from "./TableHeader";
 import { InputType } from "./components/ColumnEdit";
 import { setDefaultFilterFn } from "./components/ColumnFilterV2";
 import customFilterFns from "./components/ColumnFilterV2/customFilterFns";
@@ -40,6 +38,7 @@ import "./tableMax.less";
 import { downloadExcel, getFormatFilters, getFormatFiltersV2, getFormatSorting, operationColumnNoTooltips } from "./utils";
 import { useTableScrollShadow } from "./hooks/useTableScrollShadow";
 import { ExportTableData } from "./components/Export";
+import UnifiedTable from "./UnifiedTable";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var ColumnType = /*#__PURE__*/function (ColumnType) {
@@ -340,7 +339,6 @@ var TableMax = function TableMax(_ref) {
     columnSizing = _useColumnWidth.columnSizing,
     initializeColumnSizing = _useColumnWidth.initializeColumnSizing,
     onColumnSizingChange = _useColumnWidth.onColumnSizingChange,
-    tableContainerWidth = _useColumnWidth.tableContainerWidth,
     handleVisibleConfigChange = _useColumnWidth.handleVisibleConfigChange;
 
   /**列筛选 */
@@ -738,26 +736,6 @@ var TableMax = function TableMax(_ref) {
       return (column === null || column === void 0 ? void 0 : column.columns) && ((_column$columns = column.columns) === null || _column$columns === void 0 ? void 0 : _column$columns.length) > 0;
     }) > -1);
   }, [columns]);
-
-  // 列显示隐藏改变，修改初始化列宽Map
-  // useUpdateEffect(() => {
-  //   const visibleColumnsSizeMap = {};
-  //   const notVisibleColumns = Object.keys(columnVisibleConfig).filter(key => !columnVisibleConfig[key]);
-  //   allColumnCount = table.getVisibleLeafColumns().length;
-  //   Object.keys(initColumnsSizing).forEach(key => {
-  //     if (!notVisibleColumns.includes(key)) {
-  //       visibleColumnsSizeMap[key] = initColumnsSizing[key];
-  //     }
-  //   });
-  //   visibleColumnsSizing = visibleColumnsSizeMap;
-  // }, [columnVisibleConfig]);
-
-  // 容器宽度改变，重新计算列宽
-  // useUpdateEffect(() => {
-  //   setColumnSizing(changeColumnSizingHandler(visibleColumnsSizing));
-  //   // changeColumnSizingHandler(visibleColumnsSizing)
-  // }, [tableContainerWidth]);
-
   var _rowSelectionChange = useCallback(debounce(function (rowOriginal, row) {
     if (rowSelectionChange) {
       // console.log(rowOriginal, row, 'rowSelectionChange1')
@@ -1104,7 +1082,6 @@ var TableMax = function TableMax(_ref) {
     canFilter: canFilter,
     canSelection: canSelection,
     selectionWithoutChecked: selectionWithoutChecked,
-    tableContainerWidth: tableContainerWidth,
     selectedRowDragging: selectedRowDragging,
     setSelectedRowDragging: setSelectedRowDragging,
     canRowDrag: canRowDrag,
@@ -1324,19 +1301,12 @@ var TableMax = function TableMax(_ref) {
         })]
       }), /*#__PURE__*/_jsx("div", {
         className: "table-max-content cus-table-max-content ".concat(compactMode ? 'table-max-content-compact' : null),
-        children: /*#__PURE__*/_jsxs("div", {
+        children: /*#__PURE__*/_jsx("div", {
           className: "table-center",
           ref: tableContentRef
           // style={{ maxHeight: !autoHeight ? defaultScrollY : 'fit-content' }}
           ,
-          children: [/*#__PURE__*/_jsx("div", {
-            className: "table-header-wrapper",
-            children: /*#__PURE__*/_jsx("div", {
-              ref: tableHeaderRef,
-              className: "table-header",
-              children: /*#__PURE__*/_jsx(TableHeader, _objectSpread({}, tableHeaderProps))
-            })
-          }), /*#__PURE__*/_jsx("div", {
+          children: /*#__PURE__*/_jsx("div", {
             ref: tableBodyRef,
             className: "table-body"
             // onScroll={scrollHandler}
@@ -1354,8 +1324,15 @@ var TableMax = function TableMax(_ref) {
               // 移除当前元素的hover类
               (_tableBodyRef$current2 = tableBodyRef.current) === null || _tableBodyRef$current2 === void 0 || _tableBodyRef$current2.classList.remove('hover-active');
             },
-            children: /*#__PURE__*/_jsx(TableBody, _objectSpread({}, tableBodyProps))
-          })]
+            children: /*#__PURE__*/_jsx(UnifiedTable, {
+              tableId: tableId,
+              table: table,
+              tableContentRef: tableContentRef,
+              tableBodyRef: tableBodyRef,
+              tableHeaderProps: tableHeaderProps,
+              tableBodyProps: tableBodyProps
+            })
+          })
         })
       }), pagination && /*#__PURE__*/_jsx("div", {
         className: "table-max-footer",

package/dist/components/TableMax/UnifiedTable.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+import { Table } from '@tanstack/react-table';
+import { MutableRefObject } from 'react';
+interface UnifiedTableProps {
+    tableId: string;
+    table: Table<any>;
+    tableContentRef: MutableRefObject<HTMLDivElement> | null;
+    tableBodyRef: MutableRefObject<HTMLDivElement> | null;
+    tableHeaderProps: any;
+    tableBodyProps: any;
+}
+declare const UnifiedTable: React.FC<UnifiedTableProps>;
+export default UnifiedTable;

package/dist/components/TableMax/UnifiedTable.js

@@ -0,0 +1,140 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+// UnifiedTable.tsx
+import React, { useRef } from 'react';
+import { useDrop } from 'react-dnd';
+import { OriginalTableHeader } from "./TableHeader";
+import { VirtualTableBody } from "./TableBody";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var UnifiedTable = function UnifiedTable(_ref) {
+  var _headerGroups;
+  var tableId = _ref.tableId,
+    table = _ref.table,
+    tableContentRef = _ref.tableContentRef,
+    tableBodyRef = _ref.tableBodyRef,
+    tableHeaderProps = _ref.tableHeaderProps,
+    tableBodyProps = _ref.tableBodyProps;
+  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 rows = table.getRowModel().rows;
+  var canFilter = tableHeaderProps.canFilter,
+    enableFilters = tableHeaderProps.enableFilters,
+    canSorting = tableHeaderProps.canSorting,
+    hasGroup = tableHeaderProps.hasGroup,
+    getHeaderCellProps = tableHeaderProps.getHeaderCellProps,
+    columnResizeMode = tableHeaderProps.columnResizeMode,
+    disableColumnDrag = tableHeaderProps.disableColumnDrag,
+    rowHeight = tableHeaderProps.rowHeight,
+    headerRowNum = tableHeaderProps.headerRowNum,
+    manualFiltering = tableHeaderProps.manualFiltering,
+    getDynamicFilterOptionsFn = tableHeaderProps.getDynamicFilterOptionsFn;
+  var loading = tableBodyProps.loading,
+    datas = tableBodyProps.datas,
+    hasTotalRow = tableBodyProps.hasTotalRow,
+    totalDatas = tableBodyProps.totalDatas,
+    theme = tableBodyProps.theme,
+    reorderRow = tableBodyProps.reorderRow,
+    rowSelectedId = tableBodyProps.rowSelectedId,
+    setRowSelectedId = tableBodyProps.setRowSelectedId,
+    rowHighLightId = tableBodyProps.rowHighLightId,
+    setRowHighLightId = tableBodyProps.setRowHighLightId,
+    selectedRowChange = tableBodyProps.selectedRowChange,
+    onSelectChange = tableBodyProps.onSelectChange,
+    canSelection = tableBodyProps.canSelection,
+    selectionWithoutChecked = tableBodyProps.selectionWithoutChecked,
+    selectedRowDragging = tableBodyProps.selectedRowDragging,
+    setSelectedRowDragging = tableBodyProps.setSelectedRowDragging,
+    canRowDrag = tableBodyProps.canRowDrag,
+    rowKey = tableBodyProps.rowKey,
+    rowClassName = tableBodyProps.rowClassName,
+    cellClassName = tableBodyProps.cellClassName,
+    rowStyle = tableBodyProps.rowStyle,
+    getCellProps = tableBodyProps.getCellProps,
+    renderSubComponent = tableBodyProps.renderSubComponent,
+    onRowMouseEnter = tableBodyProps.onRowMouseEnter,
+    onRowMouseLeave = tableBodyProps.onRowMouseLeave,
+    onRowMouseClick = tableBodyProps.onRowMouseClick,
+    onRowMouseDoubleClick = tableBodyProps.onRowMouseDoubleClick,
+    disableDragRowIds = tableBodyProps.disableDragRowIds,
+    selectRowWhenClick = tableBodyProps.selectRowWhenClick,
+    canEditRowWhenDClick = tableBodyProps.canEditRowWhenDClick,
+    editingRowId = tableBodyProps.editingRowId,
+    handleEditRowWhenDClick = tableBodyProps.handleEditRowWhenDClick,
+    dragBeforeStart = tableBodyProps.dragBeforeStart,
+    getContextMenu = tableBodyProps.getContextMenu,
+    onClickContextMenu = tableBodyProps.onClickContextMenu,
+    getRowHoverTipConfig = tableBodyProps.getRowHoverTipConfig,
+    tableTooltip = tableBodyProps.tableTooltip,
+    onEditValueChange = tableBodyProps.onEditValueChange,
+    setRowSelection = tableBodyProps.setRowSelection,
+    openMemo = tableBodyProps.openMemo;
+
+  // 空状态相关的 drop 处理
+  var _useDrop = useDrop({
+      accept: 'TABLE_ROW',
+      drop: function drop(formDatas) {
+        return reorderRow === null || reorderRow === void 0 ? void 0 : reorderRow(formDatas, {
+          hoverRow: {
+            index: 0
+          },
+          targetTableId: tableId
+        });
+      }
+    }),
+    _useDrop2 = _slicedToArray(_useDrop, 2),
+    dropEmptyRef = _useDrop2[1];
+
+  // 判断是否显示表格内容
+  var showTable = !loading && datas.length !== 0 && rows.length !== 0;
+  var tableRef = useRef();
+
+  // // 监听容器大小变化
+  // useEffect(() => {
+  //   if (!tableRef?.current) return;
+
+  //   const observer = new ResizeObserver(entries => {
+  //     // const newWidth = entries[0]?.contentRect.width;
+  //     // const height = entries[0]?.contentRect.height;
+  //     // console.log(entries[0]?.contentRect, entries[0], 'entries[0]?')
+  //     const target = entries[0].target;
+
+  //     // 获取不包含滚动条的宽度
+  //     const widthWithoutScrollbar = target.clientWidth;
+  //     const heightWithoutScrollbar = target.clientHeight;
+
+  //     if (widthWithoutScrollbar && heightWithoutScrollbar && tableRef?.current) {
+  //       tableRef?.current?.style?.setProperty('--table-width', `${widthWithoutScrollbar}px`);
+  //       tableRef?.current?.style?.setProperty('--table-height', `${heightWithoutScrollbar}px`);
+  //     }
+  //   });
+
+  //   observer.observe(tableRef.current);
+  //   return () => observer.disconnect();
+  // }, [tableRef]);
+
+  return /*#__PURE__*/_jsxs("table", {
+    className: "unified-table",
+    ref: tableRef,
+    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__*/_jsx(OriginalTableHeader, _objectSpread({}, tableHeaderProps)), /*#__PURE__*/_jsx(VirtualTableBody, _objectSpread({}, tableBodyProps))]
+  });
+};
+export default UnifiedTable;

package/dist/components/TableMax/components/ColumnSort/customSortFns.d.ts

@@ -1,13 +1,13 @@
 import { TableMaxColumnType } from "../../type";
-export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
 declare const customSortFns: {
-    numberSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-    stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-    timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+    stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+    timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

package/dist/components/TableMax/hooks/useColumnWidth.js

@@ -19,8 +19,9 @@ import { getSizeInfo } from "../utils";
 var DEFAULT_MIN_SIZE = 120;
 var DEFAULT_MAX_SIZE = 2000;
 var DEFAULT_RESIZE_DEBOUNCE = 200;
-// const DEFAULT_TABLE_PADDING = 10;
-var DEFAULT_TABLE_PADDING = 0;
+var DEFAULT_TABLE_PADDING = 10;
+// const DEFAULT_TABLE_PADDING = 0;
+
 /**
  * 获取表格容器的有效宽度（减去边框）
  */
@@ -321,10 +322,14 @@ export var useColumnWidth = function useColumnWidth(_ref) {
   useEffect(function () {
     if (!tableContentRef.current) return;
     var observer = new ResizeObserver(function (entries) {
-      var _entries$;
+      var _entries$, _entries$2;
       var newWidth = (_entries$ = entries[0]) === null || _entries$ === void 0 ? void 0 : _entries$.contentRect.width;
-      if (newWidth) {
+      var height = (_entries$2 = entries[0]) === null || _entries$2 === void 0 ? void 0 : _entries$2.contentRect.height;
+      if (newWidth || height) {
+        var _tableContentRef$curr, _tableContentRef$curr2;
         debouncedHandleResizeRef.current(newWidth);
+        (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 || (_tableContentRef$curr = _tableContentRef$curr.style) === null || _tableContentRef$curr === void 0 || _tableContentRef$curr.setProperty('--table-body-width', "".concat(newWidth - 12, "px"));
+        (_tableContentRef$curr2 = tableContentRef.current) === null || _tableContentRef$curr2 === void 0 || (_tableContentRef$curr2 = _tableContentRef$curr2.style) === null || _tableContentRef$curr2 === void 0 || _tableContentRef$curr2.setProperty('--table-body-height', "".concat(height - 60, "px"));
       }
     });
     observer.observe(tableContentRef.current);

package/dist/components/TableMax/hooks/useTableScrollShadow.js

@@ -64,14 +64,15 @@ export var useTableScrollShadow = function useTableScrollShadow(_ref) {
 
   // 滚动处理函数
   var handleScroll = useCallback(function (event) {
-    var target = event.currentTarget;
-    if (!target || !tableHeaderRef.current) return;
-    var scrollLeft = target.scrollLeft,
-      scrollWidth = target.scrollWidth;
-    var headerScrollLeft = scrollLeft / scrollWidth * tableHeaderRef.current.scrollWidth;
+    // const target = event.currentTarget as HTMLElement;
+    // if (!target || !tableHeaderRef.current) return;
+
+    // const { scrollLeft, scrollWidth } = target;
+    // const headerScrollLeft = (scrollLeft / scrollWidth) * tableHeaderRef.current.scrollWidth;
+
+    // // 实时同步表头滚动
+    // tableHeaderRef.current.scrollLeft = headerScrollLeft;
 
-    // 实时同步表头滚动
-    tableHeaderRef.current.scrollLeft = headerScrollLeft;
     changePinShadow();
   }, [tableHeaderRef, changePinShadow]);
 
@@ -79,16 +80,16 @@ export var useTableScrollShadow = function useTableScrollShadow(_ref) {
   useEffect(function () {
     var tableBody = tableBodyRef.current;
     if (!tableBody) return;
-    tableBody.addEventListener('scroll', handleScroll, supportsPassive ? {
+    tableBody.addEventListener('scroll', changePinShadow, supportsPassive ? {
       passive: true
     } : false);
     return function () {
       if (scrollRafId.current) {
         cancelAnimationFrame(scrollRafId.current);
       }
-      tableBody.removeEventListener('scroll', handleScroll);
+      tableBody.removeEventListener('scroll', changePinShadow);
     };
-  }, [tableBodyRef, handleScroll, supportsPassive]);
+  }, [tableBodyRef, changePinShadow, supportsPassive]);
 
   // 监听表格宽度和列尺寸变化
   useEffect(function () {

package/dist/components/TableMax/hooks/useVirtualCalculations.js

@@ -51,7 +51,7 @@ export var useVirtualCalculations = function useVirtualCalculations(table, table
       overscan: config.rowOverscan || 10,
       key: virtualizerRefreshKey
     };
-  }, [config.openVirtualRows, rows.length, config.rowHeight,
+  }, [config.openVirtualRows, rows, config.rowHeight,
   // 关键：包含 rowHeight 依赖
   config.rowOverscan, virtualizerRefreshKey, tableKey]);
   var rowVirtualizer = rowVirtualizerConfig ? useVirtualizer(rowVirtualizerConfig) : null;
@@ -59,6 +59,8 @@ export var useVirtualCalculations = function useVirtualCalculations(table, table
   // 响应 rowHeight 变化
   useEffect(function () {
     if (rowVirtualizer && config.openVirtualRows) {
+      var _tableBodyRef$current;
+      console.log((_tableBodyRef$current = tableBodyRef.current) === null || _tableBodyRef$current === void 0 ? void 0 : _tableBodyRef$current.offsetHeight, 'tableBodyRef.current?.offsetHeight');
       // 当 rowHeight 变化时，重新测量所有行
       console.log('rowHeight数据变化，重新测量', rows.length);
       rowVirtualizer.measure();

package/dist/components/TableMax/tableMax.less

@@ -106,7 +106,8 @@
         padding:var(--cell-padding)!important;
         display: flex;
         align-items: center;
-          .ellipsis {
+
+        .ellipsis {
           overflow: hidden;
           text-overflow: ellipsis;
           white-space: nowrap;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.3.56",
+  "version": "2.3.58",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",