@arim-aisdc/public-components 2.3.82 → 2.3.83

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ThemeType } from "../../../dist/components/ThemeProvider";
+import { ThemeType } from "../../../node_modules/@arim-aisdc/public-components";
 import type { VariablesJsonType } from './type';
 import { Locale } from '../../locales';
 export interface ConfigConsumerProps {

package/dist/components/TableMax/TableMax.js

@@ -641,14 +641,11 @@ var TableMax = function TableMax(_ref) {
         enableResizing: false,
         cell: function cell(_ref7) {
           var row = _ref7.row;
-          console.log(row.getIsExpanded(), '3333');
           return row.getCanExpand() ? /*#__PURE__*/_jsx("div", {
             onClick: function onClick(evt) {
               evt.stopPropagation();
               row.getToggleExpandedHandler()();
               // row.toggleExpanded()
-
-              console.log(row.getIsExpanded(), table.getExpandedRowModel(), '3333');
             },
             style: {
               cursor: 'pointer'
@@ -759,7 +756,8 @@ var TableMax = function TableMax(_ref) {
 
   // 初始化列
   useEffect(function () {
-    if (!tableMaxRef.current || !tableContentRef.current) return;
+    if (!tableMaxRef.current || !tableContentRef.current || !tableId) return;
+    if (!Array.isArray(columns) || columns.length === 0) return;
     // 根据props，自动增加勾选列/展开列
     var newColumns = setColumnsByProps().concat(columns);
     initializeColumnSizing(newColumns);
@@ -774,7 +772,6 @@ var TableMax = function TableMax(_ref) {
   }, [columns, tableId]);
   var _rowSelectionChange = useCallback(debounce(function (rowOriginal, row) {
     if (rowSelectionChange) {
-      // console.log(rowOriginal, row, 'rowSelectionChange1')
       rowSelectionChange(rowOriginal, row);
     }
   }, 100), [rowSelectionChange]);
@@ -843,25 +840,30 @@ var TableMax = function TableMax(_ref) {
   //     tableMaxRef.current && myObserver.disconnect();
   //   };
   // }, [tableId]);
-
+  var cacheTimer = useRef(null);
   /**缓存table数据 */
   useUpdateEffect(function () {
     if (!tableId) return;
-    var tableState = table.getState();
-    localStorage.setItem(tableKey, JSON.stringify({
-      enableFilters: enableFilters,
-      headerRowNum: headerRowNum,
-      compactMode: compactMode,
-      columnVisibility: tableState.columnVisibility,
-      columnPinning: tableState.columnPinning,
-      columnOrder: tableState.columnOrder,
-      columnFilters: tableState.columnFilters,
-      columnSorting: tableState.sorting,
-      columnSizing: columnSizing,
-      editTime: +new Date(),
-      editTimeCh: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      version: version
-    }));
+    cacheTimer.current = setTimeout(function () {
+      var tableState = table.getState();
+      localStorage.setItem(tableKey, JSON.stringify({
+        enableFilters: enableFilters,
+        headerRowNum: headerRowNum,
+        compactMode: compactMode,
+        columnVisibility: tableState.columnVisibility,
+        columnPinning: tableState.columnPinning,
+        columnOrder: tableState.columnOrder,
+        columnFilters: tableState.columnFilters,
+        columnSorting: tableState.sorting,
+        columnSizing: columnSizing,
+        editTime: +new Date(),
+        editTimeCh: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        version: version
+      }));
+    }, 100);
+    return function () {
+      clearTimeout(cacheTimer.current);
+    };
   }, [table.getState().columnVisibility, table.getState().columnPinning, table.getState().columnOrder, table.getState().columnFilters, table.getState().sorting, enableFilters, headerRowNum, compactMode, columnSizing, tableId]);
   var reorderRow = useCallback(function (fromDatas, toDatas) {
     var draggedRow = fromDatas.draggedRow,

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

@@ -58,6 +58,13 @@ export var useColumnWidth = function useColumnWidth(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     state = _useState2[0],
     setState = _useState2[1];
+  // 使用 ref 保存最新的状态值
+  var stateRef = useRef(state);
+
+  // 同步更新 ref
+  useEffect(function () {
+    stateRef.current = state;
+  }, [state]);
   var getTableWidth = useCallback(function () {
     if (!tableContentRef.current) return 0;
     var width = tableContentRef.current.getBoundingClientRect().width;
@@ -94,32 +101,44 @@ export var useColumnWidth = function useColumnWidth(_ref) {
     if (!newWidth) return;
     setState(function (prevState) {
       return produce(prevState, function (draft) {
-        var visibleColumns = getVisibleColumns(draft.columnSizing);
-        var adjustableColumns = getAdjustableColumns(draft.columnSizing);
+        // console.log('handleResize', 111122, draft.columnSizing)
+        // 使用最新的状态值（来自 ref）
+        var currentState = stateRef.current;
+        var columnSizing = currentState.columnSizing || {};
+        var initColumnsSizeMap = currentState.initColumnsSizeMap || {};
+        // console.log('handleResize', 111122, draft.columnSizing, newWidth, currentState)
+
+        var visibleColumns = getVisibleColumns(columnSizing);
+        var adjustableColumns = getAdjustableColumns(initColumnsSizeMap);
         var totalVisibleWidth = visibleColumns.reduce(function (sum, key) {
-          return sum + (draft.columnSizing[key] || DEFAULT_MIN_SIZE);
+          return sum + (columnSizing[key] || DEFAULT_MIN_SIZE);
         }, 0);
 
         // 容器变大时的逻辑
-        if (draft.tableContainerWidth && newWidth > draft.tableContainerWidth) {
+        if (currentState.tableContainerWidth && newWidth > currentState.tableContainerWidth) {
           if (totalVisibleWidth < newWidth - DEFAULT_TABLE_PADDING) {
             var remainWidth = newWidth - totalVisibleWidth - DEFAULT_TABLE_PADDING;
-            if (adjustableColumns.length > 0) {
-              var averageWidth = remainWidth / adjustableColumns.length;
-              adjustableColumns.forEach(function (key) {
-                draft.columnSizing[key] = Math.min((draft.columnSizing[key] || 0) + averageWidth, DEFAULT_MAX_SIZE);
+            var addColumns = Object.keys(adjustableColumns).filter(function (key) {
+              return columnSizing[key] < DEFAULT_MAX_SIZE;
+            });
+            if (addColumns.length > 0) {
+              var averageWidth = remainWidth / addColumns.length;
+              addColumns.forEach(function (key) {
+                draft.columnSizing[key] = Math.min((columnSizing[key] || 0) + averageWidth, DEFAULT_MAX_SIZE);
               });
             }
           }
         }
         // 容器变小时的逻辑
-        else if (draft.tableContainerWidth && newWidth < draft.tableContainerWidth) {
+        else if (currentState.tableContainerWidth && newWidth < currentState.tableContainerWidth) {
           var reducedWidth = newWidth - totalVisibleWidth - DEFAULT_TABLE_PADDING;
-          if (adjustableColumns.length > 0) {
-            var _averageWidth = reducedWidth / adjustableColumns.length;
-            adjustableColumns.forEach(function (key) {
-              var _draft$initColumnsSiz;
-              draft.columnSizing[key] = Math.max((draft.columnSizing[key] || 0) + _averageWidth, Math.max(((_draft$initColumnsSiz = draft.initColumnsSizeMap) === null || _draft$initColumnsSiz === void 0 ? void 0 : _draft$initColumnsSiz[key]) || 0, DEFAULT_MIN_SIZE));
+          var reduceColumns = Object.keys(adjustableColumns).filter(function (key) {
+            return columnSizing[key] > DEFAULT_MIN_SIZE;
+          });
+          if (reduceColumns.length > 0) {
+            var _averageWidth = reducedWidth / reduceColumns.length;
+            reduceColumns.forEach(function (key) {
+              draft.columnSizing[key] = Math.max((columnSizing[key] || 0) + _averageWidth, Math.max((initColumnsSizeMap === null || initColumnsSizeMap === void 0 ? void 0 : initColumnsSizeMap[key]) || 0, DEFAULT_MIN_SIZE));
             });
           }
         }
@@ -134,6 +153,7 @@ export var useColumnWidth = function useColumnWidth(_ref) {
   var handleVisibleConfigChange = useCallback(function (key, value) {
     setState(function (prevState) {
       return produce(prevState, function (draft) {
+        // console.log(111122, 'handleVisibleConfigChange')
         if (value) {
           // 显示列
           draft.columnSizing[key] = draft.allColumnSizing[key] || DEFAULT_MIN_SIZE;
@@ -198,6 +218,14 @@ export var useColumnWidth = function useColumnWidth(_ref) {
         result[key] = Math.min(result[key] + averageExtra, DEFAULT_MAX_SIZE);
       });
     }
+    // debugger
+    // console.log({
+    //   hasWidthColumns,
+    //   noWidthColumns,
+    //   totalWidth,
+    //   remainWidth,
+    //   result
+    // }, 1111222)
     return result;
   }, [getAdjustableColumns, getTableWidth, state.tableContainerWidth]);
 
@@ -215,6 +243,7 @@ export var useColumnWidth = function useColumnWidth(_ref) {
       var now = +Date.now();
       setState(produce(function (prevState) {
         // 初始化列宽映射
+        // console.log(111122, 'initializeWithWidth')
         var initColumnsSizeMap = _objectSpread({}, columnSizeMap);
         var visibleColumnsSizeMap = {};
 
@@ -254,6 +283,11 @@ export var useColumnWidth = function useColumnWidth(_ref) {
         var visibleCount = allCount - Object.keys(columnVisibleConfig).filter(function (key) {
           return !columnVisibleConfig[key];
         }).length;
+        //   debugger
+        // console.log({
+        //   initColumnsSizeMap,
+        //   visibleColumnsSizeMap
+        //   }, 1111222)
 
         // 计算最终列宽
         prevState.columnSizing = calculateColumnSizing(visibleColumnsSizeMap, visibleCount, width);
@@ -286,6 +320,7 @@ export var useColumnWidth = function useColumnWidth(_ref) {
     if (!changedColumn || JSON.stringify(changedColumn) === '{}') return;
     setState(produce(function (prevState) {
       var _Object$entries;
+      // console.log(111122, 'handleColumnSizingChange')
       var _ref4 = (_Object$entries = Object.entries(changedColumn)) === null || _Object$entries === void 0 ? void 0 : _Object$entries[0],
         _ref5 = _slicedToArray(_ref4, 2),
         changedKey = _ref5[0],
@@ -328,7 +363,10 @@ export var useColumnWidth = function useColumnWidth(_ref) {
         var height = (_entries$2 = entries[0]) === null || _entries$2 === void 0 ? void 0 : _entries$2.contentRect.height;
         if (newWidth || height) {
           var _tableContentRef$curr, _tableContentRef$curr2;
-          debouncedHandleResizeRef.current(newWidth);
+          var currentState = stateRef.current;
+          if (currentState.columnSizing && Object.keys(currentState.columnSizing).length > 0) {
+            debouncedHandleResizeRef.current(newWidth);
+          }
           (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 || (_tableContentRef$curr = _tableContentRef$curr.style) === null || _tableContentRef$curr === void 0 || _tableContentRef$curr.setProperty('--table-body-width', "".concat(newWidth - 12, "px"));
           (_tableContentRef$curr2 = tableContentRef.current) === null || _tableContentRef$curr2 === void 0 || (_tableContentRef$curr2 = _tableContentRef$curr2.style) === null || _tableContentRef$curr2 === void 0 || _tableContentRef$curr2.setProperty('--table-body-height', "".concat(height - 54, "px"));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.3.82",
+  "version": "2.3.83",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",
@@ -48,6 +48,7 @@
   "dependencies": {
     "@ant-design/icons": "^5.3.7",
     "@ant-design/pro-components": "^2.7.10",
+    "@arim-aisdc/public-components": "^2.3.82",
     "@tanstack/match-sorter-utils": "^8.8.4",
     "@tanstack/react-table": "^8.9.1",
     "@tanstack/react-virtual": "^3.13.12",