@arim-aisdc/public-components 2.1.2 → 2.1.3

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

@@ -398,6 +398,9 @@ var CustomForm = function CustomForm(_ref, ref) {
           onChange: function onChange(e) {
             commonChange(e, item);
           },
+          disabled: item === null || item === void 0 ? void 0 : item.disabled
+          // disabledDate={item?.disabled}
+          ,
           suffixIcon: /*#__PURE__*/_jsx("i", {
             className: "iconfont-other icon-other-calendar"
           }),

package/dist/components/TableMax/TableBody/Row.d.ts

@@ -1,6 +1,6 @@
 import { DropSide, OnSelectChangeType } from "../type";
 import { Table } from '@tanstack/react-table';
-import { Dispatch, ReactNode, SetStateAction } from 'react';
+import React, { Dispatch, ReactNode, SetStateAction } from 'react';
 import './index.less';
 type IRowProps = {
     table: Table<any>;
@@ -58,6 +58,7 @@ type IRowProps = {
     clearHoverRowIndex: () => void;
     hoverRowIndex: number;
     dropSide: DropSide;
+    onEditValueChange?: (field: string, value: any, extra?: any) => void;
 };
-declare const Row: ({ tableBodyRef, table, tableId, row, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, reorderRow, canRowDrag, rowClassName, cellClassName, rowStyle, getCellProps, editting, rowEditing, renderSubComponent, selectedRowDragging, setSelectedRowDragging, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, rowHeight, disableDragRowIds, selectRowWhenClick, handleEditRowWhenDClick, canEditRowWhenDClick, theme, dragBeforeStart, shadowColumnInfo, onCellContextMenu, getRowHoverTipConfig, tableTooltip, changeHoverRow, clearHoverRowIndex, hoverRowIndex, dropSide, }: IRowProps) => import("react/jsx-runtime").JSX.Element;
+declare const Row: ({ tableBodyRef, table, tableId, row, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, reorderRow, canRowDrag, rowClassName, cellClassName, rowStyle, getCellProps, editting, rowEditing, renderSubComponent, selectedRowDragging, setSelectedRowDragging, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, rowHeight, disableDragRowIds, selectRowWhenClick, handleEditRowWhenDClick, canEditRowWhenDClick, theme, dragBeforeStart, shadowColumnInfo, onCellContextMenu, getRowHoverTipConfig, tableTooltip, changeHoverRow, clearHoverRowIndex, hoverRowIndex, dropSide, onEditValueChange, }: IRowProps) => import("react/jsx-runtime").JSX.Element;
 export default Row;

package/dist/components/TableMax/TableBody/Row.js

@@ -12,8 +12,9 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { DropSide } from "../type";
 import { flexRender } from '@tanstack/react-table';
+import { useUpdateEffect } from 'ahooks';
 import { Tooltip } from 'antd';
-import { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useDrag, useDrop } from 'react-dnd';
 import { getEmptyImage } from 'react-dnd-html5-backend';
 import { getPinningStyle } from "../TableHeader/utils";
@@ -66,7 +67,8 @@ var Row = function Row(_ref) {
     changeHoverRow = _ref.changeHoverRow,
     clearHoverRowIndex = _ref.clearHoverRowIndex,
     hoverRowIndex = _ref.hoverRowIndex,
-    dropSide = _ref.dropSide;
+    dropSide = _ref.dropSide,
+    onEditValueChange = _ref.onEditValueChange;
   var dropPreviewLineClassName = useMemo(function () {
     if (hoverRowIndex === row.index) {
       return dropSide === DropSide.Top ? 'showTopBorder' : 'showBottomBorder';
@@ -146,6 +148,12 @@ var Row = function Row(_ref) {
       setSelectedRowDragging(isDragging);
     }
   }, [isDragging, row.getIsSelected()]);
+  useUpdateEffect(function () {
+    // 鼠标移出，清除border
+    if (!isDragging) {
+      clearHoverRowIndex();
+    }
+  }, [isDragging]);
   var rowClickHandler = function rowClickHandler(evt) {
     // 触发单击事件
     onRowMouseClick === null || onRowMouseClick === void 0 || onRowMouseClick(row);
@@ -253,8 +261,6 @@ var Row = function Row(_ref) {
   };
   var rowMouseLeave = function rowMouseLeave() {
     onRowMouseLeave === null || onRowMouseLeave === void 0 || onRowMouseLeave(row);
-    // 鼠标移出，清除border
-    clearHoverRowIndex === null || clearHoverRowIndex === void 0 || clearHoverRowIndex();
   };
   var handleCellRightClick = function handleCellRightClick(e, cell) {
     onCellContextMenu(e, cell);
@@ -283,9 +289,7 @@ var Row = function Row(_ref) {
     canSelection && !selectRowWhenClick && String(row.id) === String(rowHighLightId) // 多选并且点击行时不选中，高亮状态单独管理
     ;
   }, [row.id, row.getIsSelected(), rowSelectedId, selectRowWhenClick, rowHighLightId, canSelection]);
-
-  // console.log('row render', row.id);
-
+  console.log('row render');
   var rowCom = function rowCom() {
     var _row;
     return /*#__PURE__*/_jsx("tr", {
@@ -329,6 +333,7 @@ var Row = function Row(_ref) {
             editing: columnEditing,
             dataIndex: accessorKey,
             title: header,
+            onEditValueChange: onEditValueChange,
             children: flexRender(cell.column.columnDef.cell, cell.getContext())
           }))
         }), cell.id);

package/dist/components/TableMax/TableBody/index.d.ts

@@ -70,6 +70,7 @@ type TableBodyPropsType = {
     };
     tableTooltip: boolean;
     compactMode: boolean;
+    onEditValueChange?: (field: string, value: any, extra?: any) => void;
 };
-declare const TableBody: ({ tableBodyRef, table, tableId, theme, reorderRow, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, tableContainerWidth, selectedRowDragging, setSelectedRowDragging, canRowDrag, rowKey, loading, rowClassName, cellClassName, rowStyle, getCellProps, rowHeight, renderSubComponent, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, disableDragRowIds, selectRowWhenClick, datas, canEditRowWhenDClick, editingRowId, handleEditRowWhenDClick, dragBeforeStart, shadowColumnInfo, getContextMenu, onClickContextMenu, getRowHoverTipConfig, tableTooltip, compactMode, }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
+declare const TableBody: ({ tableBodyRef, table, tableId, theme, reorderRow, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, tableContainerWidth, selectedRowDragging, setSelectedRowDragging, canRowDrag, rowKey, loading, rowClassName, cellClassName, rowStyle, getCellProps, rowHeight, renderSubComponent, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, disableDragRowIds, selectRowWhenClick, datas, canEditRowWhenDClick, editingRowId, handleEditRowWhenDClick, dragBeforeStart, shadowColumnInfo, getContextMenu, onClickContextMenu, getRowHoverTipConfig, tableTooltip, compactMode, onEditValueChange, }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
 export default TableBody;

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

@@ -71,7 +71,8 @@ var TableBody = function TableBody(_ref) {
     onClickContextMenu = _ref.onClickContextMenu,
     getRowHoverTipConfig = _ref.getRowHoverTipConfig,
     tableTooltip = _ref.tableTooltip,
-    compactMode = _ref.compactMode;
+    compactMode = _ref.compactMode,
+    onEditValueChange = _ref.onEditValueChange;
   var _useConfig = useConfig(),
     root = _useConfig.root;
   var headerGroups = table.getHeaderGroups();
@@ -126,6 +127,7 @@ var TableBody = function TableBody(_ref) {
     })) || [];
     // console.log('hover :>> ', targetRowIndex, originRowIndex);
     if (tableId === origin.sourceTableId && originRowIndexList.includes(targetRowIndex)) {
+      // hover在被拖动的行时，隐藏放置位置
       clearHoverRowIndex();
     } else if (targetRowIndex !== hoverRowIndex) {
       setHoverRowIndex(targetRowIndex);
@@ -365,7 +367,8 @@ var TableBody = function TableBody(_ref) {
         changeHoverRow: changeHoverRow,
         clearHoverRowIndex: clearHoverRowIndex,
         hoverRowIndex: hoverRowIndex,
-        dropSide: dropSide
+        dropSide: dropSide,
+        onEditValueChange: onEditValueChange
       }, row.id);
     });
   };

package/dist/components/TableMax/TableMax.d.ts

@@ -15,5 +15,6 @@ export declare enum ColumnType {
 }
 export type ColumnSizing = Record<string, number>;
 export declare const TableContext: React.Context<TableContextType>;
+export declare const CACHE_MAX_AGE: number;
 declare const _default: React.ForwardRefExoticComponent<TableMaxProps & React.RefAttributes<unknown>>;
 export default _default;

package/dist/components/TableMax/TableMax.js

@@ -34,8 +34,9 @@ import customFilterFns from "./components/ColumnFilter/customFilterFns";
 import ColumnSetting from "./components/ColumnSetting";
 import customSortFns, { setDefaultSortFn } from "./components/ColumnSort/customSortFns";
 import PaginationV2 from "./components/PaginationV2";
+import { useColumnWidth } from "./hooks/useColumnWidth";
 import "./tableMax.less";
-import { downloadExcel, getFormatFilters, getFormatSorting, getSizeInfo, operationColumnNoTooltips } from "./utils";
+import { downloadExcel, getFormatFilters, getFormatSorting, operationColumnNoTooltips } from "./utils";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var ColumnType = /*#__PURE__*/function (ColumnType) {
@@ -46,10 +47,7 @@ export var ColumnType = /*#__PURE__*/function (ColumnType) {
   return ColumnType;
 }({});
 export var TableContext = /*#__PURE__*/createContext({});
-var allColumnCount = 0;
-var allColumnWidth = 0;
-var visibleColumnsSizing = {};
-var CACHE_MAX_AGE = 1 * 60 * 60 * 1000;
+export var CACHE_MAX_AGE = 1 * 60 * 60 * 1000;
 var getCurrentRouterName = function getCurrentRouterName() {
   return window.location.pathname.slice(1);
 };
@@ -184,7 +182,8 @@ var TableMax = function TableMax(_ref) {
     showLessItems = _ref$showLessItems === void 0 ? false : _ref$showLessItems,
     _ref$disableColumnDra = _ref.disableColumnDrag,
     disableColumnDrag = _ref$disableColumnDra === void 0 ? false : _ref$disableColumnDra,
-    request = _ref.request;
+    request = _ref.request,
+    onEditValueChange = _ref.onEditValueChange;
   var tableMaxRef = useRef(null);
   var columns = useMemo(function () {
     // 给columns配置默认的过滤函数，排序函数，操作列取消tooltip
@@ -195,14 +194,11 @@ var TableMax = function TableMax(_ref) {
     theme = _useConfig.theme,
     tableKeyPrefixCls = _useConfig.tableKeyPrefixCls,
     tableMaxNewPagination = _useConfig.tableMaxNewPagination;
-
   // 多选场景下，点击行时是否选中改行。在不展示多选框(selectionWithoutChecked=true)时，会一直为true
   var selectRowWhenClick = useMemo(function () {
     return originSelectRowWhenClick || selectionWithoutChecked;
   }, [originSelectRowWhenClick, selectionWithoutChecked]);
 
-  // console.log('bingo', userId, theme, tableKeyPrefixCls);
-
   /**表格配置信息缓存 */
   var currentUserId = userId || ((_JSON$parse = JSON.parse(localStorage.getItem('poi-permission') || '{}')) === null || _JSON$parse === void 0 || (_JSON$parse = _JSON$parse.currentUser) === null || _JSON$parse === void 0 ? void 0 : _JSON$parse.id);
   var tableKey = "".concat(tableKeyPrefixCls, "-").concat(getCurrentRouterName(), "-").concat(tableId, "-").concat(currentUserId);
@@ -227,10 +223,6 @@ var TableMax = function TableMax(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     tableColumns = _useState6[0],
     setTableColumns = _useState6[1];
-  // useEffect(() => {
-  //   console.log('tableColumns :>> ', tableColumns);
-  // }, [tableColumns]);
-  // const [initTableSizeColumns, setInitTableSizeColumns] = useState([...columns]);
   /**列显隐 */
   var _useState7 = useState(),
     _useState8 = _slicedToArray(_useState7, 2),
@@ -285,26 +277,28 @@ var TableMax = function TableMax(_ref) {
     _useState20 = _slicedToArray(_useState19, 2),
     columnPinning = _useState20[0],
     setColumnPinning = _useState20[1];
-  // 实际列宽（计算得出）
-  var _useState21 = useState({}),
-    _useState22 = _slicedToArray(_useState21, 2),
-    columnSizing = _useState22[0],
-    setColumnSizing = _useState22[1];
-  // 初始化列宽（缓存合并column的size）
-  var _useState23 = useState({}),
-    _useState24 = _slicedToArray(_useState23, 2),
-    initColumnsSizing = _useState24[0],
-    setInitColumnsSizing = _useState24[1];
+  var _useColumnWidth = useColumnWidth({
+      tableMaxRef: tableMaxRef,
+      tableId: tableId,
+      tableKeyPrefixCls: tableKeyPrefixCls,
+      columnVisibleConfig: columnVisibleConfig,
+      tableKey: tableKey
+    }),
+    columnSizing = _useColumnWidth.columnSizing,
+    initializeColumnSizing = _useColumnWidth.initializeColumnSizing,
+    onColumnSizingChange = _useColumnWidth.onColumnSizingChange,
+    tableContainerWidth = _useColumnWidth.tableContainerWidth,
+    handleVisibleConfigChange = _useColumnWidth.handleVisibleConfigChange;
 
   /**列筛选 */
-  var _useState25 = useState(defaultColumnFilters),
-    _useState26 = _slicedToArray(_useState25, 2),
-    columnFilters = _useState26[0],
-    setColumnFilters = _useState26[1];
-  var _useState27 = useState(''),
-    _useState28 = _slicedToArray(_useState27, 2),
-    globalFilter = _useState28[0],
-    setGlobalFilter = _useState28[1];
+  var _useState21 = useState(defaultColumnFilters),
+    _useState22 = _slicedToArray(_useState21, 2),
+    columnFilters = _useState22[0],
+    setColumnFilters = _useState22[1];
+  var _useState23 = useState(''),
+    _useState24 = _slicedToArray(_useState23, 2),
+    globalFilter = _useState24[0],
+    setGlobalFilter = _useState24[1];
   /**分页 */
   var pagination = useMemo(function () {
     return typeof skipCount === 'number' && pageSize ? {
@@ -313,111 +307,62 @@ var TableMax = function TableMax(_ref) {
     } : undefined;
   }, [skipCount, pageSize]);
   /**是否有分组 */
-  var _useState29 = useState(false),
-    _useState30 = _slicedToArray(_useState29, 2),
-    hasGroup = _useState30[0],
-    setHasGroup = _useState30[1];
+  var _useState25 = useState(false),
+    _useState26 = _slicedToArray(_useState25, 2),
+    hasGroup = _useState26[0],
+    setHasGroup = _useState26[1];
 
   /**是否正在多行拖拽 */
-  var _useState31 = useState(false),
-    _useState32 = _slicedToArray(_useState31, 2),
-    selectedRowDragging = _useState32[0],
-    setSelectedRowDragging = _useState32[1];
+  var _useState27 = useState(false),
+    _useState28 = _slicedToArray(_useState27, 2),
+    selectedRowDragging = _useState28[0],
+    setSelectedRowDragging = _useState28[1];
 
   /**显示筛选开关状态 */
-  var _useState33 = useState(defaultEnableFilters),
-    _useState34 = _slicedToArray(_useState33, 2),
-    enableFilters = _useState34[0],
-    setEnableFilters = _useState34[1];
+  var _useState29 = useState(defaultEnableFilters),
+    _useState30 = _slicedToArray(_useState29, 2),
+    enableFilters = _useState30[0],
+    setEnableFilters = _useState30[1];
 
   /**表头最多显示几行文字 */
-  var _useState35 = useState(defaultHeaderRowNum),
-    _useState36 = _slicedToArray(_useState35, 2),
-    headerRowNum = _useState36[0],
-    setheaderRowNum = _useState36[1];
+  var _useState31 = useState(defaultHeaderRowNum),
+    _useState32 = _slicedToArray(_useState31, 2),
+    headerRowNum = _useState32[0],
+    setheaderRowNum = _useState32[1];
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
 
   /**正在编辑的行id*/
-  var _useState37 = useState(''),
-    _useState38 = _slicedToArray(_useState37, 2),
-    editingRowId = _useState38[0],
-    setEditingRowId = _useState38[1];
+  var _useState33 = useState(''),
+    _useState34 = _slicedToArray(_useState33, 2),
+    editingRowId = _useState34[0],
+    setEditingRowId = _useState34[1];
   var _React$useState = React.useState({}),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     expanded = _React$useState2[0],
     setExpanded = _React$useState2[1];
 
   // 固定列是否显示阴影
-  var _useState39 = useState({
+  var _useState35 = useState({
       left: false,
       right: false
     }),
-    _useState40 = _slicedToArray(_useState39, 2),
-    pinShadowVisible = _useState40[0],
-    setPinShadowVisible = _useState40[1];
-  var _useState41 = useState(defaultCompactMode),
-    _useState42 = _slicedToArray(_useState41, 2),
-    compactMode = _useState42[0],
-    setCompactMode = _useState42[1];
-  var changeColumnSizingHandler = function changeColumnSizingHandler(columnsSizeMap, changedColumnKey) {
-    var _Object$keys$filter, _tableMaxRef$current, _tableMaxRef$current2;
-    // 列宽数量（存在宽度）
-    var hasColumnCount = ((_Object$keys$filter = Object.keys(columnsSizeMap).filter(function (item) {
-      return !!columnsSizeMap[item];
-    })) === null || _Object$keys$filter === void 0 ? void 0 : _Object$keys$filter.length) || 0;
-    // 列宽数量（不存在宽度）
-    var remainColumnCount = allColumnCount - hasColumnCount;
-    // 列宽之和
-    allColumnWidth = Object.keys(columnsSizeMap).reduce(function (totalWidth, currKey) {
-      // eslint-disable-next-line no-param-reassign
-      return totalWidth += Number(columnsSizeMap[currKey] || 0);
-    }, 0);
-    // 剩余容器宽度
-    var remainTableContainerWidth = ((_tableMaxRef$current = tableMaxRef.current) === null || _tableMaxRef$current === void 0 ? void 0 : _tableMaxRef$current.clientWidth) - allColumnWidth - 10;
-    // 列宽Map（增加空白宽度部分）
-    var newColumnSizeMap = _objectSpread({}, columnsSizeMap);
-    // 为不存在宽度的列设置列宽
-    if (remainColumnCount) {
-      // debugger
-      var defaultMinSize = 120;
-      var defaultMaxSize = 240;
-      var aveSize = Math.max(Math.min(remainTableContainerWidth / remainColumnCount, defaultMaxSize), defaultMinSize);
-      // 更新初始化列宽Map, 重新计算列宽之和
-      allColumnWidth = Object.keys(columnsSizeMap).reduce(function (totalWidth, currKey) {
-        newColumnSizeMap[currKey] = newColumnSizeMap[currKey] ? newColumnSizeMap[currKey] : aveSize;
-        // eslint-disable-next-line no-param-reassign
-        return totalWidth += Number(newColumnSizeMap[currKey] || 0);
-      }, 0);
-    }
-    remainTableContainerWidth = ((_tableMaxRef$current2 = tableMaxRef.current) === null || _tableMaxRef$current2 === void 0 ? void 0 : _tableMaxRef$current2.clientWidth) - allColumnWidth - 10;
-    if (remainTableContainerWidth > 0) {
-      var count = allColumnCount - (changedColumnKey ? 1 : 0) - (columnsSizeMap[ColumnType.Expander] ? 1 : 0) - (columnsSizeMap[ColumnType.Selection] ? 1 : 0);
-      if (count > 0) {
-        var aveRemainWidth = count <= 0 ? remainTableContainerWidth : remainTableContainerWidth / count;
-        // debugger
-        for (var _i = 0, _Object$keys = Object.keys(columnsSizeMap); _i < _Object$keys.length; _i++) {
-          var key = _Object$keys[_i];
-          if (key !== changedColumnKey && key !== ColumnType.Expander && key !== ColumnType.Selection) {
-            newColumnSizeMap[key] += aveRemainWidth;
-          }
-        }
-      }
-    }
-    return newColumnSizeMap;
-  };
-  var onColumnSizingChange = function onColumnSizingChange(data) {
-    var _localStorage$getItem, _Object$keys2;
-    var changedColumn = data === null || data === void 0 ? void 0 : data();
-    setInitColumnsSizing(_objectSpread(_objectSpread({}, initColumnsSizing), changedColumn));
-    visibleColumnsSizing = _objectSpread(_objectSpread({}, visibleColumnsSizing), changedColumn);
-    var cache = JSON.parse((_localStorage$getItem = localStorage.getItem(tableKey)) !== null && _localStorage$getItem !== void 0 ? _localStorage$getItem : '{}');
-    localStorage.setItem(tableKey, JSON.stringify(_objectSpread(_objectSpread({}, cache), {}, {
-      columnSizing: _objectSpread(_objectSpread({}, cache.columnSizing), changedColumn),
-      editTime: new Date()
-    })));
-    setColumnSizing(changeColumnSizingHandler(visibleColumnsSizing, (_Object$keys2 = Object.keys(changedColumn)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2[0]));
+    _useState36 = _slicedToArray(_useState35, 2),
+    pinShadowVisible = _useState36[0],
+    setPinShadowVisible = _useState36[1];
+  var _useState37 = useState(defaultCompactMode),
+    _useState38 = _slicedToArray(_useState37, 2),
+    compactMode = _useState38[0],
+    setCompactMode = _useState38[1];
+  var onColumnVisibilityChange = function onColumnVisibilityChange(data) {
+    var _Object$values, _Object$keys;
+    var isColumnVisible = (_Object$values = Object.values(data === null || data === void 0 ? void 0 : data())) === null || _Object$values === void 0 ? void 0 : _Object$values[0];
+    var columnKey = (_Object$keys = Object.keys(data === null || data === void 0 ? void 0 : data())) === null || _Object$keys === void 0 ? void 0 : _Object$keys[0];
+    handleVisibleConfigChange(columnKey, isColumnVisible);
+    setColumnVisibility(function (prev) {
+      return _objectSpread(_objectSpread({}, prev || {}), data === null || data === void 0 ? void 0 : data());
+    });
   };
 
   // table
@@ -446,7 +391,7 @@ var TableMax = function TableMax(_ref) {
       expanded: expanded,
       columnSizing: columnSizing
     },
-    onColumnVisibilityChange: setColumnVisibility,
+    onColumnVisibilityChange: onColumnVisibilityChange,
     onColumnOrderChange: setColumnOrder,
     onColumnPinningChange: setColumnPinning,
     getCoreRowModel: getCoreRowModel(),
@@ -481,12 +426,6 @@ var TableMax = function TableMax(_ref) {
   var tableHeaderRef = useRef(null);
   var tableBodyRef = useRef(null);
 
-  /**表格容器宽度 */
-  var _useState43 = useState(),
-    _useState44 = _slicedToArray(_useState43, 2),
-    tableContainerWidth = _useState44[0],
-    setTableContainerWidth = _useState44[1];
-
   // 暴露给外部的api
   useImperativeHandle(refInstance, function () {
     return {
@@ -495,7 +434,8 @@ var TableMax = function TableMax(_ref) {
       },
       clearSorting: function clearSorting() {
         return table.resetSorting();
-      }
+      },
+      formInstance: form
     };
   });
   useEffect(function () {
@@ -523,30 +463,9 @@ var TableMax = function TableMax(_ref) {
 
   /**根据缓存数据设置一些状态 */
   var setColumnInfoFromCache = function setColumnInfoFromCache(tableColumns) {
-    var _localStorage$getItem2;
-    var cache = JSON.parse((_localStorage$getItem2 = localStorage.getItem(tableKey)) !== null && _localStorage$getItem2 !== void 0 ? _localStorage$getItem2 : '{}');
+    var _localStorage$getItem;
+    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 > CACHE_MAX_AGE) {
-      //设置列宽
-      // 列宽总数、列宽Map
-      var _getSizeInfo = getSizeInfo(tableColumns),
-        _allCount = _getSizeInfo.allCount,
-        _columnSizeMap = _getSizeInfo.columnSizeMap;
-      // allColumnCount = allCount;
-      // 初始化列宽Map（合并column上设置的、缓存的）
-      var _initColumnsSizeMap = _objectSpread({}, _columnSizeMap);
-      setInitColumnsSizing(_initColumnsSizeMap);
-      var _visibleColumnsSizeMap = {};
-      var _notVisibleColumns = Object.keys(columnVisibleConfig).filter(function (key) {
-        return !columnVisibleConfig[key];
-      });
-      allColumnCount = _allCount - _notVisibleColumns.length;
-      Object.keys(_initColumnsSizeMap).forEach(function (key) {
-        if (!_notVisibleColumns.includes(key)) {
-          _visibleColumnsSizeMap[key] = _initColumnsSizeMap[key];
-        }
-      });
-      visibleColumnsSizing = _visibleColumnsSizeMap;
-      setColumnSizing(changeColumnSizingHandler(_visibleColumnsSizeMap));
       return;
     }
     var cacheColumnVisibility = cache.columnVisibility,
@@ -556,39 +475,14 @@ var TableMax = function TableMax(_ref) {
       cacheColumnSorting = cache.columnSorting,
       cacheEnableFilters = cache.enableFilters,
       cacheHeaderRowNum = cache.headerRowNum,
-      cacheCompactMode = cache.compactMode,
-      cacheColumnSizing = cache.columnSizing;
+      cacheCompactMode = cache.compactMode;
     if (cacheHeaderRowNum) {
       setheaderRowNum(cacheHeaderRowNum);
     }
     setCompactMode(cacheCompactMode === true);
-    // console.log('get cache data', cacheCompactMode === true);
-
     var newColumnVisibleConfig = _objectSpread(_objectSpread({}, columnVisibleConfig), cacheColumnVisibility);
     setColumnVisibility(newColumnVisibleConfig);
 
-    //设置列宽
-    // 列宽总数、列宽Map
-    var _getSizeInfo2 = getSizeInfo(tableColumns),
-      allCount = _getSizeInfo2.allCount,
-      columnSizeMap = _getSizeInfo2.columnSizeMap;
-    // allColumnCount = allCount;
-    // 初始化列宽Map（合并column上设置的、缓存的）
-    var initColumnsSizeMap = _objectSpread(_objectSpread({}, columnSizeMap), cacheColumnSizing);
-    setInitColumnsSizing(initColumnsSizeMap);
-    var visibleColumnsSizeMap = {};
-    var notVisibleColumns = Object.keys(newColumnVisibleConfig).filter(function (key) {
-      return !newColumnVisibleConfig[key];
-    });
-    allColumnCount = allCount - notVisibleColumns.length;
-    Object.keys(initColumnsSizeMap).forEach(function (key) {
-      if (!notVisibleColumns.includes(key)) {
-        visibleColumnsSizeMap[key] = initColumnsSizeMap[key];
-      }
-    });
-    visibleColumnsSizing = visibleColumnsSizeMap;
-    setColumnSizing(changeColumnSizingHandler(visibleColumnsSizeMap));
-
     // 筛选项缓存&排序缓存
     var tableColumnIds = tableColumns === null || tableColumns === void 0 ? void 0 : tableColumns.map(function (column) {
       return column.id;
@@ -623,7 +517,6 @@ var TableMax = function TableMax(_ref) {
     }).length === 0) {
       arr = cacheColumnOrder;
     }
-    // debugger
     setColumnOrder(arr);
   };
   var setColumnsByProps = useCallback(function () {
@@ -638,6 +531,7 @@ var TableMax = function TableMax(_ref) {
         },
         size: 40,
         tooltip: false,
+        enableResizing: false,
         cell: function cell(_ref2) {
           var row = _ref2.row;
           return row.getCanExpand() ? /*#__PURE__*/_jsx("div", {
@@ -659,6 +553,7 @@ var TableMax = function TableMax(_ref) {
       extraColumns.unshift({
         id: ColumnType.Selection,
         tooltip: false,
+        enableResizing: false,
         header: function header(_ref3) {
           var table = _ref3.table;
           return /*#__PURE__*/_jsx(Checkbox, {
@@ -704,6 +599,7 @@ var TableMax = function TableMax(_ref) {
     if (!tableMaxRef.current) return;
     // 根据props，自动增加勾选列/展开列
     var newColumns = setColumnsByProps().concat(columns);
+    initializeColumnSizing(newColumns);
     setTableColumns(newColumns);
     // 根据缓存进行列设置
     setColumnInfoFromCache(newColumns);
@@ -715,24 +611,24 @@ var TableMax = function TableMax(_ref) {
   }, [columns]);
 
   // 列显示隐藏改变，修改初始化列宽Map
-  useUpdateEffect(function () {
-    var visibleColumnsSizeMap = {};
-    var notVisibleColumns = Object.keys(columnVisibleConfig).filter(function (key) {
-      return !columnVisibleConfig[key];
-    });
-    allColumnCount = table.getCenterVisibleLeafColumns().length;
-    Object.keys(initColumnsSizing).forEach(function (key) {
-      if (!notVisibleColumns.includes(key)) {
-        visibleColumnsSizeMap[key] = initColumnsSizing[key];
-      }
-    });
-    visibleColumnsSizing = visibleColumnsSizeMap;
-  }, [columnVisibleConfig]);
+  // useUpdateEffect(() => {
+  //   const visibleColumnsSizeMap = {};
+  //   const notVisibleColumns = Object.keys(columnVisibleConfig).filter(key => !columnVisibleConfig[key]);
+  //   allColumnCount = table.getVisibleLeafColumns().length;
+  //   Object.keys(initColumnsSizing).forEach(key => {
+  //     if (!notVisibleColumns.includes(key)) {
+  //       visibleColumnsSizeMap[key] = initColumnsSizing[key];
+  //     }
+  //   });
+  //   visibleColumnsSizing = visibleColumnsSizeMap;
+  // }, [columnVisibleConfig]);
 
   // 容器宽度改变，重新计算列宽
-  useUpdateEffect(function () {
-    changeColumnSizingHandler(visibleColumnsSizing);
-  }, [tableContainerWidth]);
+  // useUpdateEffect(() => {
+  //   setColumnSizing(changeColumnSizingHandler(visibleColumnsSizing));
+  //   // changeColumnSizingHandler(visibleColumnsSizing)
+  // }, [tableContainerWidth]);
+
   var _rowSelectionChange = useCallback(debounce(function (rowOriginal, row) {
     if (rowSelectionChange) {
       rowSelectionChange(rowOriginal, row);
@@ -789,17 +685,17 @@ var TableMax = function TableMax(_ref) {
       onSortingChange(formatSorting, sortingParameters.join(','), sortedData, sortedRowModel);
     }
   }, [JSON.stringify(sorting), canSorting, manualSorting]);
-  useEffect(function () {
-    var myObserver = new ResizeObserver(function (entries) {
-      var _entries$0$contentRec;
-      setTableContainerWidth((_entries$0$contentRec = entries[0].contentRect) === null || _entries$0$contentRec === void 0 ? void 0 : _entries$0$contentRec.width);
-    });
-    tableMaxRef.current && myObserver.observe(tableMaxRef.current);
-    // 移除监听
-    return function () {
-      tableMaxRef.current && myObserver.disconnect();
-    };
-  }, [tableId]);
+
+  // useEffect(() => {
+  //   const myObserver = new ResizeObserver(entries => {
+  //     setTableContainerWidth(entries[0].contentRect?.width);
+  //   });
+  //   tableMaxRef.current && myObserver.observe(tableMaxRef.current);
+  //   // 移除监听
+  //   return () => {
+  //     tableMaxRef.current && myObserver.disconnect();
+  //   };
+  // }, [tableId]);
 
   /**缓存table数据 */
   useUpdateEffect(function () {
@@ -814,9 +710,10 @@ var TableMax = function TableMax(_ref) {
       columnOrder: tableState.columnOrder,
       columnFilters: tableState.columnFilters,
       columnSorting: tableState.sorting,
+      columnSizing: columnSizing,
       editTime: new Date()
     }));
-  }, [table.getState().columnVisibility, table.getState().columnPinning, table.getState().columnOrder, table.getState().columnFilters, table.getState().sorting, enableFilters, headerRowNum, compactMode]);
+  }, [table.getState().columnVisibility, table.getState().columnPinning, table.getState().columnOrder, table.getState().columnFilters, table.getState().sorting, enableFilters, headerRowNum, compactMode, columnSizing]);
   var reorderRow = useCallback(function (fromDatas, toDatas) {
     var draggedRow = fromDatas.draggedRow,
       isMultipleDrag = fromDatas.isMultipleDrag,
@@ -917,13 +814,13 @@ var TableMax = function TableMax(_ref) {
 
   // 把row数据填充到表单
   var setFormData = function setFormData(rowOriginal) {
-    var _Object$keys3;
+    var _Object$keys2;
     var formData = {};
     var columnsMap = {};
     tableColumns === null || tableColumns === void 0 || tableColumns.forEach(function (col) {
       columnsMap[col.accessorKey] = col;
     });
-    (_Object$keys3 = Object.keys(rowOriginal)) === null || _Object$keys3 === void 0 || _Object$keys3.forEach(function (item) {
+    (_Object$keys2 = Object.keys(rowOriginal)) === null || _Object$keys2 === void 0 || _Object$keys2.forEach(function (item) {
       var _columnsMap$item, _columnsMap$item2;
       // eslint-disable-next-line @typescript-eslint/no-unused-expressions
       ((_columnsMap$item = columnsMap[item]) === null || _columnsMap$item === void 0 ? void 0 : _columnsMap$item.editComType) === InputType.DatePicker ? formData[item] = rowOriginal[item] ? dayjs(rowOriginal[item]) : null : (_columnsMap$item2 = columnsMap[item]) !== null && _columnsMap$item2 !== void 0 && _columnsMap$item2.shouldConvert ? formData[item] = columnsMap[item].shouldConvert(rowOriginal[item]) : formData[item] = rowOriginal[item];
@@ -1055,6 +952,10 @@ var TableMax = function TableMax(_ref) {
     getPinShadowInfo();
   }, [getPinShadowInfo]);
 
+  // useEffect(() => {
+  //   console.log(table.getState().columnSizing, 111);
+  // }, [table.getState().columnSizing]);
+
   // 获取展示阴影的列
   var shadowColumnInfo = useMemo(function () {
     var _pop, _shift;
@@ -1130,7 +1031,8 @@ var TableMax = function TableMax(_ref) {
     onClickContextMenu: onClickContextMenu,
     getRowHoverTipConfig: getRowHoverTipConfig,
     tableTooltip: tableTooltip,
-    compactMode: compactMode
+    compactMode: compactMode,
+    onEditValueChange: onEditValueChange
   };
 
   // console.log('columnsSizeMap render');