@arim-aisdc/public-components 2.3.61 → 2.3.63

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/VirtualTableBody.js

@@ -93,7 +93,6 @@ var VirtualTableBody = function VirtualTableBody(_ref) {
   // 从 Provider 中获取虚拟化数据
   var rowVirtualizer = state.rowVirtualizer;
   var virtualRows = rowVirtualizer === null || rowVirtualizer === void 0 ? void 0 : rowVirtualizer.getVirtualItems();
-  console.log(rowVirtualizer, virtualRows, 'virtualRows');
   var _useState = useState({
       visible: false,
       clientX: 0,

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

@@ -28,6 +28,8 @@ table {
     height: 0;
     border-bottom: 1px solid @tableColor2;
     z-index: 210;
+    display: block;
+    box-sizing: border-box;
   }
 }
 
@@ -38,9 +40,10 @@ table {
     left: 0;
     top: 0;
     width: 100%;
-    height: 0;
+    height: var(--cell-height);
+    border-top: 1px solid @tableColor2;
     border-bottom: 1px solid @tableColor2;
-    z-index: 210;
+    z-index: 260;
   }
 }
 .tbody-tr-highlight {

package/dist/components/TableMax/TableHeader/index.less

@@ -213,8 +213,6 @@ table {
   width: 2px;
   position: fixed;
   z-index: 99999;
-  // background-color: #000;
-  background-color: green;
 }
 .column-resizing-divide-line {
   will-change: transform;
@@ -236,5 +234,16 @@ thead {
     align-items: center;
     padding: var(--cell-padding);
     height: var(--cell-height);
+    position: relative;
+  }
+  tr::after{
+    content: '';
+    display: block;
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: var(--cell-height);
+    background-color: var(--globalColor_14);
   }
 }

package/dist/components/TableMax/TableMax.js

@@ -648,6 +648,8 @@ var TableMax = function TableMax(_ref) {
             // onChange: row.getToggleSelectedHandler(),
             onChange: function onChange(e) {
               var _e$nativeEvent;
+              // 阻止点击事件冒泡，监听行双击事件时，点击这里会有问题
+              e.stopPropagation();
               var currentRowIsSelected,
                 currentSelectedRows = [],
                 allSelectedRows = [];
@@ -704,7 +706,8 @@ var TableMax = function TableMax(_ref) {
               onRowCheckboxClick === null || onRowCheckboxClick === void 0 || onRowCheckboxClick(currentSelectedRows, currentSelectedRows.map(function (row) {
                 return row.original;
               }), currentRowIsSelected, allSelectedRows);
-              // 阻止点击事件冒泡，监听行双击事件时，点击这里会有问题
+            },
+            onClick: function onClick(e) {
               e.stopPropagation();
             }
           });

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

@@ -16,7 +16,7 @@ export declare const useColumnWidth: ({ tableContentRef, tableId, tableKeyPrefix
     allColumnCount: number;
     onColumnSizingChange: (updater: any) => void;
     tableContainerWidth: number;
-    initializeColumnSizing: (columns: any) => void;
+    initializeColumnSizing: (columns: any) => () => void;
     handleVisibleConfigChange: (key: string, value: boolean) => void;
 };
 export {};

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

@@ -57,7 +57,13 @@ export var useColumnWidth = function useColumnWidth(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     state = _useState2[0],
     setState = _useState2[1];
-  var getTableWidth = useTableWidth(tableContentRef);
+  var getTableWidth = useCallback(function () {
+    if (!tableContentRef.current) return 0;
+    var width = tableContentRef.current.getBoundingClientRect().width;
+    var style = window.getComputedStyle(tableContentRef.current);
+    var horizontalBorderWidth = parseFloat(style.borderLeftWidth) + parseFloat(style.borderRightWidth);
+    return Math.floor(width - horizontalBorderWidth);
+  }, [tableContentRef.current]);
   var debouncedHandleResizeRef = useRef(debounce(function (newWidth) {
     return handleResize(newWidth);
   }, DEFAULT_RESIZE_DEBOUNCE));
@@ -157,7 +163,7 @@ export var useColumnWidth = function useColumnWidth(_ref) {
    */
   var calculateColumnSizing = useCallback(function (columnsSizeMap, allColumnCount, containerWidth) {
     var currentWidth = containerWidth || state.tableContainerWidth || getTableWidth();
-    // console.log(containerWidth, state.tableContainerWidth, getTableWidth())
+    console.log(containerWidth, tableContentRef.current.clientWidth, state.tableContainerWidth, getTableWidth());
     if (!currentWidth) return columnsSizeMap;
     var result = _objectSpread({}, columnsSizeMap);
     var adjustableColumns = getAdjustableColumns(result);
@@ -211,71 +217,87 @@ export var useColumnWidth = function useColumnWidth(_ref) {
    * 初始化列宽信息
    */
   var initializeColumnSizing = useCallback(function (columns) {
-    var _localStorage$getItem;
     if (!Array.isArray(columns) || columns.length === 0) return;
-    var _getSizeInfo = getSizeInfo(columns),
-      allCount = _getSizeInfo.allCount,
-      columnSizeMap = _getSizeInfo.columnSizeMap;
-    var cache = JSON.parse((_localStorage$getItem = localStorage.getItem(tableKey)) !== null && _localStorage$getItem !== void 0 ? _localStorage$getItem : '{}');
-    var now = +Date.now();
-    setState(produce(function (prevState) {
-      // 初始化列宽映射
-      var initColumnsSizeMap = _objectSpread({}, columnSizeMap);
-      var visibleColumnsSizeMap = {};
-
-      // 处理缓存过期或无效的情况
-      if (!(cache !== null && cache !== void 0 && cache.editTime) || now - cache.editTime > cacheMaxAge) {
-        Object.keys(initColumnsSizeMap).forEach(function (key) {
-          if (columnVisibleConfig[key] !== false) {
-            visibleColumnsSizeMap[key] = initColumnsSizeMap[key];
-          }
-        });
-      } else {
-        var _cache$columnSizing, _cache$columnVisibili;
-        var columnsIdSet = new Set(columns.map(function (column) {
-          return column.id;
-        }));
+    var initializeWithWidth = function initializeWithWidth(width) {
+      var _localStorage$getItem;
+      var _getSizeInfo = getSizeInfo(columns),
+        allCount = _getSizeInfo.allCount,
+        columnSizeMap = _getSizeInfo.columnSizeMap;
+      var cache = JSON.parse((_localStorage$getItem = localStorage.getItem(tableKey)) !== null && _localStorage$getItem !== void 0 ? _localStorage$getItem : '{}');
+      var now = +Date.now();
+      setState(produce(function (prevState) {
+        // 初始化列宽映射
+        var initColumnsSizeMap = _objectSpread({}, columnSizeMap);
+        var visibleColumnsSizeMap = {};
 
-        // 工具函数
-        var pickByKeys = function pickByKeys(obj, keys) {
-          return Object.fromEntries(Object.entries(obj).filter(function (_ref2) {
-            var _ref3 = _slicedToArray(_ref2, 1),
-              key = _ref3[0];
-            return keys.has(key);
+        // 处理缓存过期或无效的情况
+        if (!(cache !== null && cache !== void 0 && cache.editTime) || now - cache.editTime > cacheMaxAge) {
+          Object.keys(initColumnsSizeMap).forEach(function (key) {
+            if (columnVisibleConfig[key] !== false) {
+              visibleColumnsSizeMap[key] = initColumnsSizeMap[key];
+            }
+          });
+        } else {
+          var _cache$columnSizing, _cache$columnVisibili;
+          var columnsIdSet = new Set(columns.map(function (column) {
+            return column.id;
           }));
-        };
 
-        // 主逻辑
-        Object.assign(initColumnsSizeMap, pickByKeys((_cache$columnSizing = cache.columnSizing) !== null && _cache$columnSizing !== void 0 ? _cache$columnSizing : {}, columnsIdSet));
-        Object.assign(columnVisibleConfig, pickByKeys((_cache$columnVisibili = cache.columnVisibility) !== null && _cache$columnVisibili !== void 0 ? _cache$columnVisibili : {}, columnsIdSet));
-        Object.keys(initColumnsSizeMap).forEach(function (key) {
-          if (columnVisibleConfig[key] !== false) {
-            visibleColumnsSizeMap[key] = initColumnsSizeMap[key];
-          }
-        });
-      }
+          // 工具函数
+          var pickByKeys = function pickByKeys(obj, keys) {
+            return Object.fromEntries(Object.entries(obj).filter(function (_ref2) {
+              var _ref3 = _slicedToArray(_ref2, 1),
+                key = _ref3[0];
+              return keys.has(key);
+            }));
+          };
 
-      // console.log({
-      //   prevState,
-      //   initColumnsSizeMap,
-      //   visibleColumnsSizeMap,
-      //   cache,
-      //   cacheMaxAge,
-      //   tableContentRef: tableContentRef.current
+          // 主逻辑
+          Object.assign(initColumnsSizeMap, pickByKeys((_cache$columnSizing = cache.columnSizing) !== null && _cache$columnSizing !== void 0 ? _cache$columnSizing : {}, columnsIdSet));
+          Object.assign(columnVisibleConfig, pickByKeys((_cache$columnVisibili = cache.columnVisibility) !== null && _cache$columnVisibili !== void 0 ? _cache$columnVisibili : {}, columnsIdSet));
+          Object.keys(initColumnsSizeMap).forEach(function (key) {
+            if (columnVisibleConfig[key] !== false) {
+              visibleColumnsSizeMap[key] = initColumnsSizeMap[key];
+            }
+          });
+        }
 
-      // }, 'columnSizeMap123')
+        // console.log({
+        //   prevState,
+        //   initColumnsSizeMap,
+        //   visibleColumnsSizeMap,
+        //   cache,
+        //   cacheMaxAge,
+        //   tableContentRef: tableContentRef.current
 
-      // 计算可见列数
-      var visibleCount = allCount - Object.keys(columnVisibleConfig).filter(function (key) {
-        return !columnVisibleConfig[key];
-      }).length;
+        // }, 'columnSizeMap123')
 
-      // 计算最终列宽
-      prevState.columnSizing = calculateColumnSizing(visibleColumnsSizeMap, visibleCount, prevState.tableContainerWidth);
-      prevState.allColumnSizing = _objectSpread(_objectSpread({}, initColumnsSizeMap), prevState.columnSizing);
-      prevState.allColumnCount = visibleCount;
-      prevState.initColumnsSizeMap = columnSizeMap;
-    }));
+        // 计算可见列数
+        var visibleCount = allCount - Object.keys(columnVisibleConfig).filter(function (key) {
+          return !columnVisibleConfig[key];
+        }).length;
+
+        // 计算最终列宽
+        prevState.columnSizing = calculateColumnSizing(visibleColumnsSizeMap, visibleCount, width);
+        prevState.tableContainerWidth = width;
+        prevState.allColumnSizing = _objectSpread(_objectSpread({}, initColumnsSizeMap), prevState.columnSizing);
+        prevState.allColumnCount = visibleCount;
+        prevState.initColumnsSizeMap = columnSizeMap;
+      }));
+    };
+    var currentWidth = getTableWidth();
+    if (currentWidth) {
+      initializeWithWidth(currentWidth);
+    } else {
+      // 简单延迟重试
+      var timer = setTimeout(function () {
+        var retryWidth = getTableWidth() || 1000; // 回退默认宽度
+        initializeWithWidth(retryWidth);
+      }, 100);
+      return function () {
+        return clearTimeout(timer);
+      };
+    }
   }, [calculateColumnSizing, columnVisibleConfig, tableKey, cacheMaxAge]);
 
   /**

package/package.json

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