@arim-aisdc/public-components 2.3.75 → 2.3.76

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 | JSX.Element | Element;
+    text: string | Element | JSX.Element;
     units?: string;
     width?: string;
     labelWidth?: string;

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

@@ -409,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, 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(), row.getIsExpanded()]);
   var rowCom = function rowCom() {
     var renderCell = function renderCell(cell) {
       var _cellClassName2;

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

@@ -58,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, 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

@@ -373,7 +373,7 @@ var VirtualRow = function VirtualRow(_ref) {
     }
   }, [
   // 依赖项保持不变
-  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, table.getState().columnSizing]);
+  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, table.getState().columnSizing, row.getIsExpanded(), table.getExpandedRowModel()]);
   var rowCom = function rowCom() {
     var renderCell = function renderCell(cell) {
       var _cellClassName2;

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

@@ -19,7 +19,7 @@ export var Total = function Total(_ref) {
     position: 'sticky',
     bottom: '0px',
     left: '0px',
-    zIndex: 202
+    zIndex: 222
   };
   var cellWrapperStyle = {
     boxSizing: 'border-box'

package/dist/components/TableMax/TableMax.js

@@ -213,7 +213,8 @@ var TableMax = function TableMax(_ref) {
     _ref$openVirtualRows = _ref.openVirtualRows,
     openVirtualRows = _ref$openVirtualRows === void 0 ? false : _ref$openVirtualRows,
     openNullValueFilter = _ref.openNullValueFilter,
-    openIndexColumn = _ref.openIndexColumn;
+    openIndexColumn = _ref.openIndexColumn,
+    version = _ref.version;
   var tableMaxRef = useRef(null);
   // 表格元素
   var tableContentRef = useRef(null);
@@ -345,7 +346,8 @@ var TableMax = function TableMax(_ref) {
       tableKeyPrefixCls: tableKeyPrefixCls,
       columnVisibleConfig: columnVisibleConfig,
       tableKey: tableKey,
-      cacheMaxAge: tableMaxConfig.cacheMaxAge
+      cacheMaxAge: tableMaxConfig.cacheMaxAge,
+      version: version
     }),
     columnSizing = _useColumnWidth.columnSizing,
     initializeColumnSizing = _useColumnWidth.initializeColumnSizing,
@@ -523,6 +525,7 @@ var TableMax = function TableMax(_ref) {
   var setColumnInfoFromCache = function setColumnInfoFromCache(tableColumns) {
     var _localStorage$getItem, _tableMaxConfig$cache, _cache$columnVisibili, _cache$columnPinning$, _cache$columnPinning, _cache$columnPinning$2, _cache$columnPinning2;
     var cache = JSON.parse((_localStorage$getItem = localStorage.getItem(tableKey)) !== null && _localStorage$getItem !== void 0 ? _localStorage$getItem : '{}');
+    if (version && version !== (cache === null || cache === void 0 ? void 0 : cache.version)) return;
     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;
     }
@@ -623,16 +626,20 @@ var TableMax = function TableMax(_ref) {
     }) === -1) {
       extraColumns.unshift({
         id: ColumnType.Expander,
-        header: ColumnType.Expander,
-        size: 40,
+        header: '展开/收起',
+        size: 80,
         tooltip: false,
         enableResizing: false,
         cell: function cell(_ref7) {
           var row = _ref7.row;
+          console.log(row.getIsExpanded(), '3333');
           return row.getCanExpand() ? /*#__PURE__*/_jsx("div", {
             onClick: function onClick(evt) {
               evt.stopPropagation();
               row.getToggleExpandedHandler()();
+              // row.toggleExpanded()
+
+              console.log(row.getIsExpanded(), table.getExpandedRowModel(), '3333');
             },
             style: {
               cursor: 'pointer'
@@ -842,7 +849,8 @@ var TableMax = function TableMax(_ref) {
       columnSorting: tableState.sorting,
       columnSizing: columnSizing,
       editTime: +new Date(),
-      editTimeCh: dayjs().format('YYYY-MM-DD HH:mm:ss')
+      editTimeCh: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      version: version
     }));
   }, [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) {

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 | 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;
+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;
 declare const customSortFns: {
-    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;
+    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;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

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

@@ -7,11 +7,12 @@ interface UseColumnWidthProps {
     columnVisibleConfig?: Record<string, boolean>;
     tableKey: string;
     cacheMaxAge?: number;
+    version?: string;
 }
 /**
  * 自定义Hook：表格列宽计算和管理
  */
-export declare const useColumnWidth: ({ tableContentRef, tableId, tableKeyPrefixCls, columnVisibleConfig, tableKey, cacheMaxAge, }: UseColumnWidthProps) => {
+export declare const useColumnWidth: ({ tableContentRef, tableId, tableKeyPrefixCls, columnVisibleConfig, tableKey, cacheMaxAge, version }: UseColumnWidthProps) => {
     columnSizing: ColumnSizing;
     allColumnCount: number;
     onColumnSizingChange: (updater: any) => void;

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

@@ -46,7 +46,8 @@ export var useColumnWidth = function useColumnWidth(_ref) {
     columnVisibleConfig = _ref$columnVisibleCon === void 0 ? {} : _ref$columnVisibleCon,
     tableKey = _ref.tableKey,
     _ref$cacheMaxAge = _ref.cacheMaxAge,
-    cacheMaxAge = _ref$cacheMaxAge === void 0 ? 1 * 60 * 60 * 1000 : _ref$cacheMaxAge;
+    cacheMaxAge = _ref$cacheMaxAge === void 0 ? 1 * 60 * 60 * 1000 : _ref$cacheMaxAge,
+    version = _ref.version;
   var _useState = useState({
       columnSizing: {},
       allColumnSizing: {},
@@ -218,7 +219,7 @@ export var useColumnWidth = function useColumnWidth(_ref) {
         var visibleColumnsSizeMap = {};
 
         // 处理缓存过期或无效的情况
-        if (!(cache !== null && cache !== void 0 && cache.editTime) || now - cache.editTime > cacheMaxAge) {
+        if (version && version !== (cache === null || cache === void 0 ? void 0 : cache.version) || !(cache !== null && cache !== void 0 && cache.editTime) || now - cache.editTime > cacheMaxAge) {
           Object.keys(initColumnsSizeMap).forEach(function (key) {
             if (columnVisibleConfig[key] !== false) {
               visibleColumnsSizeMap[key] = initColumnsSizeMap[key];

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

@@ -88,6 +88,8 @@ export type TableMaxProps = {
      */
     /**用于缓存,要保证tableId的唯一性 */
     tableId: string;
+    /**用于缓存，设置缓存版本 */
+    version?: string;
     /**列配置 */
     columns: TableMaxColumnType[];
     /**表格数据 */

package/package.json

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