@arim-aisdc/public-components 2.3.50 → 2.3.52

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/components/Total.js

@@ -50,9 +50,9 @@ export var Total = function Total(_ref2) {
   };
   var cellWrapperStyle = {
     boxSizing: 'border-box',
+    height: "".concat(rowHeight, "px"),
     borderTop: '1px solid var(--tableColor2)',
-    borderBottom: '1px solid var(--tableColor2)',
-    height: "100%"
+    borderBottom: '1px solid var(--tableColor2)'
   };
 
   // 统一的单元格渲染函数

package/dist/components/TableMax/TableHeader/VirtualTableHeader/ColGroup.js

@@ -18,7 +18,6 @@ export var ColGroup = function ColGroup(_ref) {
   };
   var _useVirtualConfig = useVirtualConfig(),
     openVirtualColumns = _useVirtualConfig.openVirtualColumns;
-  console.log(scrollableColumns, rightPinnedColumns, virtualColumns, virtualPaddingLeft, virtualPaddingRight, 'leftPinnedColumns');
   return /*#__PURE__*/_jsxs("colgroup", {
     children: [leftPinnedColumns === null || leftPinnedColumns === void 0 ? void 0 : leftPinnedColumns.map(renderColumn), !openVirtualColumns ? scrollableColumns.map(renderColumn) : /*#__PURE__*/_jsxs(_Fragment, {
       children: [Number(virtualPaddingLeft) > 0 && /*#__PURE__*/_jsx("col", {

package/dist/components/TableMax/TableMax.js

@@ -206,7 +206,7 @@ var TableMax = function TableMax(_ref) {
     _ref$openVirtualColum = _ref.openVirtualColumns,
     openVirtualColumns = _ref$openVirtualColum === void 0 ? false : _ref$openVirtualColum,
     _ref$openVirtualRows = _ref.openVirtualRows,
-    openVirtualRows = _ref$openVirtualRows === void 0 ? true : _ref$openVirtualRows;
+    openVirtualRows = _ref$openVirtualRows === void 0 ? false : _ref$openVirtualRows;
   var tableMaxRef = useRef(null);
   // 表格元素
   var tableContentRef = useRef(null);
@@ -528,6 +528,7 @@ var TableMax = function TableMax(_ref) {
       setheaderRowNum(cacheHeaderRowNum);
     }
     setCompactMode(cacheCompactMode === true);
+    setRowHeight(cacheCompactMode === true ? compactModeRowHeight : propsRowHeight);
     var newColumnVisibleConfig = _objectSpread(_objectSpread({}, columnVisibleConfig), cacheColumnVisibility);
     setColumnVisibility(newColumnVisibleConfig);
 
@@ -1114,10 +1115,8 @@ var TableMax = function TableMax(_ref) {
   };
   var changeCompactMode = function changeCompactMode() {
     setCompactMode(!compactMode);
+    setRowHeight(!compactMode ? compactModeRowHeight : propsRowHeight);
   };
-  useUpdateEffect(function () {
-    setRowHeight(compactMode ? compactModeRowHeight : propsRowHeight);
-  }, [propsRowHeight, compactMode]);
   var virtualConfig = useMemo(function () {
     return {
       openVirtualColumns: openVirtualColumns,
@@ -1306,15 +1305,13 @@ var TableMax = function TableMax(_ref) {
             ref: tableContentRef
             // style={{ maxHeight: !autoHeight ? defaultScrollY : 'fit-content' }}
             ,
-            children: [/*#__PURE__*/_jsxs("div", {
+            children: [/*#__PURE__*/_jsx("div", {
               className: "table-header-wrapper",
-              children: [/*#__PURE__*/_jsx("div", {
+              children: /*#__PURE__*/_jsx("div", {
                 ref: tableHeaderRef,
                 className: "table-header",
                 children: /*#__PURE__*/_jsx(TableHeader, _objectSpread({}, tableHeaderProps))
-              }), /*#__PURE__*/_jsx("div", {
-                className: "table-header-scroll"
-              })]
+              })
             }), /*#__PURE__*/_jsx("div", {
               ref: tableBodyRef,
               className: "table-body"

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

@@ -94,7 +94,7 @@ export var EditableCell = function EditableCell(_ref) {
   return /*#__PURE__*/_jsx("div", {
     className: "table-max-cell-wrapper",
     style: {
-      width: "".concat(width, "px")
+      width: width ? "".concat(width, "px") : 'auto'
     },
     children: editing ? /*#__PURE__*/_jsx(Form.Item, {
       name: dataIndex,

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) => 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 | 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) => 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/dist/components/TableMax/hooks/useColumnWidth.js

@@ -17,9 +17,10 @@ import { getSizeInfo } from "../utils";
 
 // 可配置的常量
 var DEFAULT_MIN_SIZE = 120;
-var DEFAULT_MAX_SIZE = 240;
+var DEFAULT_MAX_SIZE = 2000;
 var DEFAULT_RESIZE_DEBOUNCE = 200;
-var DEFAULT_TABLE_PADDING = 10;
+// const DEFAULT_TABLE_PADDING = 10;
+var DEFAULT_TABLE_PADDING = 0;
 /**
  * 获取表格容器的有效宽度（减去边框）
  */
@@ -189,6 +190,18 @@ export var useColumnWidth = function useColumnWidth(_ref) {
         result[key] = Math.min(result[key] + averageExtra, DEFAULT_MAX_SIZE);
       });
     }
+
+    // console.log({
+    //   currentWidth,
+    //   columnsSizeMap,
+    //   adjustableColumns,
+    //   hasWidthColumns,
+    //   noWidthColumns,
+    //   totalWidth,
+    //   remainWidth,
+    //   result
+    // }, 'hasWidthColumns')
+
     return result;
   }, [getAdjustableColumns, getTableWidth, state.tableContainerWidth]);
 
@@ -226,6 +239,15 @@ export var useColumnWidth = function useColumnWidth(_ref) {
         });
       }
 
+      // console.log({
+      //   prevState,
+      //   initColumnsSizeMap,
+      //   visibleColumnsSizeMap,
+      //   cache,
+      //   cacheMaxAge
+
+      // }, 'columnSizeMap123')
+
       // 计算可见列数
       var visibleCount = allCount - Object.keys(columnVisibleConfig).filter(function (key) {
         return !columnVisibleConfig[key];

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

@@ -16,18 +16,19 @@ export var useVirtualCalculations = function useVirtualCalculations(table, confi
   // 列虚拟化配置
   var columnVirtualizerConfig = useMemo(function () {
     if (!config.openVirtualColumns) return null;
+    console.log('columnVirtualizerConfig');
     return {
       count: scrollableColumns.length,
       estimateSize: function estimateSize(index) {
         return scrollableColumns[index].getSize();
       },
       getScrollElement: function getScrollElement() {
-        return tableBodyRef.current;
+        return tableHeaderRef.current;
       },
       horizontal: true,
       overscan: config.columnOverscan || 3
     };
-  }, [config.openVirtualColumns, scrollableColumns.length, config.columnOverscan, tableBodyRef.current]);
+  }, [config.openVirtualColumns, scrollableColumns.length, config.columnOverscan, tableHeaderRef.current]);
   var columnVirtualizer = columnVirtualizerConfig ? useVirtualizer(columnVirtualizerConfig) : null;
   var virtualColumns = config.openVirtualColumns ? (columnVirtualizer === null || columnVirtualizer === void 0 ? void 0 : columnVirtualizer.getVirtualItems()) || [] : [];
   var _useMemo2 = useMemo(function () {
@@ -83,14 +84,6 @@ export var useVirtualCalculations = function useVirtualCalculations(table, confi
   };
 };
 export var separateColumns = function separateColumns(table, openVirtualColumns) {
-  // if (!openVirtualColumns) {
-  //   return {
-  //     leftPinnedColumns: [],
-  //     rightPinnedColumns: [],
-  //     scrollableColumns: visibleColumns,
-  //   };
-  // }
-
   return {
     leftPinnedColumns: table.getLeftVisibleLeafColumns(),
     rightPinnedColumns: table.getRightVisibleLeafColumns(),

package/dist/components/TableMax/tableMax.less

@@ -134,11 +134,11 @@
           overflow: hidden;
           box-sizing: border-box;
           height: fit-content;
-          width: calc(100% - 10px);
+          // width: calc(100% - 10px);
           margin: 0;
           // flex: 1;
           justify-content: space-between;
-          // overflow-y: scroll;
+          overflow-y: scroll;
           .cell-wapper {
             line-height: @global-table-max-header-cell-wapper-line-height;
           }
@@ -290,7 +290,7 @@
     line-height: 30px !important;
 
     .table-max-cell-wrapper {
-      padding: 0 2px;
+      padding: 1px 2px;
       line-height: 28px;
     }
   }

package/package.json

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