@arim-aisdc/public-components 2.3.4 → 2.3.6

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/GlobalTip/ModalTip/ModalTip.js

@@ -2,12 +2,6 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 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 _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); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return 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; }
@@ -17,7 +11,6 @@ import { Modal } from 'antd';
 import MessageTip from "../MessageTip";
 import "./index.less";
 import { themeStyle } from "./utils";
-import { useTranslation } from "../../../hooks/useTranslation";
 import { jsx as _jsx } from "react/jsx-runtime";
 var modal = null;
 var config = function config(_ref) {
@@ -111,16 +104,12 @@ var confirmModal = function confirmModal(_ref4) {
     cancelText = _ref4.cancelText,
     centered = _ref4.centered,
     deleteActionName = _ref4.deleteActionName;
-  var _useTranslation = useTranslation(),
-    _useTranslation2 = _slicedToArray(_useTranslation, 1),
-    t = _useTranslation2[0];
   Modal.confirm({
-    title: title ? title : t('global.message.confirmDeleteTitle'),
+    title: title ? title : '确认删除这条信息吗？',
     // '确认删除这条信息吗？',
-    // content: content || content === '' ? content : '删除后可能无法恢复，请谨慎操作！',
-    content: content || content === '' ? content : t('global.message.confirmDeleteSubTitle'),
-    okText: okText ? okText : t('global.button.confirm'),
-    cancelText: cancelText ? cancelText : t('global.button.cancel'),
+    content: content || content === '' ? content : '删除后可能无法恢复，请谨慎操作！',
+    okText: okText ? okText : '确定',
+    cancelText: cancelText ? cancelText : '取消',
     styles: {
       body: themeStyle('bodyStyle'),
       // 背景颜色
@@ -144,8 +133,7 @@ var confirmModal = function confirmModal(_ref4) {
             case 0:
               MessageTip.loading({
                 key: 'delete',
-                // content: deleteActionName ? `${deleteActionName}中` : '删除中',
-                content: deleteActionName ? t('global.message.actioning', deleteActionName) : t('global.message.deleting')
+                content: deleteActionName ? "".concat(deleteActionName, "\u4E2D") : '删除中'
               });
               _context.next = 3;
               return handlerConfirm();
@@ -154,7 +142,7 @@ var confirmModal = function confirmModal(_ref4) {
               if (!(resp !== null && resp !== void 0 && resp[0])) {
                 MessageTip.success({
                   key: 'delete',
-                  content: deleteActionName ? t('global.message.successAction', deleteActionName) : t('global.message.deleteSuccess')
+                  content: deleteActionName ? "".concat(deleteActionName, "\u6210\u529F") : '删除成功'
                 });
               }
             case 5:

package/dist/components/TableMax/TableMax.js

@@ -54,7 +54,7 @@ var getCurrentRouterName = function getCurrentRouterName() {
   return window.location.pathname.slice(1);
 };
 var TableMax = function TableMax(_ref) {
-  var _JSON$parse, _tableContentRef$curr;
+  var _JSON$parse, _tableContentRef$curr, _tableContentRef$curr2;
   var tableId = _ref.tableId,
     originColumns = _ref.columns,
     _ref$datas = _ref.datas,
@@ -187,6 +187,10 @@ var TableMax = function TableMax(_ref) {
     request = _ref.request,
     onEditValueChange = _ref.onEditValueChange;
   var tableMaxRef = useRef(null);
+  // 表格元素
+  var tableContentRef = useRef(null);
+  var tableHeaderRef = useRef(null);
+  var tableBodyRef = useRef(null);
   var _useTranslation = useTranslation(),
     _useTranslation2 = _slicedToArray(_useTranslation, 1),
     t = _useTranslation2[0];
@@ -283,7 +287,7 @@ var TableMax = function TableMax(_ref) {
     columnPinning = _useState20[0],
     setColumnPinning = _useState20[1];
   var _useColumnWidth = useColumnWidth({
-      tableMaxRef: tableMaxRef,
+      tableContentRef: tableContentRef,
       tableId: tableId,
       tableKeyPrefixCls: tableKeyPrefixCls,
       columnVisibleConfig: columnVisibleConfig,
@@ -294,6 +298,7 @@ var TableMax = function TableMax(_ref) {
     onColumnSizingChange = _useColumnWidth.onColumnSizingChange,
     tableContainerWidth = _useColumnWidth.tableContainerWidth,
     handleVisibleConfigChange = _useColumnWidth.handleVisibleConfigChange;
+  console.log('columnSizing', columnSizing, tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.getBoundingClientRect().width, tableContainerWidth);
 
   /**列筛选 */
   var _useState21 = useState(defaultColumnFilters),
@@ -426,10 +431,6 @@ var TableMax = function TableMax(_ref) {
     onExpandedChange: setExpanded,
     sortDescFirst: true // 首次排序为递减排序，不加这个属性的话，有些列的排序会有问题
   });
-  // 表格元素
-  var tableContentRef = useRef(null);
-  var tableHeaderRef = useRef(null);
-  var tableBodyRef = useRef(null);
 
   // 暴露给外部的api
   useImperativeHandle(refInstance, function () {
@@ -952,7 +953,7 @@ var TableMax = function TableMax(_ref) {
   useEffect(function () {
     // 表格宽度变化时（比如调整页面宽度大小），重新计算是否展示阴影
     getPinShadowInfo();
-  }, [tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.clientWidth, table.getState().columnSizing]);
+  }, [tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr2 = tableContentRef.current) === null || _tableContentRef$curr2 === void 0 ? void 0 : _tableContentRef$curr2.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);

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

@@ -1,13 +1,13 @@
 /// <reference types="react" />
 import { ColumnSizing } from '../TableMax';
 interface UseColumnWidthProps {
-    tableMaxRef: React.RefObject<HTMLDivElement>;
+    tableContentRef: React.RefObject<HTMLDivElement>;
     tableId: string;
     tableKeyPrefixCls: string;
     columnVisibleConfig?: Record<string, boolean>;
     tableKey: string;
 }
-export declare const useColumnWidth: ({ tableMaxRef, tableId, tableKeyPrefixCls, columnVisibleConfig, tableKey, }: UseColumnWidthProps) => {
+export declare const useColumnWidth: ({ tableContentRef, tableId, tableKeyPrefixCls, columnVisibleConfig, tableKey, }: UseColumnWidthProps) => {
     columnSizing: ColumnSizing;
     allColumnCount: number;
     onColumnSizingChange: (data: any) => void;

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

@@ -16,7 +16,7 @@ import { debounce } from 'lodash';
 var CACHE_MAX_AGE = 1 * 60 * 60 * 1000; // 1小时
 
 export var useColumnWidth = function useColumnWidth(_ref) {
-  var tableMaxRef = _ref.tableMaxRef,
+  var tableContentRef = _ref.tableContentRef,
     tableId = _ref.tableId,
     tableKeyPrefixCls = _ref.tableKeyPrefixCls,
     _ref$columnVisibleCon = _ref.columnVisibleConfig,
@@ -33,6 +33,13 @@ export var useColumnWidth = function useColumnWidth(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     state = _useState2[0],
     setState = _useState2[1];
+  var getTableWidth = useCallback(function () {
+    var _tableContentRef$curr;
+    var width = (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.getBoundingClientRect().width;
+    var style = window.getComputedStyle(tableContentRef.current);
+    var horizontalBorderWidth = parseFloat(style.getPropertyValue('border-left-width')) + parseFloat(style.getPropertyValue('border-right-width'));
+    return Math.floor(width - horizontalBorderWidth);
+  }, [tableContentRef]);
 
   /**
   * 处理容器宽度变化的逻辑
@@ -42,8 +49,8 @@ export var useColumnWidth = function useColumnWidth(_ref) {
   * 列宽之和小于容器宽度，除选择列和展开列外，其他列平分 列宽之和与容器宽度的差值
   */
   var handleResize = useCallback(function () {
-    if (!tableMaxRef.current) return;
-    var newWidth = Math.floor(tableMaxRef.current.clientWidth);
+    if (!tableContentRef.current) return;
+    var newWidth = getTableWidth();
     setState(function (prevState) {
       // 计算可见列，排除特定列
       var visibleColumns = Object.keys(prevState.columnSizing).filter(function (key) {
@@ -83,21 +90,21 @@ export var useColumnWidth = function useColumnWidth(_ref) {
         tableContainerWidth: newWidth
       });
     });
-  }, [tableMaxRef.current]);
+  }, [tableContentRef.current]);
 
   // 使用防抖处理容器宽度变化
   var debouncedHandleResize = useMemo(function () {
     return debounce(handleResize, 200);
   }, [handleResize]);
   useEffect(function () {
-    if (!tableMaxRef.current) return;
+    if (!tableContentRef.current) return;
     var resizeObserver = new ResizeObserver(debouncedHandleResize);
-    resizeObserver.observe(tableMaxRef.current);
+    resizeObserver.observe(tableContentRef.current);
     return function () {
       resizeObserver.disconnect();
       debouncedHandleResize.cancel(); // 清理防抖
     };
-  }, [tableMaxRef.current, debouncedHandleResize]);
+  }, [tableContentRef.current, debouncedHandleResize]);
 
   /**
   * 列显示隐藏后调整列宽
@@ -122,11 +129,10 @@ export var useColumnWidth = function useColumnWidth(_ref) {
           })
         });
       } else {
-        var _tableMaxRef$current;
         //列宽减少
         var newVisibleColumnsSizing = prevState.columnSizing;
         delete newVisibleColumnsSizing[key];
-        var containerWidth = ((_tableMaxRef$current = tableMaxRef.current) === null || _tableMaxRef$current === void 0 ? void 0 : _tableMaxRef$current.clientWidth) - 10 || 0;
+        var containerWidth = getTableWidth() - 10 || 0;
         // 计算当前总宽度
         var totalWidth = Object.values(newVisibleColumnsSizing).reduce(function (sum, width) {
           return Number(sum || 0) + Number(width || 0);
@@ -164,8 +170,8 @@ export var useColumnWidth = function useColumnWidth(_ref) {
    * */
   var calculateColumnSizing = useCallback(function (columnsSizeMap, allColumnCount, containerWidth) {
     var _Object$keys$filter;
-    if (!tableMaxRef.current || !columnsSizeMap) return {};
-    var currentWidth = containerWidth || state.tableContainerWidth || tableMaxRef.current.clientWidth;
+    if (!tableContentRef.current || !columnsSizeMap) return {};
+    var currentWidth = containerWidth || state.tableContainerWidth || getTableWidth();
     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;
@@ -280,7 +286,6 @@ export var useColumnWidth = function useColumnWidth(_ref) {
     var changedColumn = data();
     if (!changedColumn) return;
     setState(function (prevState) {
-      var _tableMaxRef$current2;
       var changedColumnKey = Object.keys(changedColumn)[0];
       if (!changedColumnKey) return prevState;
       var oldWidth = prevState.columnSizing[changedColumnKey] || 0;
@@ -295,7 +300,7 @@ export var useColumnWidth = function useColumnWidth(_ref) {
       var totalWidth = Object.values(newVisibleColumnsSizing).reduce(function (sum, width) {
         return Number(sum || 0) + Number(width || 0);
       }, 0);
-      var containerWidth = ((_tableMaxRef$current2 = tableMaxRef.current) === null || _tableMaxRef$current2 === void 0 ? void 0 : _tableMaxRef$current2.clientWidth) - 10 || 0;
+      var containerWidth = getTableWidth() - 10 || 0;
       console.log(widthDiff, newWidth, oldWidth, changedColumnKey, prevState, 3344);
 
       // 处理列宽变大

package/dist/components/TableMax/tableMax.less

@@ -5,6 +5,7 @@
   width: 100%;
   display: flex;
   flex-direction: column;
+  box-sizing: border-box;
   // justify-content: center;
   // align-items: center;
 
@@ -119,7 +120,6 @@
       overflow-y: hidden !important;
       display: flex;
       flex-direction: column;
-
       border: @global-table-max-border;
       border-bottom: @global-table-max-center-border-bottom;
       border-radius: @global-table-max-center-border-radius;
@@ -146,7 +146,7 @@
 
       .table-body {
         flex: 1;
-        overflow: auto scroll;
+        overflow: scroll scroll;
         font-weight: @global-table-max-body-font-weight;
         // background: @tableColor2;
         .tbody-tr-td {

package/package.json

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