@arim-aisdc/public-components 2.3.31 → 2.3.32

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/TableMax/TableBody/Row.js

@@ -324,7 +324,86 @@ var Row = function Row(_ref) {
   }, []);
 
   // 优化：将行渲染逻辑提取为useMemo
-  var rowCom = useMemo(function () {
+  // 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 renderCell = function renderCell(cell) {
       var _cellClassName;
       var _cell$column$columnDe = cell.column.columnDef,
@@ -389,7 +468,7 @@ 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]);
+  };
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [!!getRowHoverTipConfig ? /*#__PURE__*/_jsx(Tooltip, _objectSpread(_objectSpread({}, tooltipConfig), {}, {
       onOpenChange: onOpenChange,
@@ -400,8 +479,8 @@ var Row = function Row(_ref) {
       getPopupContainer: function getPopupContainer() {
         return tableBodyRef.current || document.body;
       },
-      children: rowCom
-    })) : rowCom, row.getIsExpanded() && /*#__PURE__*/_jsx("tr", {
+      children: rowCom()
+    })) : rowCom(), row.getIsExpanded() && /*#__PURE__*/_jsx("tr", {
       className: "tbody-tr-subrow",
       children: /*#__PURE__*/_jsx("td", {
         colSpan: row.getVisibleCells().length,

package/dist/components/TableMax/TableMax.js

@@ -456,7 +456,6 @@ var TableMax = function TableMax(_ref) {
     onExpandedChange: setExpanded,
     sortDescFirst: true // 首次排序为递减排序，不加这个属性的话，有些列的排序会有问题
   });
-  console.log(table, 'table');
 
   // 暴露给外部的api
   useImperativeHandle(refInstance, function () {
@@ -497,7 +496,6 @@ var TableMax = function TableMax(_ref) {
   var setColumnInfoFromCache = function setColumnInfoFromCache(tableColumns) {
     var _localStorage$getItem, _tableMaxConfig$cache;
     var cache = JSON.parse((_localStorage$getItem = localStorage.getItem(tableKey)) !== null && _localStorage$getItem !== void 0 ? _localStorage$getItem : '{}');
-    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;
     }
@@ -602,7 +600,6 @@ var TableMax = function TableMax(_ref) {
         cell: function cell(_ref5) {
           var row = _ref5.row,
             table = _ref5.table;
-          console.log("cell-check", row, table);
           return /*#__PURE__*/_jsx(Checkbox, {
             checked: row.getIsSelected(),
             disabled: !row.getCanSelect(),
@@ -737,7 +734,6 @@ 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,

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/package.json

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