@arim-aisdc/public-components 2.3.36 → 2.3.38

package/dist/components/CenterModal/CenterModal.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 = ["open", "title", "okText", "hasfooter", "footer", "width", "height", "size", "renderContent", "handleConfirm", "handleCancel", "confirmLoading", "maskClosable", "bodyStyle", "afterClose", "enableResizing", "enableDragging", "minResizeWidth", "minResizeHeight", "maxResizeWidth", "maxResizeHeight"];
+var _excluded = ["open", "title", "okText", "hasfooter", "footer", "width", "height", "size", "renderContent", "handleConfirm", "handleCancel", "confirmLoading", "maskClosable", "bodyStyle", "afterClose", "enableResizing", "enableDragging", "minResizeWidth", "minResizeHeight", "maxResizeWidth", "maxResizeHeight", "className"];
 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; }
@@ -13,14 +13,14 @@ import { Rnd } from 'react-rnd';
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 var resizeHandleClasses = {
-  bottom: "resizeHandleBottom",
-  bottomLeft: "resizeHandleBottomLeft",
-  bottomRight: "resizeHandleBottomRight",
-  left: "resizeHandleLeft",
-  right: "resizeHandleRight",
-  top: "resizeHandleTop",
-  topLeft: "resizeHandleTopLeft",
-  topRight: "resizeHandleTopRight"
+  bottom: 'resizeHandleBottom',
+  bottomLeft: 'resizeHandleBottomLeft',
+  bottomRight: 'resizeHandleBottomRight',
+  left: 'resizeHandleLeft',
+  right: 'resizeHandleRight',
+  top: 'resizeHandleTop',
+  topLeft: 'resizeHandleTopLeft',
+  topRight: 'resizeHandleTopRight'
 };
 var CenterModal = function CenterModal(_ref) {
   var _ref$open = _ref.open,
@@ -59,6 +59,7 @@ var CenterModal = function CenterModal(_ref) {
     _ref$maxResizeWidth = _ref.maxResizeWidth,
     maxResizeWidth = _ref$maxResizeWidth === void 0 ? 1800 : _ref$maxResizeWidth,
     maxResizeHeight = _ref.maxResizeHeight,
+    className = _ref.className,
     rest = _objectWithoutProperties(_ref, _excluded);
   var modalBodyRef = useRef(null);
   var modalBodySizeRef = useRef(null);
@@ -179,7 +180,7 @@ var CenterModal = function CenterModal(_ref) {
     }
   };
   return /*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread({
-    className: "centerModalContainer centerModal".concat(size),
+    className: "centerModalContainer centerModal".concat(size, " ").concat(className || ''),
     wrapClassName: 'wrapClassName',
     title: /*#__PURE__*/_jsx("div", {
       className: "modal-header ".concat(dragHandleClassName),

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

@@ -325,22 +325,37 @@ var Row = function Row(_ref) {
       }
     };
   }, []);
-
-  // 优化：将行渲染逻辑提取为useMemo
   var rowComMemo = useMemo(function () {
+    // 添加数据验证
+    if (!(row !== null && row !== void 0 && row.getVisibleCells)) {
+      console.warn('Row data not ready');
+      return null;
+    }
     var renderCell = function renderCell(cell) {
-      var _cellClassName;
+      var _cell$column, _cell$getValue, _cell$getValue2, _cellClassName;
+      // 确保 cell.column.columnDef 存在
+      if (!(cell !== null && cell !== void 0 && (_cell$column = cell.column) !== null && _cell$column !== void 0 && _cell$column.columnDef)) {
+        console.warn('Cell column definition missing', cell);
+        return null;
+      }
       var _cell$column$columnDe = cell.column.columnDef,
         columnEditable = _cell$column$columnDe.editable,
         accessorKey = _cell$column$columnDe.accessorKey,
         header = _cell$column$columnDe.header,
         columnClassName = _cell$column$columnDe.columnClassName,
-        id = _cell$column$columnDe.id,
+        columnId = _cell$column$columnDe.id,
         filterType = _cell$column$columnDe.filterType;
+
+      // 多重保障确保列ID不为undefined
+      var safeColumnId = columnId || accessorKey || (cell === null || cell === void 0 ? void 0 : cell.id) || "cell-".concat(Math.random().toString(36).slice(2, 9));
       var columnEditing = rowEditing && columnEditable;
-      var rawValue = cell.getValue();
+      var rawValue = (_cell$getValue = (_cell$getValue2 = cell.getValue) === null || _cell$getValue2 === void 0 ? void 0 : _cell$getValue2.call(cell)) !== null && _cell$getValue !== void 0 ? _cell$getValue : '';
 
-      // 创建增强上下文
+      // 检查必要的函数是否存在
+      if (typeof cell.getContext !== 'function') {
+        console.warn('cell.getContext is not a function', cell);
+        return null;
+      }
       var originalContext = cell.getContext();
       var enhancedContext = _objectSpread(_objectSpread({}, originalContext), {}, {
         getValue: function getValue() {
@@ -354,7 +369,7 @@ var Row = function Row(_ref) {
           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 || (_cellClassName = cellClassName(cell)) === null || _cellClassName === void 0 ? void 0 : _cellClassName.map(function (item) {
+      var cellClassNames = [columnEditing ? 'tbody-tr-td-editting' : '', safeColumnId === leftLastColumnId ? 'tbody-tr-td-cell-fix-left-last' : '', safeColumnId === rightFirstColumnId ? 'tbody-tr-td-cell-fix-right-first' : '', columnClassName ? columnClassName.join(' ') : ''].concat(_toConsumableArray((cellClassName === null || cellClassName === void 0 || (_cellClassName = cellClassName(cell)) === null || _cellClassName === void 0 ? void 0 : _cellClassName.map(function (item) {
         return "".concat(item, "-").concat(theme);
       })) || []), ['tbody-tr-td']).filter(Boolean).join(' ');
       return /*#__PURE__*/_jsx("td", _objectSpread(_objectSpread({
@@ -376,23 +391,31 @@ var Row = function Row(_ref) {
         }))
       }), 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)
-    });
-  }, [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()]);
+    try {
+      var cells = row.getVisibleCells();
+      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: cells.map(renderCell)
+      });
+    } catch (error) {
+      console.error('Error rendering row:', error);
+      return null;
+    }
+  }, [
+  // 依赖项保持不变
+  row, row.id, 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()]);
   var rowCom = function rowCom() {
     var renderCell = function renderCell(cell) {
       var _cellClassName2;

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

@@ -78,4 +78,3 @@ type TableBodyPropsType = {
 };
 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, openMemo }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;

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

@@ -517,6 +517,7 @@ var TableBody = function TableBody(_ref) {
 export default TableBody;
 // export default React.memo(TableBody, (prev, next) => prev.table.getState() !== next.table.getState() );
 
-export var MemoizedTableBody = /*#__PURE__*/React.memo(TableBody, function (prev, next) {
-  return prev.table.options.data === next.table.options.data;
-});
+// export const MemoizedTableBody = React.memo(
+//   TableBody,
+//   (prev, next) => prev.table.options.data === next.table.options.data
+// ) as typeof TableBody

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) => 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;
 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) => 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;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

package/package.json

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