@arim-aisdc/public-components 2.3.62 → 2.3.63

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/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

@@ -163,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);
@@ -217,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.62",
+  "version": "2.3.63",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",