@arim-aisdc/public-components 2.3.25 → 2.3.27

package/dist/components/CenterModal/CenterModal.js

@@ -194,7 +194,7 @@ var CenterModal = function CenterModal(_ref) {
     onCancel: handleCancel,
     okText: okText,
     footer: hasfooter ? footer : null,
-    centered: false,
+    centered: true,
     closeIcon: /*#__PURE__*/_jsx("i", {
       className: "iconfont-other icon-other-close",
       children: " "

package/dist/components/ConfigProvider/context.d.ts

@@ -25,6 +25,11 @@ export interface ConfigConsumerProps {
     locale?: Locale;
     /**tablemax dateFormat */
     dateFormat?: string;
+    /**tablemax pageSizeOptions */
+    tableMax?: {
+        pageSizeOptions?: number[];
+        cacheMaxAge?: number;
+    };
 }
 export declare const DEFAULT_CONTEXT: {
     theme: string;

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

@@ -60,5 +60,5 @@ type IRowProps = {
     dropSide: DropSide;
     onEditValueChange?: (field: string, value: any, extra?: any) => void;
 };
-declare const Row: ({ 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, shadowColumnInfo, onCellContextMenu, getRowHoverTipConfig, tableTooltip, changeHoverRow, clearHoverRowIndex, hoverRowIndex, dropSide, onEditValueChange, }: IRowProps) => import("react/jsx-runtime").JSX.Element;
-export default Row;
+declare const _default: React.MemoExoticComponent<({ 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, shadowColumnInfo, onCellContextMenu, getRowHoverTipConfig, tableTooltip, changeHoverRow, clearHoverRowIndex, hoverRowIndex, dropSide, onEditValueChange, }: IRowProps) => import("react/jsx-runtime").JSX.Element>;
+export default _default;

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

@@ -413,7 +413,7 @@ var Row = function Row(_ref) {
     })]
   });
 };
-export default Row;
+export default /*#__PURE__*/React.memo(Row);
 function formatDate(dateValue) {
   var pattern = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "YYYY-MM-DD HH:mm";
   if (!dateValue) return '';

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

@@ -1,6 +1,6 @@
 import { Table } from '@tanstack/react-table';
 import { IMenuOptionsType, OnSelectChangeType } from "../type";
-import { Dispatch, MutableRefObject, ReactNode, SetStateAction } from 'react';
+import React, { Dispatch, MutableRefObject, ReactNode, SetStateAction } from 'react';
 import './index.less';
 type TableBodyPropsType = {
     tableBodyRef: MutableRefObject<HTMLDivElement> | null;
@@ -74,6 +74,5 @@ type TableBodyPropsType = {
     hasTotalRow?: boolean;
     totalDatas?: any[];
 };
-declare const TableBody: ({ 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, shadowColumnInfo, getContextMenu, onClickContextMenu, getRowHoverTipConfig, tableTooltip, compactMode, onEditValueChange, hasTotalRow, totalDatas }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
-export default TableBody;
-export declare const MemoizedTableBody: ({ 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, shadowColumnInfo, getContextMenu, onClickContextMenu, getRowHoverTipConfig, tableTooltip, compactMode, onEditValueChange, hasTotalRow, totalDatas }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
+declare const _default: React.MemoExoticComponent<({ 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, shadowColumnInfo, getContextMenu, onClickContextMenu, getRowHoverTipConfig, tableTooltip, compactMode, onEditValueChange, hasTotalRow, totalDatas }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element>;
+export default _default;

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

@@ -154,7 +154,7 @@ var TableBody = function TableBody(_ref) {
   }, [hoverRowIndex, dropSide]);
 
   // cell右键菜单
-  var handleCellContextMenu = function handleCellContextMenu(e, cell) {
+  var handleCellContextMenu = useCallback(function (e, cell) {
     // console.log('cell :>> ', cell);
     if (getContextMenu) {
       var options = getContextMenu({
@@ -171,7 +171,7 @@ var TableBody = function TableBody(_ref) {
       });
       e.preventDefault();
     }
-  };
+  }, [getContextMenu]);
 
   // 关闭菜单
   var closeContextMenu = useCallback(function () {
@@ -431,7 +431,9 @@ var TableBody = function TableBody(_ref) {
     })
   );
 };
-export default TableBody;
-export var MemoizedTableBody = /*#__PURE__*/React.memo(TableBody, function (prev, next) {
-  return prev.table.options.data === next.table.options.data;
-});
+export default /*#__PURE__*/React.memo(TableBody);
+
+// export const MemoizedTableBody = React.memo(
+//   TableBody,
+//   (prev, next) => prev.table.options.data === next.table.options.data
+// ) as typeof TableBody

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

@@ -1,12 +1,6 @@
-import { RowData } from '@tanstack/react-table';
 import React from 'react';
 import './tableMax.less';
 import { type TableMaxProps } from './type';
-declare module '@tanstack/react-table' {
-    interface TableMeta<TData extends RowData> {
-        updateData: (rowIndex: number, columnId: string, value: unknown) => void;
-    }
-}
 export declare enum ColumnType {
     Selection = "selection-column",
     Darg = "darg-column",
@@ -15,5 +9,5 @@ export declare enum ColumnType {
 }
 export type ColumnSizing = Record<string, number>;
 export declare const CACHE_MAX_AGE: number;
-declare const _default: React.ForwardRefExoticComponent<TableMaxProps & React.RefAttributes<unknown>>;
+declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<TableMaxProps & React.RefAttributes<unknown>>>;
 export default _default;

package/dist/components/TableMax/TableMax.js

@@ -26,7 +26,7 @@ import dayjs from 'dayjs';
 import { cloneDeep, debounce } from 'lodash';
 import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { useConfig } from "../ConfigProvider";
-import TableBody, { MemoizedTableBody } from "./TableBody";
+import TableBody from "./TableBody";
 import TableHeader from "./TableHeader";
 import { InputType } from "./components/ColumnEdit";
 import { setDefaultFilterFn } from "./components/ColumnFilterV2";
@@ -47,29 +47,34 @@ export var ColumnType = /*#__PURE__*/function (ColumnType) {
   ColumnType["Expander"] = "expander";
   return ColumnType;
 }({});
-// export const TableContext = createContext<TableContextType>({} as TableContextType);
-
 export var CACHE_MAX_AGE = 1 * 60 * 60 * 1000;
 var getCurrentRouterName = function getCurrentRouterName() {
   return window.location.pathname.slice(1);
 };
+
+/**将空默认值提升为组件外部的常量，避免引发不必要的渲染 */
+var defaultData = [];
+var defaultColumnVisibleConfig = {};
+var defaultColumnPinningConfig = {
+  left: [],
+  right: []
+};
+var initSelectedRowIds = [];
+var initColumnFilters = [];
 var TableMax = function TableMax(_ref) {
   var _JSON$parse, _tableContentRef$curr;
   var tableId = _ref.tableId,
     originColumns = _ref.columns,
     _ref$datas = _ref.datas,
-    datas = _ref$datas === void 0 ? [] : _ref$datas,
+    datas = _ref$datas === void 0 ? defaultData : _ref$datas,
     totalCount = _ref.totalCount,
     _ref$columnVisibleCon = _ref.columnVisibleConfig,
-    columnVisibleConfig = _ref$columnVisibleCon === void 0 ? {} : _ref$columnVisibleCon,
+    columnVisibleConfig = _ref$columnVisibleCon === void 0 ? defaultColumnVisibleConfig : _ref$columnVisibleCon,
     _ref$columnPinningCon = _ref.columnPinningConfig,
-    columnPinningConfig = _ref$columnPinningCon === void 0 ? {
-      left: [],
-      right: []
-    } : _ref$columnPinningCon,
+    columnPinningConfig = _ref$columnPinningCon === void 0 ? defaultColumnPinningConfig : _ref$columnPinningCon,
     defaultSelectedRowId = _ref.defaultSelectedRowId,
     _ref$defaultSelectedR = _ref.defaultSelectedRowIds,
-    defaultSelectedRowIds = _ref$defaultSelectedR === void 0 ? [] : _ref$defaultSelectedR,
+    defaultSelectedRowIds = _ref$defaultSelectedR === void 0 ? initSelectedRowIds : _ref$defaultSelectedR,
     selectedRowChange = _ref.selectedRowChange,
     onSelectChange = _ref.onSelectChange,
     rowSelectionChange = _ref.rowSelectionChange,
@@ -142,7 +147,7 @@ var TableMax = function TableMax(_ref) {
     _ref$rowHeight = _ref.rowHeight,
     rowHeight = _ref$rowHeight === void 0 ? 42 : _ref$rowHeight,
     _ref$defaultColumnFil = _ref.defaultColumnFilters,
-    defaultColumnFilters = _ref$defaultColumnFil === void 0 ? [] : _ref$defaultColumnFil,
+    defaultColumnFilters = _ref$defaultColumnFil === void 0 ? initColumnFilters : _ref$defaultColumnFil,
     getColumnFiltersData = _ref.getColumnFiltersData,
     saveEditing = _ref.saveEditing,
     _ref$getRowCanExpand = _ref.getRowCanExpand,
@@ -187,7 +192,8 @@ var TableMax = function TableMax(_ref) {
     request = _ref.request,
     onEditValueChange = _ref.onEditValueChange,
     hasTotalRow = _ref.hasTotalRow,
-    totalDatas = _ref.totalDatas;
+    totalDatas = _ref.totalDatas,
+    pageSizeOptions = _ref.pageSizeOptions;
   var tableMaxRef = useRef(null);
   // 表格元素
   var tableContentRef = useRef(null);
@@ -204,7 +210,18 @@ var TableMax = function TableMax(_ref) {
     userId = _useConfig.userId,
     theme = _useConfig.theme,
     tableKeyPrefixCls = _useConfig.tableKeyPrefixCls,
-    tableMaxNewPagination = _useConfig.tableMaxNewPagination;
+    tableMaxNewPagination = _useConfig.tableMaxNewPagination,
+    tableMax = _useConfig.tableMax;
+  var tableMaxConfig = useMemo(function () {
+    var _ref2 = tableMax || {},
+      globalPageSizeOptions = _ref2.pageSizeOptions,
+      cacheMaxAge = _ref2.cacheMaxAge;
+    return {
+      globalPageSizeOptions: globalPageSizeOptions,
+      cacheMaxAge: cacheMaxAge
+    };
+  }, [JSON.stringify(tableMax)]);
+
   // 多选场景下，点击行时是否选中改行。在不展示多选框(selectionWithoutChecked=true)时，会一直为true
   var selectRowWhenClick = useMemo(function () {
     return originSelectRowWhenClick || selectionWithoutChecked;
@@ -293,7 +310,8 @@ var TableMax = function TableMax(_ref) {
       tableId: tableId,
       tableKeyPrefixCls: tableKeyPrefixCls,
       columnVisibleConfig: columnVisibleConfig,
-      tableKey: tableKey
+      tableKey: tableKey,
+      cacheMaxAge: tableMaxConfig.cacheMaxAge
     }),
     columnSizing = _useColumnWidth.columnSizing,
     initializeColumnSizing = _useColumnWidth.initializeColumnSizing,
@@ -476,9 +494,10 @@ var TableMax = function TableMax(_ref) {
 
   /**根据缓存数据设置一些状态 */
   var setColumnInfoFromCache = function setColumnInfoFromCache(tableColumns) {
-    var _localStorage$getItem;
+    var _localStorage$getItem, _tableMaxConfig$cache;
     var cache = JSON.parse((_localStorage$getItem = localStorage.getItem(tableKey)) !== null && _localStorage$getItem !== void 0 ? _localStorage$getItem : '{}');
-    if (cache && cache !== null && cache !== void 0 && cache.editTime && +new Date() - cache.editTime > CACHE_MAX_AGE) {
+    console.log(+cache.editTime, 'cache.editTime');
+    if (cache && cache !== null && cache !== void 0 && cache.editTime && +new Date() - cache.editTime > ((_tableMaxConfig$cache = tableMaxConfig.cacheMaxAge) !== null && _tableMaxConfig$cache !== void 0 ? _tableMaxConfig$cache : CACHE_MAX_AGE)) {
       return;
     }
     var cacheColumnVisibility = cache.columnVisibility,
@@ -500,7 +519,7 @@ var TableMax = function TableMax(_ref) {
     var tableColumnIds = tableColumns === null || tableColumns === void 0 ? void 0 : tableColumns.map(function (column) {
       return column.id;
     });
-    if (cacheColumnFilters) {
+    if ((cacheColumnFilters === null || cacheColumnFilters === void 0 ? void 0 : cacheColumnFilters.length) > 0) {
       var newColumnFilters = (cacheColumnFilters === null || cacheColumnFilters === void 0 ? void 0 : cacheColumnFilters.filter(function (item) {
         return tableColumnIds.includes(item.id);
       })) || [];
@@ -545,8 +564,8 @@ var TableMax = function TableMax(_ref) {
         size: 40,
         tooltip: false,
         enableResizing: false,
-        cell: function cell(_ref2) {
-          var row = _ref2.row;
+        cell: function cell(_ref3) {
+          var row = _ref3.row;
           return row.getCanExpand() ? /*#__PURE__*/_jsx("div", {
             onClick: function onClick(evt) {
               evt.stopPropagation();
@@ -567,8 +586,8 @@ var TableMax = function TableMax(_ref) {
         id: ColumnType.Selection,
         tooltip: false,
         enableResizing: false,
-        header: function header(_ref3) {
-          var table = _ref3.table;
+        header: function header(_ref4) {
+          var table = _ref4.table;
           return /*#__PURE__*/_jsx(Checkbox, {
             checked: table.getIsAllRowsSelected(),
             indeterminate: table.getIsSomePageRowsSelected(),
@@ -579,9 +598,9 @@ var TableMax = function TableMax(_ref) {
             }
           });
         },
-        cell: function cell(_ref4) {
-          var row = _ref4.row,
-            table = _ref4.table;
+        cell: function cell(_ref5) {
+          var row = _ref5.row,
+            table = _ref5.table;
           return /*#__PURE__*/_jsx(Checkbox, {
             checked: row.getIsSelected(),
             disabled: !row.getCanSelect(),
@@ -715,6 +734,7 @@ var TableMax = function TableMax(_ref) {
   /**缓存table数据 */
   useUpdateEffect(function () {
     var tableState = table.getState();
+    console.log(new Date(), 'new Date()');
     localStorage.setItem(tableKey, JSON.stringify({
       enableFilters: enableFilters,
       headerRowNum: headerRowNum,
@@ -725,7 +745,8 @@ var TableMax = function TableMax(_ref) {
       columnFilters: tableState.columnFilters,
       columnSorting: tableState.sorting,
       columnSizing: columnSizing,
-      editTime: new Date()
+      editTime: +new Date(),
+      editTimeCh: dayjs().format('YYYY-MM-DD HH:mm:ss')
     }));
   }, [table.getState().columnVisibility, table.getState().columnPinning, table.getState().columnOrder, table.getState().columnFilters, table.getState().sorting, enableFilters, headerRowNum, compactMode, columnSizing]);
   var reorderRow = useCallback(function (fromDatas, toDatas) {
@@ -872,7 +893,7 @@ var TableMax = function TableMax(_ref) {
 
   // 保存编辑内容
   var save = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _tableRows$find2;
       var newRow, _table$getRowModel3, tableRows, originRow;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -895,7 +916,7 @@ var TableMax = function TableMax(_ref) {
       }, _callee);
     }));
     return function save() {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
   var triggerSave = function triggerSave(e) {
@@ -1198,7 +1219,17 @@ var TableMax = function TableMax(_ref) {
             style: {
               width: "100%"
             },
-            children: table.getState().columnSizingInfo.isResizingColumn ? /*#__PURE__*/_jsx(MemoizedTableBody, _objectSpread({}, tableBodyProps)) : /*#__PURE__*/_jsx(TableBody, _objectSpread({}, tableBodyProps))
+            onMouseEnter: function onMouseEnter() {
+              var _tableBodyRef$current2;
+              // 给当前元素添加hover类
+              (_tableBodyRef$current2 = tableBodyRef.current) === null || _tableBodyRef$current2 === void 0 || _tableBodyRef$current2.classList.add('hover-active');
+            },
+            onMouseLeave: function onMouseLeave() {
+              var _tableBodyRef$current3;
+              // 移除当前元素的hover类
+              (_tableBodyRef$current3 = tableBodyRef.current) === null || _tableBodyRef$current3 === void 0 || _tableBodyRef$current3.classList.remove('hover-active');
+            },
+            children: /*#__PURE__*/_jsx(TableBody, _objectSpread({}, tableBodyProps))
           })]
         })
       }), pagination && /*#__PURE__*/_jsx("div", {
@@ -1206,6 +1237,7 @@ var TableMax = function TableMax(_ref) {
         children: tableMaxNewPagination ? /*#__PURE__*/_jsx(PaginationV2, {
           total: totalCount,
           pageSize: pageSize,
+          pageSizeOptions: pageSizeOptions !== null && pageSizeOptions !== void 0 ? pageSizeOptions : tableMaxConfig.globalPageSizeOptions,
           showLessItems: showLessItems,
           showSizeChanger: showSizeChanger,
           curPageDataNum: tableDatas.length,
@@ -1224,6 +1256,7 @@ var TableMax = function TableMax(_ref) {
           }
         }) : /*#__PURE__*/_jsx(Pagination, {
           pageSize: pageSize,
+          pageSizeOptions: pageSizeOptions !== null && pageSizeOptions !== void 0 ? pageSizeOptions : tableMaxConfig.globalPageSizeOptions,
           total: totalCount,
           defaultPageSize: pageSize,
           current: (skipCount || skipCount === 0) && pageSize ? skipCount / pageSize + 1 : 0,
@@ -1249,8 +1282,11 @@ var TableMax = function TableMax(_ref) {
     })
   });
 };
-export default /*#__PURE__*/React.forwardRef(function (props, ref) {
+
+// export default React.forwardRef((props: TableMaxProps, ref) => <TableMax {...props} refInstance={ref} />);
+
+export default /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (props, ref) {
   return /*#__PURE__*/_jsx(TableMax, _objectSpread(_objectSpread({}, props), {}, {
     refInstance: ref
   }));
-});
+}));

package/dist/components/TableMax/components/ColumnEdit/index.js

@@ -2,9 +2,8 @@ import { DatePicker, Form, Input, InputNumber, Tooltip } from 'antd';
 import NumberRange from "./components/numberRange";
 import RemoteSelect from "./components/remoteSelect";
 import "./index.less";
-
-// 编辑组件类型
 import { jsx as _jsx } from "react/jsx-runtime";
+// 编辑组件类型
 export var InputType = /*#__PURE__*/function (InputType) {
   InputType["InputNumber"] = "InputNumber";
   InputType["NumberRange"] = "NumberRange";
@@ -13,6 +12,7 @@ export var InputType = /*#__PURE__*/function (InputType) {
   InputType["Select"] = "Select";
   return InputType;
 }({});
+var defaultEditOptions = [];
 export var EditableCell = function EditableCell(_ref) {
   var _ref2;
   var editing = _ref.editing,
@@ -24,7 +24,7 @@ export var EditableCell = function EditableCell(_ref) {
     precision = _ref.precision,
     numberMin = _ref.numberMin,
     _ref$editOptions = _ref.editOptions,
-    editOptions = _ref$editOptions === void 0 ? [] : _ref$editOptions,
+    editOptions = _ref$editOptions === void 0 ? defaultEditOptions : _ref$editOptions,
     ellipsis = _ref.ellipsis,
     columnTooltip = _ref.tooltip,
     tableTooltip = _ref.tableTooltip,

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

@@ -10,7 +10,7 @@
 
 .filter-panel-wrapper {
   position: fixed;
-  // z-index: 9999;
+  z-index: 9999;
   border-radius: 2px;
   width: fit-content;
   height: fit-content;

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) => 1 | -1 | 0;
-export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
-export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
-export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
+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) => 1 | -1 | 0;
-    stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
-    timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
-    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
+    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/components/PaginationV2/index.js

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["showSizeChanger", "curPageDataNum"];
+var _excluded = ["showSizeChanger", "curPageDataNum", "pageSizeOptions"];
 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; }
@@ -16,26 +16,35 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Pagination, Select } from 'antd';
 import "./index.less";
 import { useTranslation } from "../../../../hooks/useTranslation";
+import { useMemo } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var defaultPageSizeOptions = [10, 20, 50, 100];
-var pageSizeOptions = defaultPageSizeOptions.map(function (size) {
-  return {
-    value: size,
-    label: size
-  };
-});
+// const pageSizeOptions = defaultPageSizeOptions.map(size => ({
+//   value: size,
+//   label: size,
+// }));
+
 var PaginationV2 = function PaginationV2(props) {
   var _useTranslation = useTranslation(),
     _useTranslation2 = _slicedToArray(_useTranslation, 1),
     t = _useTranslation2[0];
   var showSizeChanger = props.showSizeChanger,
     curPageDataNum = props.curPageDataNum,
+    globalPageSizeOptions = props.pageSizeOptions,
     rest = _objectWithoutProperties(props, _excluded);
   var handleChangePageSize = function handleChangePageSize(size) {
     // console.log('object :>> ', size, rest.current);
     rest.onChange(rest.current, size);
   };
+  var pageSizeOptions = useMemo(function () {
+    return (globalPageSizeOptions !== null && globalPageSizeOptions !== void 0 ? globalPageSizeOptions : defaultPageSizeOptions).map(function (size) {
+      return {
+        value: size,
+        label: size
+      };
+    });
+  }, [globalPageSizeOptions, defaultPageSizeOptions]);
   return /*#__PURE__*/_jsxs("div", {
     className: "table-max-pagination-wrapper",
     children: [/*#__PURE__*/_jsx("div", {

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

@@ -202,7 +202,7 @@ export var useColumnWidth = function useColumnWidth(_ref) {
       allCount = _getSizeInfo.allCount,
       columnSizeMap = _getSizeInfo.columnSizeMap;
     var cache = JSON.parse((_localStorage$getItem = localStorage.getItem(tableKey)) !== null && _localStorage$getItem !== void 0 ? _localStorage$getItem : '{}');
-    var now = Date.now();
+    var now = +Date.now();
     setState(produce(function (prevState) {
       // 初始化列宽映射
       var initColumnsSizeMap = _objectSpread({}, columnSizeMap);

package/dist/components/TableMax/tableMax.less

@@ -89,30 +89,30 @@
     display: flex;
     border-radius: @global-table-max-center-border-radius;
 
-    &:hover {
-      .scroll {
-        overflow: hidden auto;
-        width: 1rem;
-        flex-shrink: 0;
-        scrollbar-width: thin;
-        position: relative;
-        background: @globalColor0;
-        z-index: 1000;
-      }
-
-      .scroll::-webkit-scrollbar-thumb {
-        border: 6px solid transparent;
-        background: @scrollThumb;
-        border-radius: 10px;
-        background-clip: padding-box;
-      }
-
-      .scroll::-webkit-scrollbar-thumb:hover {
-        border: 4px solid transparent;
-        background: @scrollThumbHover;
-        background-clip: padding-box;
-      }
-    }
+    // &:hover {
+    //   .scroll {
+    //     overflow: hidden auto;
+    //     width: 1rem;
+    //     flex-shrink: 0;
+    //     scrollbar-width: thin;
+    //     position: relative;
+    //     background: @globalColor0;
+    //     z-index: 1000;
+    //   }
+
+    //   .scroll::-webkit-scrollbar-thumb {
+    //     border: 6px solid transparent;
+    //     background: @scrollThumb;
+    //     border-radius: 10px;
+    //     background-clip: padding-box;
+    //   }
+
+    //   .scroll::-webkit-scrollbar-thumb:hover {
+    //     border: 4px solid transparent;
+    //     background: @scrollThumbHover;
+    //     background-clip: padding-box;
+    //   }
+    // }
 
     .table-center {
       flex: 1;
@@ -157,36 +157,38 @@
           width: 10px;
           height: 10px;
         }
+        
+        &::-webkit-scrollbar-track, &::-webkit-scrollbar-corner {
+          background: @global-table-max-scrollbar-track !important;
+        }
 
         &::-webkit-scrollbar-thumb {
           border-radius: 20px;
           border: 6px solid transparent !important;
-          background: transparent !important;
+          background: @scrollThumb !important;
           background-clip: padding-box !important;
         }
 
-        &::-webkit-scrollbar-track, &::-webkit-scrollbar-corner {
-          background: @global-table-max-scrollbar-track !important;
+      }
+      .table-body.hover-active  {
+        &::-webkit-scrollbar-thumb {
+          border-radius: 20px;
+          border: 2px solid transparent !important;
+          background: @scrollThumb !important;
+          background-clip: padding-box !important;
         }
 
-        &:hover {
-          &::-webkit-scrollbar-thumb {
-            border-radius: 20px;
-            border: 3px solid transparent !important;
-            background: @scrollThumb !important;
-            background-clip: padding-box !important;
-          }
-
-          &::-webkit-scrollbar-thumb:hover {
-            border-radius: 20px;
-            border: 1px solid transparent !important;
-            background: @scrollThumb !important;
-            background-clip: padding-box !important;
-          }
+        &::-webkit-scrollbar-thumb:hover {
+          border-radius: 20px;
+          border: 1px solid transparent !important;
+          background: @scrollThumb !important;
+          background-clip: padding-box !important;
         }
       }
     }
 
+   
+
     .table-loading {
       display: flex;
       flex-direction: column;

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

@@ -316,6 +316,8 @@ export type TableMaxProps = {
     hasTotalRow?: boolean;
     /**总计行数据 { '列id': '数据' }*/
     totalDatas?: any[];
+    /**分页，每页多少条可选值 */
+    pageSizeOptions?: number[];
 };
 export interface TableMaxColumnType {
     /**每一列的id是唯一的 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.3.25",
+  "version": "2.3.27",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",
@@ -94,7 +94,7 @@
     "stylelint": "^14.9.1"
   },
   "peerDependencies": {
-    "antd": "^5.21.0",
+    "antd": "^5.27.3",
     "react": ">=17.0.1",
     "react-dom": ">=17.0.1",
     "umi-request": "^1.4.0"