@arim-aisdc/public-components 2.3.55 → 2.3.57

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/ConfigProvider/context.d.ts

@@ -33,6 +33,8 @@ export interface ConfigConsumerProps {
         openMemo?: boolean;
         canSelectionUseShift?: boolean;
     };
+    keepAliveActivateKey?: number;
+    keepAliveUnactivateKey?: number;
 }
 export declare const DEFAULT_CONTEXT: {
     theme: string;

package/dist/components/CustomForm/CustomForm.js

@@ -260,6 +260,7 @@ var CustomForm = function CustomForm(_ref, ref) {
       case CustomFormItemType.TextArea:
         element = /*#__PURE__*/_jsx(TextArea, {
           rows: item.rows,
+          disabled: item.disabled,
           placeholder: item.inputTips,
           maxLength: item.maxLength,
           onChange: function onChange(e) {

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]);
+  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]);
   var rowCom = function rowCom() {
     var renderCell = function renderCell(cell) {
       var _cellClassName2;

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

@@ -70,6 +70,7 @@ type TableBodyPropsType = {
     openMemo?: boolean;
     openVirtualColumns?: boolean;
     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, }: 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, tableKey }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
 export { VirtualTableBody };

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

@@ -78,13 +78,14 @@ var VirtualTableBody = function VirtualTableBody(_ref) {
     setRowSelection = _ref.setRowSelection,
     openMemo = _ref.openMemo,
     _ref$openVirtualRows = _ref.openVirtualRows,
-    openVirtualRows = _ref$openVirtualRows === void 0 ? false : _ref$openVirtualRows;
+    openVirtualRows = _ref$openVirtualRows === void 0 ? false : _ref$openVirtualRows,
+    tableKey = _ref.tableKey;
   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 _useVirtualCalculatio = useVirtualCalculations(table, {
+  var _useVirtualCalculatio = useVirtualCalculations(table, tableKey, {
       openVirtualRows: openVirtualRows,
       rowHeight: rowHeight
     }, tableBodyRef),

package/dist/components/TableMax/TableMax.js

@@ -1143,7 +1143,8 @@ var TableMax = function TableMax(_ref) {
     totalDatas: totalDatas,
     setRowSelection: setRowSelection,
     openMemo: openMemo !== null && openMemo !== void 0 ? openMemo : tableMaxConfig === null || tableMaxConfig === void 0 ? void 0 : tableMaxConfig.openMemo,
-    openVirtualRows: openVirtualRows
+    openVirtualRows: openVirtualRows,
+    tableKey: tableKey
   };
   var changeCompactMode = function changeCompactMode() {
     changeCompactModeStyle(!compactMode);

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/useVirtualCalculations.d.ts

@@ -1,8 +1,8 @@
 import { VirtualScrollConfig } from '../contexts';
-export declare const useVirtualCalculations: (table: any, config: VirtualScrollConfig, tableBodyRef: React.RefObject<HTMLDivElement>) => {
+export declare const useVirtualCalculations: (table: any, tableKey: string, config: VirtualScrollConfig, tableBodyRef: React.RefObject<HTMLDivElement>) => {
     state: {
         rowVirtualizer: import("@tanstack/virtual-core").Virtualizer<HTMLDivElement, Element>;
-        virtualRows: import("@tanstack/virtual-core").VirtualItem[];
+        virtualRows: any[];
     };
     isVirtualEnabled: boolean;
 };

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

@@ -1,14 +1,44 @@
+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; }
 // hooks/useVirtualCalculations.ts
-import { useEffect, useMemo } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { useVirtualizer } from '@tanstack/react-virtual';
-export var useVirtualCalculations = function useVirtualCalculations(table, config, tableBodyRef) {
+import { useConfig } from "../../ConfigProvider";
+export var useVirtualCalculations = function useVirtualCalculations(table, tableKey, config, tableBodyRef) {
+  var _rowVirtualizer$getVi;
   var isVirtualEnabled = shouldEnableVirtualization(config);
+  var _useConfig = useConfig(),
+    keepAliveActivateKey = _useConfig.keepAliveActivateKey,
+    keepAliveUnactivateKey = _useConfig.keepAliveUnactivateKey;
+  // 监听页面激活状态
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    virtualizerRefreshKey = _useState2[0],
+    setVirtualizerRefreshKey = _useState2[1];
+  var lastVirtualRows = useRef([]);
+  useEffect(function () {
+    if (keepAliveActivateKey) {
+      console.log('检测到页面激活，刷新虚拟化器:', keepAliveActivateKey);
+      setVirtualizerRefreshKey(function (prev) {
+        return prev + 1;
+      });
+    }
+  }, [keepAliveActivateKey]);
+  useEffect(function () {
+    if (keepAliveUnactivateKey) {
+      console.log('检测到页面挂起，缓存数据:', keepAliveUnactivateKey);
+      lastVirtualRows.current = virtualRows;
+    }
+  }, [keepAliveUnactivateKey]);
 
   // 行虚拟化配置 - 包含 rowHeight 依赖
   var rows = table.getRowModel().rows;
   var rowVirtualizerConfig = useMemo(function () {
     if (!config.openVirtualRows) return null;
-    console.log(config, 'config111');
     return {
       count: rows.length,
       estimateSize: function estimateSize() {
@@ -18,21 +48,35 @@ export var useVirtualCalculations = function useVirtualCalculations(table, confi
       getScrollElement: function getScrollElement() {
         return tableBodyRef.current;
       },
-      overscan: config.rowOverscan || 10
+      overscan: config.rowOverscan || 10,
+      key: virtualizerRefreshKey
     };
   }, [config.openVirtualRows, rows.length, config.rowHeight,
   // 关键：包含 rowHeight 依赖
-  config.rowOverscan, tableBodyRef.current]);
+  config.rowOverscan, virtualizerRefreshKey, tableKey]);
   var rowVirtualizer = rowVirtualizerConfig ? useVirtualizer(rowVirtualizerConfig) : null;
 
   // 响应 rowHeight 变化
   useEffect(function () {
     if (rowVirtualizer && config.openVirtualRows) {
       // 当 rowHeight 变化时，重新测量所有行
+      console.log('rowHeight数据变化，重新测量', rows.length);
       rowVirtualizer.measure();
+      console.log('rowVirtualizer.measure1');
     }
   }, [config.rowHeight, rowVirtualizer, config.openVirtualRows]);
-  var virtualRows = config.openVirtualRows ? (rowVirtualizer === null || rowVirtualizer === void 0 ? void 0 : rowVirtualizer.getVirtualItems()) || [] : [];
+
+  // 响应数据变化
+  useEffect(function () {
+    if (rowVirtualizer && config.openVirtualRows && rows.length > 0) {
+      console.log('数据变化，重新测量', rows.length);
+      setTimeout(function () {
+        rowVirtualizer.measure();
+        console.log('rowVirtualizer.measure2');
+      }, 50);
+    }
+  }, [rows.length, rowVirtualizer, config.openVirtualRows]);
+  var virtualRows = config.openVirtualRows ? (_rowVirtualizer$getVi = rowVirtualizer === null || rowVirtualizer === void 0 ? void 0 : rowVirtualizer.getVirtualItems()) !== null && _rowVirtualizer$getVi !== void 0 ? _rowVirtualizer$getVi : lastVirtualRows.current : [];
   var state = useMemo(function () {
     return {
       rowVirtualizer: rowVirtualizer,

package/dist/components/TableMax/tableMax.less

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

package/package.json

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