@arim-aisdc/public-components 2.3.52 → 2.3.53

package/dist/components/TableMax/TableMax.js

@@ -511,19 +511,45 @@ var TableMax = function TableMax(_ref) {
 
   /**根据缓存数据设置一些状态 */
   var setColumnInfoFromCache = function setColumnInfoFromCache(tableColumns) {
-    var _localStorage$getItem, _tableMaxConfig$cache;
+    var _localStorage$getItem, _tableMaxConfig$cache, _cache$columnPinning$, _cache$columnPinning, _cache$columnPinning$2, _cache$columnPinning2;
     var cache = JSON.parse((_localStorage$getItem = localStorage.getItem(tableKey)) !== null && _localStorage$getItem !== void 0 ? _localStorage$getItem : '{}');
     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;
     }
-    var cacheColumnVisibility = cache.columnVisibility,
-      cacheColumnOrder = cache.columnOrder,
-      cacheColumnPinning = cache.columnPinning,
-      cacheColumnFilters = cache.columnFilters,
-      cacheColumnSorting = cache.columnSorting,
-      cacheEnableFilters = cache.enableFilters,
-      cacheHeaderRowNum = cache.headerRowNum,
-      cacheCompactMode = cache.compactMode;
+    var columnsIdSet = new Set(tableColumns.map(function (column) {
+      return column.id;
+    }));
+
+    // 工具函数
+    var pickByKeys = function pickByKeys(obj, keys) {
+      return Object.fromEntries(Object.entries(obj).filter(function (_ref3) {
+        var _ref4 = _slicedToArray(_ref3, 1),
+          key = _ref4[0];
+        return keys.has(key);
+      }));
+    };
+    var _ref5 = _objectSpread(_objectSpread({}, cache), {}, {
+        columnVisibility: cache.columnVisibility ? pickByKeys(cache.columnVisibility, columnsIdSet) : {},
+        columnPinning: cache.columnPinning ? {
+          left: (_cache$columnPinning$ = cache === null || cache === void 0 || (_cache$columnPinning = cache.columnPinning) === null || _cache$columnPinning === void 0 || (_cache$columnPinning = _cache$columnPinning.left) === null || _cache$columnPinning === void 0 ? void 0 : _cache$columnPinning.filter(function (id) {
+            return columnsIdSet.has(id);
+          })) !== null && _cache$columnPinning$ !== void 0 ? _cache$columnPinning$ : [],
+          right: (_cache$columnPinning$2 = cache === null || cache === void 0 || (_cache$columnPinning2 = cache.columnPinning) === null || _cache$columnPinning2 === void 0 || (_cache$columnPinning2 = _cache$columnPinning2.right) === null || _cache$columnPinning2 === void 0 ? void 0 : _cache$columnPinning2.filter(function (id) {
+            return columnsIdSet.has(id);
+          })) !== null && _cache$columnPinning$2 !== void 0 ? _cache$columnPinning$2 : []
+        } : {
+          left: [],
+          right: []
+        }
+      }),
+      cacheColumnVisibility = _ref5.columnVisibility,
+      cacheColumnOrder = _ref5.columnOrder,
+      cacheColumnPinning = _ref5.columnPinning,
+      cacheColumnFilters = _ref5.columnFilters,
+      cacheColumnSorting = _ref5.columnSorting,
+      cacheEnableFilters = _ref5.enableFilters,
+      cacheHeaderRowNum = _ref5.headerRowNum,
+      cacheCompactMode = _ref5.compactMode;
     if (cacheHeaderRowNum) {
       setheaderRowNum(cacheHeaderRowNum);
     }
@@ -581,8 +607,8 @@ var TableMax = function TableMax(_ref) {
         size: 40,
         tooltip: false,
         enableResizing: false,
-        cell: function cell(_ref3) {
-          var row = _ref3.row;
+        cell: function cell(_ref6) {
+          var row = _ref6.row;
           return row.getCanExpand() ? /*#__PURE__*/_jsx("div", {
             onClick: function onClick(evt) {
               evt.stopPropagation();
@@ -603,8 +629,8 @@ var TableMax = function TableMax(_ref) {
         id: ColumnType.Selection,
         tooltip: false,
         enableResizing: false,
-        header: function header(_ref4) {
-          var table = _ref4.table;
+        header: function header(_ref7) {
+          var table = _ref7.table;
           return /*#__PURE__*/_jsx(Checkbox, {
             checked: table.getIsAllRowsSelected(),
             indeterminate: table.getIsSomePageRowsSelected(),
@@ -615,9 +641,9 @@ var TableMax = function TableMax(_ref) {
             }
           });
         },
-        cell: function cell(_ref5) {
-          var row = _ref5.row,
-            table = _ref5.table;
+        cell: function cell(_ref8) {
+          var row = _ref8.row,
+            table = _ref8.table;
           return /*#__PURE__*/_jsx(Checkbox, {
             checked: row.getIsSelected(),
             disabled: !row.getCanSelect(),
@@ -694,7 +720,9 @@ var TableMax = function TableMax(_ref) {
 
   // 初始化列
   useEffect(function () {
-    if (!tableMaxRef.current) return;
+    var _tableContentRef$curr;
+    if (!tableMaxRef.current || !tableContentRef.current) return;
+    console.log((_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.offsetWidth, 'tableContentRef.current');
     // 根据props，自动增加勾选列/展开列
     var newColumns = setColumnsByProps().concat(columns);
     initializeColumnSizing(newColumns);
@@ -960,7 +988,7 @@ var TableMax = function TableMax(_ref) {
 
   // 保存编辑内容
   var save = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _tableRows$find2;
       var newRow, _table$getRowModel4, tableRows, originRow;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -983,7 +1011,7 @@ var TableMax = function TableMax(_ref) {
       }, _callee);
     }));
     return function save() {
-      return _ref6.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
   var triggerSave = function triggerSave(e) {

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

@@ -156,6 +156,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())
     if (!currentWidth) return columnsSizeMap;
     var result = _objectSpread({}, columnsSizeMap);
     var adjustableColumns = getAdjustableColumns(result);
@@ -229,9 +230,22 @@ export var useColumnWidth = function useColumnWidth(_ref) {
           }
         });
       } else {
-        // 使用缓存数据
-        Object.assign(initColumnsSizeMap, cache.columnSizing);
-        Object.assign(columnVisibleConfig, cache.columnVisibility);
+        var columnsIdSet = new Set(columns.map(function (column) {
+          return column.id;
+        }));
+
+        // 工具函数
+        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);
+          }));
+        };
+
+        // 主逻辑
+        Object.assign(initColumnsSizeMap, pickByKeys(cache.columnSizing, columnsIdSet));
+        Object.assign(columnVisibleConfig, pickByKeys(cache.columnVisibility, columnsIdSet));
         Object.keys(initColumnsSizeMap).forEach(function (key) {
           if (columnVisibleConfig[key] !== false) {
             visibleColumnsSizeMap[key] = initColumnsSizeMap[key];
@@ -244,7 +258,8 @@ export var useColumnWidth = function useColumnWidth(_ref) {
       //   initColumnsSizeMap,
       //   visibleColumnsSizeMap,
       //   cache,
-      //   cacheMaxAge
+      //   cacheMaxAge,
+      //   tableContentRef: tableContentRef.current
 
       // }, 'columnSizeMap123')
 
@@ -269,10 +284,10 @@ export var useColumnWidth = function useColumnWidth(_ref) {
     if (!changedColumn || JSON.stringify(changedColumn) === '{}') return;
     setState(produce(function (prevState) {
       var _Object$entries;
-      var _ref2 = (_Object$entries = Object.entries(changedColumn)) === null || _Object$entries === void 0 ? void 0 : _Object$entries[0],
-        _ref3 = _slicedToArray(_ref2, 2),
-        changedKey = _ref3[0],
-        newWidth = _ref3[1];
+      var _ref4 = (_Object$entries = Object.entries(changedColumn)) === null || _Object$entries === void 0 ? void 0 : _Object$entries[0],
+        _ref5 = _slicedToArray(_ref4, 2),
+        changedKey = _ref5[0],
+        newWidth = _ref5[1];
       if (!changedKey) return;
       var oldWidth = prevState.columnSizing[changedKey] || 0;
       var widthDiff = newWidth - oldWidth;

package/package.json

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