@arim-aisdc/public-components 2.0.8 → 2.0.9

package/dist/components/TableMax/TableMax.js

@@ -3,16 +3,15 @@ var _this = this;
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -22,9 +21,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { MinusSquareOutlined, PlusSquareOutlined } from '@ant-design/icons';
 import { getCoreRowModel, getExpandedRowModel, getFacetedUniqueValues, getFilteredRowModel, getSortedRowModel, useReactTable } from '@tanstack/react-table';
 import { Button, Checkbox, Form, Pagination } from 'antd';
-import { produce } from 'immer';
-import { cloneDeep, debounce } from 'lodash';
 import dayjs from 'dayjs';
+import { cloneDeep, debounce } from 'lodash';
 import React, { createContext, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
@@ -38,7 +36,8 @@ import ColumnSetting from "./components/ColumnSetting";
 import customSortFns, { setDefaultSortFn } from "./components/ColumnSort/customSortFns";
 import PaginationV2 from "./components/PaginationV2";
 import "./tableMax.less";
-import { getFormatFilters, getFormatSorting, getSizeInfo, operationColumnNoTooltips, setInitColumnsSize, setRemainColumnsWidth } from "./utils";
+import { getFormatFilters, getFormatSorting, getSizeInfo, operationColumnNoTooltips } from "./utils";
+import { useUpdateEffect } from 'ahooks';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var ColumnType = /*#__PURE__*/function (ColumnType) {
@@ -49,8 +48,15 @@ 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;
+var getCurrentRouterName = function getCurrentRouterName() {
+  return window.location.pathname.slice(1);
+};
 var TableMax = function TableMax(_ref) {
-  var _JSON$parse, _tableContentRef$curr2, _tableContentRef$curr3, _tableContentRef$curr4;
+  var _JSON$parse, _tableContentRef$curr;
   var tableId = _ref.tableId,
     originColumns = _ref.columns,
     _ref$datas = _ref.datas,
@@ -168,6 +174,7 @@ var TableMax = function TableMax(_ref) {
     tableTooltip = _ref$tooltip === void 0 ? true : _ref$tooltip,
     _ref$showLessItems = _ref.showLessItems,
     showLessItems = _ref$showLessItems === void 0 ? false : _ref$showLessItems;
+  var tableMaxRef = useRef(null);
   var columns = useMemo(function () {
     // 给columns配置默认的过滤函数，排序函数，操作列取消tooltip
     return operationColumnNoTooltips(setDefaultSortFn(setDefaultFilterFn(cloneDeep(originColumns))));
@@ -187,7 +194,7 @@ var TableMax = function TableMax(_ref) {
 
   /**表格配置信息缓存 */
   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(tableId, "-").concat(currentUserId);
+  var tableKey = "".concat(tableKeyPrefixCls, "-").concat(getCurrentRouterName(), "-").concat(tableId, "-").concat(currentUserId);
 
   /**表格数据 */
   var initColumnOrder = columns === null || columns === void 0 ? void 0 : columns.map(function (column) {
@@ -249,18 +256,17 @@ var TableMax = function TableMax(_ref) {
     _useState18 = _slicedToArray(_useState17, 2),
     columnPinning = _useState18[0],
     setColumnPinning = _useState18[1];
-  /**列宽 */
-  // const [columnSizes, setColumnSizes] = useState();
+  // 实际列宽（计算得出）
   var _useState19 = useState({}),
     _useState20 = _slicedToArray(_useState19, 2),
     columnSizing = _useState20[0],
     setColumnSizing = _useState20[1];
+  // 初始化列宽（缓存合并column的size）
   var _useState21 = useState({}),
     _useState22 = _slicedToArray(_useState21, 2),
     initColumnsSizing = _useState22[0],
     setInitColumnsSizing = _useState22[1];
 
-  // const [visibleColumnSizes, setVisibleColumnSizes] = useState([]);
   /**列筛选 */
   var _useState23 = useState(defaultColumnFilters),
     _useState24 = _slicedToArray(_useState23, 2),
@@ -316,6 +322,64 @@ var TableMax = function TableMax(_ref) {
     _useState36 = _slicedToArray(_useState35, 2),
     pinShadowVisible = _useState36[0],
     setPinShadowVisible = _useState36[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]));
+  };
 
   // table
   var table = useReactTable({
@@ -352,8 +416,7 @@ var TableMax = function TableMax(_ref) {
     getFacetedUniqueValues: getFacetedUniqueValues(),
     getFilteredRowModel: getFilteredRowModel(),
     onGlobalFilterChange: setGlobalFilter,
-    onColumnSizingChange: setColumnSizing,
-    // setColumnSizing,
+    onColumnSizingChange: onColumnSizingChange,
     manualPagination: true,
     manualSorting: manualSorting,
     manualFiltering: manualFiltering,
@@ -385,13 +448,6 @@ var TableMax = function TableMax(_ref) {
     tableContainerWidth = _useState38[0],
     setTableContainerWidth = _useState38[1];
 
-  // 默认最后一个空白列一直存在，hasVerticalScrollBar一直为true, TODO: 优化
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  var _useState39 = useState(true),
-    _useState40 = _slicedToArray(_useState39, 2),
-    hasVerticalScrollBar = _useState40[0],
-    setHasVerticalScrollBar = _useState40[1];
-
   // 暴露给外部的api
   useImperativeHandle(refInstance, function () {
     return {
@@ -428,8 +484,32 @@ var TableMax = function TableMax(_ref) {
 
   /**根据缓存数据设置一些状态 */
   var setColumnInfoFromCache = function setColumnInfoFromCache(tableColumns) {
-    var _localStorage$getItem;
-    var cache = JSON.parse((_localStorage$getItem = localStorage.getItem(tableKey)) !== null && _localStorage$getItem !== void 0 ? _localStorage$getItem : '{}');
+    var _localStorage$getItem2;
+    var cache = JSON.parse((_localStorage$getItem2 = localStorage.getItem(tableKey)) !== null && _localStorage$getItem2 !== void 0 ? _localStorage$getItem2 : '{}');
+    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).map(function (key) {
+        if (!_notVisibleColumns.includes(key)) {
+          _visibleColumnsSizeMap[key] = _initColumnsSizeMap[key];
+        }
+      });
+      visibleColumnsSizing = _visibleColumnsSizeMap;
+      setColumnSizing(changeColumnSizingHandler(_visibleColumnsSizeMap));
+      return;
+    }
     var cacheColumnVisibility = cache.columnVisibility,
       cacheColumnOrder = cache.columnOrder,
       cacheColumnPinning = cache.columnPinning,
@@ -437,10 +517,30 @@ var TableMax = function TableMax(_ref) {
       cacheColumnSorting = cache.columnSorting,
       cacheEnableFilters = cache.enableFilters,
       cacheColumnSizing = cache.columnSizing;
-    setColumnVisibility(_objectSpread(_objectSpread({}, columnVisibleConfig), cacheColumnVisibility));
-    if (cacheColumnSizing) {
-      setColumnSizing(_objectSpread({}, cacheColumnSizing));
-    }
+    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).map(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) {
@@ -476,17 +576,16 @@ var TableMax = function TableMax(_ref) {
     }).length === 0) {
       arr = cacheColumnOrder;
     }
+    // debugger
     setColumnOrder(arr);
   };
-
-  // 初始化columns
-  var columnSizeInfo = useMemo(function () {
-    var _localStorage$getItem2, _table$getState;
+  var setColumnsByProps = useCallback(function () {
+    var extraColumns = [];
     if (getRowCanExpand() && columns.findIndex(function (column) {
       return column.id === 'expander';
     }) === -1) {
-      columns.unshift({
-        id: 'expander',
+      extraColumns.unshift({
+        id: ColumnType.Expander,
         header: function header() {
           return null;
         },
@@ -510,7 +609,7 @@ var TableMax = function TableMax(_ref) {
     if (canSelection && columns.findIndex(function (column) {
       return column.id === ColumnType.Selection;
     }) === -1 && !selectionWithoutChecked) {
-      columns.unshift({
+      extraColumns.unshift({
         id: ColumnType.Selection,
         tooltip: false,
         header: function header(_ref3) {
@@ -550,98 +649,43 @@ var TableMax = function TableMax(_ref) {
         size: 40
       });
     }
-    var cache = JSON.parse((_localStorage$getItem2 = localStorage.getItem(tableKey)) !== null && _localStorage$getItem2 !== void 0 ? _localStorage$getItem2 : '{}');
-    var cacheColumnSizing = cache.columnSizing;
-    var newColumnSizes = _objectSpread(_objectSpread({}, cacheColumnSizing), table === null || table === void 0 || (_table$getState = table.getState()) === null || _table$getState === void 0 ? void 0 : _table$getState.columnSizing);
-    var _setInitColumnsSize = setInitColumnsSize(columns, newColumnSizes),
-      columnsSizeMap = _setInitColumnsSize.columnsSizeMap,
-      newColumns = _setInitColumnsSize.tableColumns;
+    return extraColumns;
+  }, [canSelection, selectionWithoutChecked, getRowCanExpand, columns]);
+
+  // 初始化列
+  useEffect(function () {
+    if (!tableMaxRef.current) return;
+    // 根据props，自动增加勾选列/展开列
+    var newColumns = setColumnsByProps().concat(columns);
+    setTableColumns(newColumns);
+    // 根据缓存进行列设置
+    setColumnInfoFromCache(newColumns);
+    // 判断是否存在列分组
     setHasGroup(newColumns.findIndex(function (column) {
       var _column$columns;
       return (column === null || column === void 0 ? void 0 : column.columns) && ((_column$columns = column.columns) === null || _column$columns === void 0 ? void 0 : _column$columns.length) > 0;
     }) > -1);
-    // setInitTableSizeColumns([...newColumns]);
-    setColumnInfoFromCache(newColumns);
-    setInitColumnsSizing(columnsSizeMap);
-    setColumnSizing(columnsSizeMap);
-    console.log('columnsSizeMap :>> ', columnsSizeMap);
-    setTableColumns(cloneDeep(newColumns));
-    return getSizeInfo(newColumns);
   }, [columns]);
 
-  // useEffect(() => {
-  //   setHasVerticalScrollBar(tableBodyRef?.current?.scrollHeight - tableBodyRef?.current?.clientHeight > 0);
-  // }, [tableBodyRef?.current?.clientHeight, tableBodyRef?.current?.scrollHeight, tableDatas.length]);
-
-  useEffect(function () {
-    var _tableContentRef$curr;
-    //默认宽度
-    var dom = document.getElementById("".concat(tableId, "-TableCore"));
-    if (!dom) return;
-    var defaultSize = 60;
-    var allCount = columnSizeInfo.allCount,
-      hasSizeCount = columnSizeInfo.hasSizeCount,
-      columns = columnSizeInfo.columns,
-      hasSizeAllWidth = columnSizeInfo.hasSizeAllWidth;
-    //表格宽度，offsetWidth?下面监听里用的clientWidth
-    // 空白宽度
-    var remainWidth = (tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.clientWidth) - hasSizeAllWidth - 10 || 0;
-    // 没有配置宽度size的列的数量
-    var remainCount = allCount - hasSizeCount;
-    var aveSize;
-    if (remainWidth > 0 && remainCount) {
-      aveSize = Math.max(remainWidth / remainCount, defaultSize);
-    } else {
-      aveSize = undefined;
-    }
-    var _setRemainColumnsWidt = setRemainColumnsWidth(columns, aveSize),
-      newColumns = _setRemainColumnsWidt.columns,
-      columnsWidthMap = _setRemainColumnsWidt.columnsWidthMap;
-    // setInitTableSizeColumns(cloneDeep(newColumns));
-    setTableColumns(cloneDeep(newColumns));
-    setInitColumnsSizing(columnsWidthMap);
-    setColumnSizing(columnsWidthMap);
-    console.log('columnsSizeMap2 :>> ', columnsWidthMap);
-  }, [columnSizeInfo]);
-
-  // 添加 or 删除 空白列
-  useEffect(function () {
-    if ((tableColumns === null || tableColumns === void 0 ? void 0 : tableColumns.length) <= 0 || !tableContainerWidth) return;
-    var placeholderColumn = table.getAllColumns().some(function (item) {
-      return item.id === ColumnType.PlaceHolder;
-    }) ? table.getColumn(ColumnType.PlaceHolder) : null;
-    // let newColumns = initTableSizeColumns;
-    var scrollBarWidth = hasVerticalScrollBar ? 10 : 0;
-    var tableColumnsWidthWithoutEmpty = table.getTotalSize() - ((placeholderColumn === null || placeholderColumn === void 0 ? void 0 : placeholderColumn.getSize()) || 0);
-    var newEmptyColumnsWidth = tableContainerWidth - tableColumnsWidthWithoutEmpty - scrollBarWidth;
-    setTableColumns(produce(function (draft) {
-      if (!placeholderColumn) {
-        if (newEmptyColumnsWidth <= 0) return;
-        draft.push({
-          id: ColumnType.PlaceHolder,
-          size: newEmptyColumnsWidth,
-          accessorKey: null,
-          header: function header() {
-            return null;
-          },
-          tooltip: false
-        });
-      } else {
-        if (newEmptyColumnsWidth === (placeholderColumn === null || placeholderColumn === void 0 ? void 0 : placeholderColumn.getSize())) return;
-        draft.some(function (item, index) {
-          if (item.id === ColumnType.PlaceHolder) {
-            if (newEmptyColumnsWidth <= 0) {
-              draft.splice(index, 1);
-            } else {
-              item.size = newEmptyColumnsWidth;
-            }
-            return true;
-          }
-          return false;
-        });
+  // 列显示隐藏改变，修改初始化列宽Map
+  useUpdateEffect(function () {
+    var visibleColumnsSizeMap = {};
+    var notVisibleColumns = Object.keys(columnVisibleConfig).filter(function (key) {
+      return !columnVisibleConfig[key];
+    });
+    allColumnCount = table.getCenterVisibleLeafColumns().length;
+    Object.keys(initColumnsSizing).map(function (key) {
+      if (!notVisibleColumns.includes(key)) {
+        visibleColumnsSizeMap[key] = initColumnsSizing[key];
       }
-    }));
-  }, [tableContainerWidth, hasVerticalScrollBar, table.getState().columnSizing]);
+    });
+    visibleColumnsSizing = visibleColumnsSizeMap;
+  }, [columnVisibleConfig]);
+
+  // 容器宽度改变，重新计算列宽
+  useUpdateEffect(function () {
+    changeColumnSizingHandler(changeColumnSizingHandler(visibleColumnsSizing));
+  }, [tableContainerWidth]);
   var _rowSelectionChange = useCallback(debounce(function (rowOriginal, row) {
     if (rowSelectionChange) {
       rowSelectionChange(rowOriginal, row);
@@ -700,43 +744,19 @@ var TableMax = function TableMax(_ref) {
   }, [JSON.stringify(sorting), canSorting, manualSorting]);
   useEffect(function () {
     var myObserver = new ResizeObserver(function (entries) {
-      var _iterator = _createForOfIteratorHelper(entries),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var entrie = _step.value;
-          //@ts-ignore
-          var clientWidth = entrie.target.clientWidth;
-          setTableContainerWidth(clientWidth);
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
+      var _entries$0$contentRec;
+      setTableContainerWidth((_entries$0$contentRec = entries[0].contentRect) === null || _entries$0$contentRec === void 0 ? void 0 : _entries$0$contentRec.width);
     });
-    // 监听
-    var dom = document.getElementById("".concat(tableId, "-TableCore"));
-    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-    dom && myObserver.observe(dom);
+    tableMaxRef.current && myObserver.observe(tableMaxRef.current);
     // 移除监听
     return function () {
-      myObserver.disconnect();
+      tableMaxRef.current && myObserver.disconnect();
     };
   }, [tableId]);
 
   /**缓存table数据*/
   useEffect(function () {
-    var _localStorage$getItem3;
     var tableState = table.getState();
-    var cache = JSON.parse((_localStorage$getItem3 = localStorage.getItem(tableKey)) !== null && _localStorage$getItem3 !== void 0 ? _localStorage$getItem3 : '{}');
-    var cacheColumnSizing = cache.columnSizing;
-    var changedColumnsSizing = {};
-    Object.keys(initColumnsSizing).forEach(function (item) {
-      if (initColumnsSizing[item] !== tableState.columnSizing[item]) {
-        changedColumnsSizing[item] = tableState.columnSizing[item];
-      }
-    });
     localStorage.setItem(tableKey, JSON.stringify({
       columnVisibility: tableState.columnVisibility,
       columnPinning: tableState.columnPinning,
@@ -744,14 +764,9 @@ var TableMax = function TableMax(_ref) {
       columnFilters: tableState.columnFilters,
       columnSorting: tableState.sorting,
       enableFilters: enableFilters,
-      // @ts-ignore
-      // columnSizes: tableState.columnSizes,
-      columnSizing: _objectSpread(_objectSpread({}, cacheColumnSizing), changedColumnsSizing)
+      editTime: new Date()
     }));
-  }, [table.getState().columnVisibility, table.getState().columnPinning, table.getState().columnOrder, table.getState().columnFilters, table.getState().sorting, enableFilters,
-  // @ts-ignore
-  // table.getState().columnSizes,
-  table.getState().columnSizing]);
+  }, [table.getState().columnVisibility, table.getState().columnPinning, table.getState().columnOrder, table.getState().columnFilters, table.getState().sorting, enableFilters]);
   var reorderRow = useCallback(function (fromDatas, toDatas) {
     var draggedRow = fromDatas.draggedRow,
       isMultipleDrag = fromDatas.isMultipleDrag,
@@ -828,13 +843,13 @@ var TableMax = function TableMax(_ref) {
 
   // 把row数据填充到表单
   var setFormData = function setFormData(rowOriginal) {
-    var _Object$keys;
+    var _Object$keys3;
     var formData = {};
     var columnsMap = {};
     tableColumns === null || tableColumns === void 0 || tableColumns.forEach(function (col) {
       columnsMap[col.accessorKey] = col;
     });
-    (_Object$keys = Object.keys(rowOriginal)) === null || _Object$keys === void 0 || _Object$keys.forEach(function (item) {
+    (_Object$keys3 = Object.keys(rowOriginal)) === null || _Object$keys3 === void 0 || _Object$keys3.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];
@@ -959,7 +974,7 @@ var TableMax = function TableMax(_ref) {
   useEffect(function () {
     // 表格宽度变化时（比如调整页面宽度大小），重新计算是否展示阴影
     getPinShadowInfo();
-  }, [tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr2 = tableContentRef.current) === null || _tableContentRef$curr2 === void 0 ? void 0 : _tableContentRef$curr2.clientWidth]);
+  }, [tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.clientWidth, table.getState().columnSizing]);
   var scrollHandler = useCallback(function (event) {
     if (!event.currentTarget) return;
     tableHeaderRef.current.scrollLeft = event.currentTarget.scrollLeft / event.currentTarget.scrollWidth * (tableHeaderRef === null || tableHeaderRef === void 0 ? void 0 : tableHeaderRef.current.scrollWidth);
@@ -987,7 +1002,6 @@ var TableMax = function TableMax(_ref) {
     hasGroup: hasGroup,
     getHeaderCellProps: getHeaderCellProps,
     columnResizeMode: columnResizeMode,
-    hasVerticalScrollBar: hasVerticalScrollBar,
     shadowColumnInfo: shadowColumnInfo
   };
   var tableBodyProps = {
@@ -1034,7 +1048,6 @@ var TableMax = function TableMax(_ref) {
     datas: datas,
     theme: theme,
     dragBeforeStart: dragBeforeStart,
-    hasVerticalScrollBar: hasVerticalScrollBar,
     shadowColumnInfo: shadowColumnInfo,
     getContextMenu: getContextMenu,
     onClickContextMenu: onClickContextMenu,
@@ -1053,9 +1066,8 @@ var TableMax = function TableMax(_ref) {
           width: "100%",
           height: "".concat(autoHeight ? '100%' : '')
         },
-        id: "".concat(tableId, "-TableCore")
-        // style={{ width: `${tableContainerWidth}px` }}
-        ,
+        id: "".concat(tableId, "-TableCore"),
+        ref: tableMaxRef,
         children: [renderOperate ? renderOperate : !renderOperateLeft && !renderOperateRight && !tableTitle && !canRefresh && !canEditting && !canDelete && !canSetting ? null : /*#__PURE__*/_jsxs("div", {
           className: "table-max-header",
           children: [renderOperateLeft ? !editingRowId ? renderOperateLeft : /*#__PURE__*/_jsx("span", {}) : /*#__PURE__*/_jsx("div", {
@@ -1132,24 +1144,24 @@ var TableMax = function TableMax(_ref) {
           className: "table-max-content cus-table-max-content",
           children: /*#__PURE__*/_jsxs("div", {
             className: "table-center",
-            ref: tableContentRef,
-            style: {
-              maxHeight: !autoHeight ? defaultScrollY : 'fit-content'
-            },
-            children: [/*#__PURE__*/_jsx("div", {
-              ref: tableHeaderRef,
-              className: "table-header",
-              style: {
-                width: "".concat(tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr3 = tableContentRef.current) === null || _tableContentRef$curr3 === void 0 ? void 0 : _tableContentRef$curr3.clientWidth, "px"),
-                height: 'fit-content'
-              },
-              children: /*#__PURE__*/_jsx(TableHeader, _objectSpread({}, tableHeaderProps))
+            ref: tableContentRef
+            // style={{ maxHeight: !autoHeight ? defaultScrollY : 'fit-content' }}
+            ,
+            children: [/*#__PURE__*/_jsxs("div", {
+              className: "table-header-wrapper",
+              children: [/*#__PURE__*/_jsx("div", {
+                ref: tableHeaderRef,
+                className: "table-header",
+                children: /*#__PURE__*/_jsx(TableHeader, _objectSpread({}, tableHeaderProps))
+              }), /*#__PURE__*/_jsx("div", {
+                className: "table-header-scroll"
+              })]
             }), /*#__PURE__*/_jsx("div", {
               ref: tableBodyRef,
               className: "table-body",
               onScroll: scrollHandler,
               style: {
-                width: "".concat(tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr4 = tableContentRef.current) === null || _tableContentRef$curr4 === void 0 ? void 0 : _tableContentRef$curr4.clientWidth, "px")
+                width: "100%"
               },
               children: /*#__PURE__*/_jsx(TableBody, _objectSpread({}, tableBodyProps))
             })]

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

@@ -5,6 +5,7 @@
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  box-sizing: border-box !important;
 
   .ellipsis {
     display: inline;

package/dist/components/TableMax/tableMax.less

@@ -100,15 +100,28 @@
       overflow-y: hidden !important;
       display: flex;
       flex-direction: column;
-
-      .table-header {
-        overflow: hidden;
+      .table-header-wrapper {
+        display: flex;
         background: @tableColor2;
+        
+        .table-header {
+          overflow: hidden;
+          box-sizing: border-box;
+          height: fit-content;
+          flex: 1;
+        }
+
+        .table-header-scroll {
+          width: 10px;
+          height: 100%;
+        }
       }
 
+      
+
       .table-body {
         flex: 1;
-        overflow: auto auto;
+        overflow: scroll scroll;
         // background: @tableColor2;
 
         &::-webkit-scrollbar {

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

@@ -5,6 +5,7 @@ export declare const getSizeInfo: (columns: TableMaxColumnType[]) => {
     hasSizeCount: number;
     hasSizeAllWidth: number;
     columns: TableMaxColumnType[];
+    columnSizeMap: {};
 };
 export declare function getTextWidth(text: string, fontSize: number): any;
 export declare const setRemainColumnsWidth: (initColumns: TableMaxColumnType[], defaultSize?: number) => {
@@ -12,7 +13,7 @@ export declare const setRemainColumnsWidth: (initColumns: TableMaxColumnType[],
     tableColumnsWidth: number;
     columnsWidthMap: {};
 };
-export declare const setInitColumnsSize: (tableColumns: any, columnsMap: any) => {
+export declare const setInitColumnsSize: (tableColumns: any, columnsMap: any, defaultSize?: number) => {
     columnsSizeMap: {};
     tableColumns: any;
 };