@arim-aisdc/public-components 2.3.32 → 2.3.34

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

@@ -29,6 +29,7 @@ export interface ConfigConsumerProps {
     tableMax?: {
         pageSizeOptions?: number[];
         cacheMaxAge?: number;
+        openMemo?: boolean;
     };
 }
 export declare const DEFAULT_CONTEXT: {

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

@@ -60,6 +60,7 @@ type IRowProps = {
     dropSide: DropSide;
     onEditValueChange?: (field: string, value: any, extra?: any) => void;
     setRowSelection?: Function;
+    openMemo?: boolean;
 };
-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, setRowSelection }: IRowProps) => import("react/jsx-runtime").JSX.Element;
+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, setRowSelection, openMemo }: IRowProps) => import("react/jsx-runtime").JSX.Element;
 export default Row;

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

@@ -75,7 +75,8 @@ var Row = function Row(_ref) {
     hoverRowIndex = _ref.hoverRowIndex,
     dropSide = _ref.dropSide,
     onEditValueChange = _ref.onEditValueChange,
-    setRowSelection = _ref.setRowSelection;
+    setRowSelection = _ref.setRowSelection,
+    openMemo = _ref.openMemo;
   var _useConfig = useConfig(),
     dateFormat = _useConfig.dateFormat;
   var timerRef = useRef();
@@ -245,7 +246,7 @@ var Row = function Row(_ref) {
     } else if (Object.keys(selectionConfig).length > 1) {
       delete selectionConfig[row.id];
     }
-    setRowSelection(_objectSpread({}, selectionConfig));
+    // setRowSelection({ ...selectionConfig });
   }, [row, table]);
   var handleShiftSelection = useCallback(function () {
     var min = Math.min(initselectedIndex || 0, row.index);
@@ -256,11 +257,12 @@ var Row = function Row(_ref) {
     }).forEach(function (row) {
       selectionConfig[row.id] = true;
     });
-    setRowSelection(selectionConfig);
+
+    // setRowSelection(selectionConfig);
   }, [row, table]);
   var handleSingleRowSelection = useCallback(function () {
     initselectedIndex = row.index;
-    setRowSelection(_defineProperty({}, row === null || row === void 0 ? void 0 : row.id, true));
+    // setRowSelection({ [row?.id]: true });
   }, [row, table]);
   var handleShiftSelectionWithCheckbox = useCallback(function () {
     var selectionConfig = _objectSpread({}, table.getState().rowSelection);
@@ -271,7 +273,8 @@ var Row = function Row(_ref) {
     }).forEach(function (row) {
       selectionConfig[row.id] = true;
     });
-    setRowSelection(selectionConfig);
+
+    // setRowSelection(selectionConfig);
   }, [row, table]);
   var handleToggleSelection = useCallback(function () {
     if (!row.getIsSelected()) {
@@ -279,7 +282,7 @@ var Row = function Row(_ref) {
     }
     var selectionConfig = _objectSpread(_objectSpread({}, table.getState().rowSelection), {}, _defineProperty({}, row.id, !row.getIsSelected()));
     if (row.getCanSelect()) {
-      setRowSelection(selectionConfig);
+      // setRowSelection(selectionConfig);
     }
   }, [row, table]);
   var handleSingleSelection = useCallback(function (evt) {
@@ -324,86 +327,8 @@ var Row = function Row(_ref) {
   }, []);
 
   // 优化：将行渲染逻辑提取为useMemo
-  // const rowCom = useMemo(() => {
-  //   const renderCell = (cell: any) => {
-  //     const { editable: columnEditable, accessorKey, header, columnClassName, id, filterType } = cell.column.columnDef;
-  //     const columnEditing = rowEditing && columnEditable;
-  //     const rawValue = cell.getValue();
-
-  //     // 创建增强上下文
-  //     const originalContext = cell.getContext();
-  //     const enhancedContext: any = {
-  //       ...originalContext,
-  //       getValue: () => rawValue,
-  //       getFormattedValue: () =>
-  //         isDateColumn(cell.column.columnDef)
-  //           ? formatDate(rawValue, cell.column.columnDef?.meta?.dateFormat || dateFormat)
-  //           : rawValue,
-  //       renderValue: () => enhancedContext.getFormattedValue()
-  //     };
-
-  //     const cellClassNames = [
-  //       columnEditing ? 'tbody-tr-td-editting' : '',
-  //       id === leftLastColumnId ? 'tbody-tr-td-cell-fix-left-last' : '',
-  //       id === rightFirstColumnId ? 'tbody-tr-td-cell-fix-right-first' : '',
-  //       columnClassName ? columnClassName.join(' ') : '',
-  //       ...(cellClassName?.(cell)?.map((item: any) => `${item}-${theme}`) || []),
-  //       'tbody-tr-td'
-  //     ].filter(Boolean).join(' ');
-
-  //     return (
-  //       <td
-  //         className={cellClassNames}
-  //         key={cell.id}
-  //         style={{
-  //           height: rowHeight - 1,
-  //           ...getPinningStyle(cell, table, false),
-  //         }}
-  //         onContextMenu={e => handleCellRightClick(e, cell)}
-  //         {...getCellProps?.(cell.getContext())}
-  //       >
-  //         {EditableCell({
-  //           ...cell.column.columnDef,
-  //           tableTooltip: tableTooltip,
-  //           editing: columnEditing,
-  //           dataIndex: accessorKey,
-  //           title: header,
-  //           onEditValueChange: onEditValueChange,
-  //           children: flexRender(cell.column.columnDef.cell, enhancedContext)
-  //         })}
-  //       </td>
-  //     );
-  //   };
-
-  //   return (
-  //     <tr
-  //       id={rowEditing ? `${tableId}-tbody-tr-editing` : undefined}
-  //       ref={node => {
-  //         dropRef(node && !editting ? node : null);
-  //         dragRef(node && canRowDrag && !editting && !disableDragRowIds?.includes(row.id) ? node : null);
-  //       }}
-  //       style={{
-  //         opacity: isDragging || (selectedRowDragging && row.getIsSelected()) ? 0.5 : 1,
-  //         cursor: canRowDrag && !editting && !disableDragRowIds?.includes(row.id) ? 'move' : 'auto',
-  //         ...rowStyle,
-  //       }}
-  //       onClick={handleRowClick}
-  //       onMouseEnter={rowMouseEnter}
-  //       onMouseLeave={rowMouseLeave}
-  //       className={rowClassNames}
-  //     >
-  //       {row.getVisibleCells().map(renderCell)}
-  //     </tr>
-  //   );
-  // }, [
-  //   row, rowEditing, tableId, editting, canRowDrag, disableDragRowIds, isDragging,
-  //   selectedRowDragging, rowStyle, handleRowClick, rowMouseEnter, rowMouseLeave,
-  //   rowClassNames, leftLastColumnId, rightFirstColumnId, cellClassName, theme,
-  //   rowHeight, table, handleCellRightClick, getCellProps, tableTooltip,
-  //   onEditValueChange, dateFormat,
-  // ]);
-
-  var rowCom = function rowCom() {
+  var rowComMemo = useMemo(function () {
+    console.log(row.getIsSelected(), row.renderValue(), 'row.getIsSelected()');
     var renderCell = function renderCell(cell) {
       var _cellClassName;
       var _cell$column$columnDe = cell.column.columnDef,
@@ -468,6 +393,72 @@ var Row = function Row(_ref) {
       className: rowClassNames,
       children: row.getVisibleCells().map(renderCell)
     });
+  }, [row, rowEditing, tableId, editting, canRowDrag, disableDragRowIds, isDragging, selectedRowDragging, rowStyle, handleRowClick, rowMouseEnter, rowMouseLeave, rowClassNames, leftLastColumnId, rightFirstColumnId, cellClassName, theme, rowHeight, table, handleCellRightClick, getCellProps, tableTooltip, onEditValueChange, dateFormat, row.getVisibleCells(), row.getIsSelected(), row.getValue(), row.renderValue()]);
+  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 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' : '', id === leftLastColumnId ? 'tbody-tr-td-cell-fix-left-last' : '', id === rightFirstColumnId ? 'tbody-tr-td-cell-fix-right-first' : '', 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({
+          height: rowHeight - 1
+        }, 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), {}, {
+          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);
+        dragRef(node && canRowDrag && !editting && !(disableDragRowIds !== null && disableDragRowIds !== void 0 && disableDragRowIds.includes(row.id)) ? node : null);
+      },
+      style: _objectSpread({
+        opacity: isDragging || selectedRowDragging && row.getIsSelected() ? 0.5 : 1,
+        cursor: canRowDrag && !editting && !(disableDragRowIds !== null && disableDragRowIds !== void 0 && disableDragRowIds.includes(row.id)) ? 'move' : 'auto'
+      }, rowStyle),
+      onClick: handleRowClick,
+      onMouseEnter: rowMouseEnter,
+      onMouseLeave: rowMouseLeave,
+      className: rowClassNames,
+      children: row.getVisibleCells().map(renderCell)
+    });
   };
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [!!getRowHoverTipConfig ? /*#__PURE__*/_jsx(Tooltip, _objectSpread(_objectSpread({}, tooltipConfig), {}, {
@@ -479,8 +470,8 @@ var Row = function Row(_ref) {
       getPopupContainer: function getPopupContainer() {
         return tableBodyRef.current || document.body;
       },
-      children: rowCom()
-    })) : rowCom(), 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: row.getVisibleCells().length,

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

@@ -74,7 +74,8 @@ type TableBodyPropsType = {
     hasTotalRow?: boolean;
     totalDatas?: any[];
     setRowSelection: Function;
+    openMemo?: boolean;
 };
-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, setRowSelection }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
+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, setRowSelection, openMemo }: 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, setRowSelection }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
+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, setRowSelection, openMemo }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;

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

@@ -76,7 +76,8 @@ var TableBody = function TableBody(_ref) {
     onEditValueChange = _ref.onEditValueChange,
     hasTotalRow = _ref.hasTotalRow,
     totalDatas = _ref.totalDatas,
-    setRowSelection = _ref.setRowSelection;
+    setRowSelection = _ref.setRowSelection,
+    openMemo = _ref.openMemo;
   var _useConfig = useConfig(),
     root = _useConfig.root;
   var headerGroups = table.getHeaderGroups();
@@ -373,7 +374,8 @@ var TableBody = function TableBody(_ref) {
         hoverRowIndex: hoverRowIndex,
         dropSide: dropSide,
         onEditValueChange: onEditValueChange,
-        setRowSelection: setRowSelection
+        setRowSelection: setRowSelection,
+        openMemo: openMemo
       }, row.id);
     });
   };
@@ -387,7 +389,7 @@ var TableBody = function TableBody(_ref) {
   // console.log('rowHeight :>>', rowHeight);
 
   var TableRow = useMemo(function () {
-    console.log(TableRow, 'TableRow');
+    console.log(table.getRowModel().rows, 'TableRow');
     return table.getRowModel().rows;
   }, [table, table.getState().rowSelection]);
   return (
@@ -468,7 +470,8 @@ var TableBody = function TableBody(_ref) {
                 hoverRowIndex: hoverRowIndex,
                 dropSide: dropSide,
                 onEditValueChange: onEditValueChange,
-                setRowSelection: setRowSelection
+                setRowSelection: setRowSelection,
+                openMemo: openMemo
               }, row.id);
             })
             // TBodyContent()

package/dist/components/TableMax/TableMax.js

@@ -193,7 +193,8 @@ var TableMax = function TableMax(_ref) {
     onEditValueChange = _ref.onEditValueChange,
     hasTotalRow = _ref.hasTotalRow,
     totalDatas = _ref.totalDatas,
-    pageSizeOptions = _ref.pageSizeOptions;
+    pageSizeOptions = _ref.pageSizeOptions,
+    openMemo = _ref.openMemo;
   var tableMaxRef = useRef(null);
   // 表格元素
   var tableContentRef = useRef(null);
@@ -215,10 +216,12 @@ var TableMax = function TableMax(_ref) {
   var tableMaxConfig = useMemo(function () {
     var _ref2 = tableMax || {},
       globalPageSizeOptions = _ref2.pageSizeOptions,
-      cacheMaxAge = _ref2.cacheMaxAge;
+      cacheMaxAge = _ref2.cacheMaxAge,
+      openMemo = _ref2.openMemo;
     return {
       globalPageSizeOptions: globalPageSizeOptions,
-      cacheMaxAge: cacheMaxAge
+      cacheMaxAge: cacheMaxAge,
+      openMemo: openMemo
     };
   }, [JSON.stringify(tableMax)]);
 
@@ -550,6 +553,10 @@ var TableMax = function TableMax(_ref) {
     }
     setColumnOrder(arr);
   };
+  var _useState39 = useState(0),
+    _useState40 = _slicedToArray(_useState39, 2),
+    checkboxRender = _useState40[0],
+    setCheckboxRender = _useState40[1];
   var setColumnsByProps = useCallback(function () {
     var extraColumns = [];
     if (getRowCanExpand() && columns.findIndex(function (column) {
@@ -613,6 +620,9 @@ var TableMax = function TableMax(_ref) {
                 }
                 return item.getIsSelected();
               });
+              setCheckboxRender(function (prev) {
+                return prev + 1;
+              });
               onRowCheckboxClick === null || onRowCheckboxClick === void 0 || onRowCheckboxClick(row, row.original, !row.getIsSelected(), curSelectedRows);
               // 阻止点击事件冒泡，监听行双击事件时，点击这里会有问题
               e.stopPropagation();
@@ -1067,7 +1077,8 @@ var TableMax = function TableMax(_ref) {
     onEditValueChange: onEditValueChange,
     hasTotalRow: hasTotalRow,
     totalDatas: totalDatas,
-    setRowSelection: setRowSelection
+    setRowSelection: setRowSelection,
+    openMemo: openMemo !== null && openMemo !== void 0 ? openMemo : tableMaxConfig === null || tableMaxConfig === void 0 ? void 0 : tableMaxConfig.openMemo
   };
   var changeCompactMode = function changeCompactMode() {
     setCompactMode(!compactMode);

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

@@ -318,6 +318,7 @@ export type TableMaxProps = {
     totalDatas?: any[];
     /**分页，每页多少条可选值 */
     pageSizeOptions?: number[];
+    openMemo?: boolean;
 };
 export interface TableMaxColumnType {
     /**每一列的id是唯一的 */
@@ -400,6 +401,8 @@ export interface TableMaxColumnType {
         /**日期展示格式 */
         dateFormat?: string;
     };
+    /** 是否缓存行单元格 */
+    openMemo?: boolean;
 }
 export type FormatFilterType = {
     field: string;

package/package.json

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