@teamix/pro 1.5.30 → 1.5.32

package/lib/table/index.js

@@ -8,6 +8,7 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _components = require("@alicloudfe/components");
 var _Pagination = _interopRequireDefault(require("./components/Pagination"));
+var _TableContent = _interopRequireDefault(require("./components/TableContent"));
 var _genProColumnToColumn = _interopRequireDefault(require("./utils/genProColumnToColumn"));
 var _utils = require("@teamix/utils");
 var _skeleton = require("../skeleton");
@@ -15,10 +16,8 @@ require("./index.scss");
 var _Layout = _interopRequireDefault(require("./components/Layout"));
 var _utils2 = require("./utils");
 var _getTableProps = _interopRequireDefault(require("./utils/getTableProps"));
-var _getTableSortIcons = _interopRequireDefault(require("./utils/getTableSortIcons"));
 var _useTableSelection = _interopRequireDefault(require("./utils/useTableSelection"));
 var _Fullscreen = _interopRequireDefault(require("./components/ToolBar/Fullscreen"));
-var _proField = require("@teamix/pro-field");
 var _actions = require("../actions");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _pageContainer = _interopRequireDefault(require("../page-container"));
@@ -27,6 +26,7 @@ var _lodash = _interopRequireDefault(require("lodash.debounce"));
 var _CardView = _interopRequireDefault(require("./components/CardView"));
 var _hooks = require("@teamix/hooks");
 var _util = require("./utils/util");
+var _processColumns = _interopRequireDefault(require("./utils/processColumns"));
 var _typing = require("./typing");
 Object.keys(_typing).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -49,6 +49,9 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 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(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 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); }
@@ -57,44 +60,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 var cls = (0, _utils.usePrefixCls)('teamix-pro-table');
-/**
- * 处理原生传入的 columns 以便于 选择列 方便处理
- * @param columns 原生传入的 columns
- * @returns
- */
-var processColumns = function processColumns(columns, initialColumns) {
-  var _getGlobalConfig;
-  var globalFilterColumns = (_getGlobalConfig = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.filterColumns;
-  var filterColumns = columns.filter(function (item) {
-    return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(_objectSpread({}, item)));
-  });
-  // 处理只剩一列批量选择的情况下宽度错乱问题
-  if (filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) {
-    var _initialColumns$;
-    if ((filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) === 1) {
-      var _filterColumns$, _filterColumns$2;
-      if ((_filterColumns$ = filterColumns[0]) === null || _filterColumns$ === void 0 ? void 0 : _filterColumns$.width) {
-        delete filterColumns[0].width;
-      }
-      if ((_filterColumns$2 = filterColumns[0]) === null || _filterColumns$2 === void 0 ? void 0 : _filterColumns$2.lock) {
-        filterColumns[0].lock = false;
-      }
-    } else if (((_initialColumns$ = initialColumns[0]) === null || _initialColumns$ === void 0 ? void 0 : _initialColumns$.columnFilters) !== false) {
-      var _initialColumns$2, _initialColumns$3;
-      if ((_initialColumns$2 = initialColumns[0]) === null || _initialColumns$2 === void 0 ? void 0 : _initialColumns$2.width) {
-        filterColumns[0].width = initialColumns[0].width;
-      }
-      if ((_initialColumns$3 = initialColumns[0]) === null || _initialColumns$3 === void 0 ? void 0 : _initialColumns$3.lock) {
-        filterColumns[0].lock = initialColumns[0].lock;
-      }
-    }
-  }
-  return filterColumns;
-};
 /** 默认请求翻页参数 */
 var globalPageKey = 'currentPage';
 var globalPageSizeKey = 'pageSize';
@@ -219,7 +185,9 @@ var ProTable = function ProTable(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     showSkeleton = _useState12[0],
     setShowSkeleton = _useState12[1]; // 首次加载，渲染骨架屏
-  var skeletonDataSource = new Array(skeletonSize).fill({});
+  var skeletonDataSource = (0, _react.useMemo)(function () {
+    return new Array(skeletonSize).fill({});
+  }, [skeletonSize]);
   var requestDataKey = method.toLowerCase() === 'get' ? 'params' : 'data';
   // 如果使用 customRequest 的话，内置 loading
   var _useState13 = (0, _react.useState)(requestWhenMount),
@@ -229,14 +197,14 @@ var ProTable = function ProTable(props) {
   var tableRef = (0, _react.useRef)(null);
   var actionRef = (0, _react.useRef)();
   // 传给 table 的过滤后的 columns
-  var _useState15 = (0, _react.useState)(processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : [], propsColumns)),
+  var _useState15 = (0, _react.useState)((0, _processColumns.default)(propsColumns !== null && propsColumns !== void 0 ? propsColumns : [], propsColumns)),
     _useState16 = _slicedToArray(_useState15, 2),
     filteredColumns = _useState16[0],
     setFilteredColumns = _useState16[1];
   // 全局状态 ： 自适应表格
   var autoWidth = (0, _react.useMemo)(function () {
-    var _getGlobalConfig2;
-    return ((_getGlobalConfig2 = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig2 === void 0 ? void 0 : _getGlobalConfig2.autoWidth) || autoWidthProp;
+    var _getGlobalConfig;
+    return ((_getGlobalConfig = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.autoWidth) || autoWidthProp;
   }, [autoWidthProp]);
   // 判断是否有操作列，有的话则渲染一个 shadow dom
   var hasActionColumn = false;
@@ -426,8 +394,8 @@ var ProTable = function ProTable(props) {
   });
   // 全局状态 ： 大数据截断
   var globalUseMaxData = (0, _react.useMemo)(function () {
-    var _getGlobalConfig3;
-    return (_getGlobalConfig3 = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig3 === void 0 ? void 0 : _getGlobalConfig3.useMaxData;
+    var _getGlobalConfig2;
+    return (_getGlobalConfig2 = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig2 === void 0 ? void 0 : _getGlobalConfig2.useMaxData;
   }, []);
   // 非全屏状态下的
   var normalDataFilterFormRef = (0, _react.useRef)();
@@ -541,7 +509,7 @@ var ProTable = function ProTable(props) {
   }, [propsActionRef]);
   (0, _react.useEffect)(function () {
     var _actionRef$current, _actionRef$current$se;
-    var columns = processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : [], propsColumns);
+    var columns = (0, _processColumns.default)(propsColumns !== null && propsColumns !== void 0 ? propsColumns : [], propsColumns);
     setFilteredColumns(columns);
     (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setState) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, 'filterColumns', columns);
   }, [propsColumns]);
@@ -600,7 +568,7 @@ var ProTable = function ProTable(props) {
     setColumn: function setColumn(newColumns) {
       var _actionRef$current3, _actionRef$current3$s;
       var update = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-      var columns = processColumns(newColumns, propsColumns);
+      var columns = (0, _processColumns.default)(newColumns, propsColumns);
       setFilteredColumns(columns);
       (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$s = _actionRef$current3.setState) === null || _actionRef$current3$s === void 0 ? void 0 : _actionRef$current3$s.call(_actionRef$current3, 'filterColumns', columns);
       if (update) {
@@ -766,7 +734,9 @@ var ProTable = function ProTable(props) {
     if (Number.isInteger(time) && time >= 1000) {
       autoRefreshTimerRef.current = setTimeout(function () {
         // 自动刷新不显示 loading
-        _request({}, true);
+        // 当表格自适应时，自动刷新要显示 loading ，否则表格自适应会出问题
+        // setShowLoading(true)
+        _request({}, !autoWidth);
       }, Number(time));
       (0, _utils2.emit)('PRO_TABLE_REFRESH_TIMER_FLAG', Number(time));
     }
@@ -851,7 +821,7 @@ var ProTable = function ProTable(props) {
     }
   });
   // 请求函数
-  function _request(params, noLoading, filterParams, isReset) {
+  var _request = (0, _react.useCallback)(function (params, noLoading, filterParams, isReset) {
     var _dataFilterFormRef$cu2, _actionRef$current$ge, _actionRef$current6, _actionRef$current6$g, _objectSpread3;
     // 首次渲染表格，获取 urlState 上的 表头 filter 数据
     if (bindUrl && (bindUrlProps === null || bindUrlProps === void 0 ? void 0 : bindUrlProps.headerFilters) !== false && dataRef.current.flag) {
@@ -955,7 +925,7 @@ var ProTable = function ProTable(props) {
           if (Number.isInteger(time) && time >= 1000) {
             autoRefreshTimerRef.current = setTimeout(function () {
               // 自动刷新不显示 loading
-              _request(params, true);
+              _request(params, !autoWidth);
             }, Number(time));
             (0, _utils2.emit)('PRO_TABLE_REFRESH_TIMER_FLAG', Number(time));
           }
@@ -966,57 +936,63 @@ var ProTable = function ProTable(props) {
         getData.run(requestData);
       }
     }
-  }
-  function onSort(dataIndex, order) {
+  }, [bindUrl, bindUrlProps, dataRef, url, customRequest]);
+  var onSort = (0, _react.useCallback)(function (dataIndex, order) {
     var nextSort = _defineProperty({}, dataIndex, order);
     setSort(nextSort);
     _request(targetFormatSort(nextSort));
-  }
+  }, [_request, targetFormatSort]);
   // 处理 dataFilter 中的 onFilter、onReset
-  var dataFilter = _objectSpread(_objectSpread({
-    mode: 'inline',
-    forceClear: true
-  }, propsDataFilter), {}, {
-    onInit: (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit) || requestWhenMount ? function (values) {
-      var _propsDataFilter$onIn;
-      // 表单初始化请求处理
-      propsDataFilter === null || propsDataFilter === void 0 ? void 0 : (_propsDataFilter$onIn = propsDataFilter.onInit) === null || _propsDataFilter$onIn === void 0 ? void 0 : _propsDataFilter$onIn.call(propsDataFilter, values);
-      !fullscreenState && requestWhenMount && _request({}, false, values);
-      return true;
-    } : undefined,
-    onFilter: function onFilter(values) {
-      var _actionRef$current7, _actionRef$current7$c;
-      // 全屏状态，判断全屏表单onFilter是否禁用
-      if (fullscreenState && !filterEnableRef.current.fullscreen) {
-        filterEnableRef.current.fullscreen = true;
-        return;
-      }
-      // 非全屏状态，判断普通表单onFiler是否禁用
-      if (!fullscreenState && !filterEnableRef.current.normal) {
-        filterEnableRef.current.normal = true;
-        return;
+  var dataFilter = (0, _react.useMemo)(function () {
+    return _objectSpread(_objectSpread({
+      mode: 'inline',
+      forceClear: true
+    }, propsDataFilter), {}, {
+      onInit: (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit) || requestWhenMount ? function (values) {
+        var _propsDataFilter$onIn;
+        // 表单初始化请求处理
+        propsDataFilter === null || propsDataFilter === void 0 ? void 0 : (_propsDataFilter$onIn = propsDataFilter.onInit) === null || _propsDataFilter$onIn === void 0 ? void 0 : _propsDataFilter$onIn.call(propsDataFilter, values);
+        !fullscreenState && requestWhenMount && _request({}, false, values);
+        return true;
+      } : undefined,
+      onFilter: function onFilter(values) {
+        var _actionRef$current7, _actionRef$current7$c;
+        // 全屏状态，判断全屏表单onFilter是否禁用
+        if (fullscreenState && !filterEnableRef.current.fullscreen) {
+          filterEnableRef.current.fullscreen = true;
+          return;
+        }
+        // 非全屏状态，判断普通表单onFiler是否禁用
+        if (!fullscreenState && !filterEnableRef.current.normal) {
+          filterEnableRef.current.normal = true;
+          return;
+        }
+        (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(values));
+        // 搜索变化时，暂时先清空选择
+        (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$c = _actionRef$current7.clearRowSelection) === null || _actionRef$current7$c === void 0 ? void 0 : _actionRef$current7$c.call(_actionRef$current7);
+        setCurrentPage(1);
+        _request(_defineProperty({}, targetPageKey, 1), false, values);
+      },
+      onReset: function onReset(values) {
+        var _dataFilterFormRef$cu3;
+        (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset());
+        (_dataFilterFormRef$cu3 = dataFilterFormRef.current) === null || _dataFilterFormRef$cu3 === void 0 ? void 0 : _dataFilterFormRef$cu3.reset();
+        setCurrentPage(1);
+        _request(_defineProperty({}, targetPageKey, 1), false, values);
       }
-      (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(values));
-      // 搜索变化时，暂时先清空选择
-      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$c = _actionRef$current7.clearRowSelection) === null || _actionRef$current7$c === void 0 ? void 0 : _actionRef$current7$c.call(_actionRef$current7);
-      setCurrentPage(1);
-      _request(_defineProperty({}, targetPageKey, 1), false, values);
-    },
-    onReset: function onReset(values) {
-      var _dataFilterFormRef$cu3;
-      (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset());
-      (_dataFilterFormRef$cu3 = dataFilterFormRef.current) === null || _dataFilterFormRef$cu3 === void 0 ? void 0 : _dataFilterFormRef$cu3.reset();
-      setCurrentPage(1);
-      _request(_defineProperty({}, targetPageKey, 1), false, values);
-    }
-  });
-  var getTableLoading = function getTableLoading() {
+    });
+  }, [propsDataFilter, fullscreenState, filterEnableRef, actionRef]);
+  var isLoading = (0, _react.useMemo)(function () {
     if (!customRequest) {
       return showLoading && !showSkeleton && (getData.loading || props.loading);
     } else {
       return showLoading && !showSkeleton && (customTableLoading || props.loading);
     }
-  };
+  }, [customRequest, showLoading, showSkeleton, customTableLoading, props.loading, getData]);
+  var memorizedGenProColumnToColumn = (0, _react.useMemo)(function () {
+    var result = (0, _genProColumnToColumn.default)(filteredColumns, showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps);
+    return result;
+  }, [filteredColumns, showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps]);
   var renderTable = function renderTable(isFullScreen) {
     if (propsColumns) {
       return /*#__PURE__*/_react.default.createElement("div", {
@@ -1043,11 +1019,11 @@ var ProTable = function ProTable(props) {
         autoRefreshProps: autoRefreshProps,
         bindUrlProps: bindUrlProps,
         bindUrl: bindUrl
-      }), switchViewState === 'table' && /*#__PURE__*/_react.default.createElement(_components.Table.StickyLock, _objectSpread({
+      }), switchViewState === 'table' && /*#__PURE__*/_react.default.createElement(_TableContent.default, _objectSpread({
         hasBorder: false,
         dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
-        columns: (0, _genProColumnToColumn.default)(filteredColumns, showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps),
-        loading: getTableLoading(),
+        columns: memorizedGenProColumnToColumn,
+        loading: isLoading,
         className: (0, _classnames.default)('teamix-pro-table', tableClassName, {
           'with-row-select': rowSelection,
           'teamix-pro-tree-table': isTree
@@ -1058,14 +1034,12 @@ var ProTable = function ProTable(props) {
         sort: sort,
         primaryKey: primaryKey,
         rowSelection: rowSelection,
-        emptyContent: /*#__PURE__*/_react.default.createElement(_proField.EmptyContent, _objectSpread({}, emptyProps)),
-        sortIcons: (0, _getTableSortIcons.default)(),
         fixedHeader: fullscreenState || fixedTableBody,
         maxBodyHeight: "calc(100vh - ".concat(headerHeight, "px)")
       }, (0, _utils.pickProps)((0, _getTableProps.default)(), otherProps))), switchViewState === 'card' && /*#__PURE__*/_react.default.createElement(_CardView.default, {
         dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
         showSkeleton: showSkeleton,
-        loading: getTableLoading(),
+        loading: isLoading,
         originColumns: propsColumns,
         cardViewProps: cardViewProps,
         scrollHeight: fullscreenState || fixedTableBody ? "calc(100vh - ".concat(headerHeight, "px)") : undefined,
@@ -1107,28 +1081,28 @@ var ProTable = function ProTable(props) {
       })));
     } else return footerAction;
   };
-  var renderFooter = function renderFooter() {
-    function onChangePagination(currentPage) {
-      var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      // 翻页默认清空选择
-      if (!reserveSelectedRecords) {
-        var _actionRef$current8, _actionRef$current8$c;
-        (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
-      }
-      setCurrentPage(currentPage);
-      _request(_objectSpread(_defineProperty({}, targetPageKey, currentPage), params));
+  var onChangePagination = (0, _react.useCallback)(function (currentPage) {
+    var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    // 翻页默认清空选择
+    if (!reserveSelectedRecords) {
+      var _actionRef$current8, _actionRef$current8$c;
+      (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
     }
-    function onChangePaginationSize(currentPageSize) {
-      var _request10;
-      // 翻页默认清空选择
-      if (!reserveSelectedRecords) {
-        var _actionRef$current9, _actionRef$current9$c;
-        (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$c = _actionRef$current9.clearRowSelection) === null || _actionRef$current9$c === void 0 ? void 0 : _actionRef$current9$c.call(_actionRef$current9);
-      }
-      setPageSize(currentPageSize);
-      setCurrentPage(1);
-      _request((_request10 = {}, _defineProperty(_request10, targetPageSizeKey, currentPageSize), _defineProperty(_request10, targetPageKey, 1), _request10));
+    setCurrentPage(currentPage);
+    _request(_objectSpread(_defineProperty({}, targetPageKey, currentPage), params));
+  }, [reserveSelectedRecords, targetPageKey, actionRef]);
+  var onChangePaginationSize = (0, _react.useCallback)(function (currentPageSize) {
+    var _request10;
+    // 翻页默认清空选择
+    if (!reserveSelectedRecords) {
+      var _actionRef$current9, _actionRef$current9$c;
+      (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$c = _actionRef$current9.clearRowSelection) === null || _actionRef$current9$c === void 0 ? void 0 : _actionRef$current9$c.call(_actionRef$current9);
     }
+    setPageSize(currentPageSize);
+    setCurrentPage(1);
+    _request((_request10 = {}, _defineProperty(_request10, targetPageSizeKey, currentPageSize), _defineProperty(_request10, targetPageKey, 1), _request10));
+  }, [reserveSelectedRecords, actionRef, targetPageSizeKey, targetPageKey]);
+  var renderFooter = function renderFooter() {
     function renderRowSelection() {
       if (rowSelection) {
         if (showSkeleton) {

package/lib/table/index.scss

@@ -103,7 +103,7 @@ $fullscreenPadding: 24px;
     pointer-events: none;
     display: flex;
   }
-  
+
   // sort icon
   .next-table-sort.next-table-header-icon {
     line-height: 16px;

package/lib/table/typing.d.ts

@@ -24,6 +24,8 @@ declare type TDataService = {
 };
 export declare type responsivePaginationType = 'mini' | 'small' | 'simple' | 'normal';
 export declare type ProTableColumnProps = {
+    /** 是否开启了自动计算宽度 */
+    isAutoWidth?: boolean;
     /** 自动计算宽度时的被挤占的情况 */
     shrink?: number;
     /** 是否自动适应该列宽度 */

package/lib/table/utils/genAutoWidthColumns.js

@@ -46,11 +46,12 @@ function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection,
   var childNodes = dom.children;
   var finalColumns = [];
   fileteredColumns.forEach(function (column, index) {
+    var _childNodes$index;
     var render = column.render,
       _column$valueType = column.valueType,
       valueType = _column$valueType === void 0 ? 'text' : _column$valueType,
-      _column$autoWidth = column.autoWidth,
-      autoWidth = _column$autoWidth === void 0 ? true : _column$autoWidth,
+      _column$isAutoWidth = column.isAutoWidth,
+      isAutoWidth = _column$isAutoWidth === void 0 ? true : _column$isAutoWidth,
       actionSchema = column.actionSchema,
       sortable = column.sortable,
       lock = column.lock;
@@ -62,6 +63,17 @@ function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection,
     var finalType = type || valueType || '';
     var shrink = fieldTypeShrink[finalType];
     column.shrink = column.shrink || (shrink !== undefined ? shrink : 1);
+    if ((column === null || column === void 0 ? void 0 : column.isAutoWidth) === false) {
+      // console.log(column.title, 'isAutoWidth')
+      finalColumns.push(column);
+      return;
+    }
+    ;
+    if ((column === null || column === void 0 ? void 0 : column.columnFilters) === false) {
+      finalColumns.push(column);
+      return;
+    }
+    // column.isAutoWidth = true
     //@ts-ignore
     // if (!autoWidth) {
     //   finalColumns.push(column);
@@ -82,13 +94,20 @@ function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection,
         if (width >= 280) {
           width = 280;
         }
+        column.isAutoWidth = false;
         column.width = defaultPaddingFixer(width, size, false);
       }
       finalColumns.push(column);
       return;
     }
+    // 当列没出来的时候不比较
     // @ts-ignore
-    var titleWidth = childNodes[index].children[0].scrollWidth;
+    if ((column === null || column === void 0 ? void 0 : column.columnFilters) === false) {
+      finalColumns.push(column);
+      return;
+    }
+    // @ts-ignore
+    var titleWidth = (_childNodes$index = childNodes[index]) === null || _childNodes$index === void 0 ? void 0 : _childNodes$index.children[0].scrollWidth;
     // @ts-ignore
     if (fixedWidthTypeList[finalType]) {
       // console.log(
@@ -96,20 +115,32 @@ function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection,
       //   fixedWidthTypeList[finalType],
       // );
       // 固定宽度
+      // console.log(column.title, '固定宽度')
+      column.isAutoWidth = false;
       column.width = defaultPaddingFixer(
       // @ts-ignore
       Math.max(titleWidth, fixedWidthTypeList[finalType]), size, index === 0 && useRowSelection);
       // @ts-ignore
     } else if (computeableWidthTypeList[finalType]) {
       // 可计算宽度
+      // console.log(column.title, '可计算宽度')
+      column.isAutoWidth = false;
       column.width = defaultPaddingFixer(
       // @ts-ignore
       Math.max(titleWidth, computeableWidthTypeList[finalType](data, render)), size, index === 0 && useRowSelection);
     } else {
       // 直接根据 dom 计算
+      // console.log(column.title, '可计算 dom')
+      column.isAutoWidth = false;
       column.width = defaultPaddingFixer(Math.max(titleWidth,
       // @ts-ignore
       calcWidthWithParentDOM(childNodes[index], column.shrink)), size, index === 0 && useRowSelection);
+      if ((column === null || column === void 0 ? void 0 : column.sortable) && ((column === null || column === void 0 ? void 0 : column.tooltip) || (column === null || column === void 0 ? void 0 : column.filters))) {
+        // 检测有 sortable 和 tooltip 的时候增加宽度
+        column.width = column.width + 40;
+      } else if (column === null || column === void 0 ? void 0 : column.sortable) {
+        column.width = column.width + 24;
+      }
     }
     if (index === 0) {
       // 首列不会被挤占
@@ -146,8 +177,12 @@ var shadowContainer = function shadowContainer(props) {
       //@ts-ignore
       !fixedWidthTypeList[valueType] && data.map(function (item, index) {
         // @ts-ignore
-        column.smartWidth = (0, _columnRender.renderCellSmartWidth)(getValueFromRecord(dataIndex, item), column, index, item);
-        return (0, _pureColumnRender.renderCell)(getValueFromRecord(dataIndex, item), column, index, item);
+        var newColumn = _.cloneDeep(column);
+        newColumn.smartWidth = (0, _columnRender.renderCellSmartWidth)(getValueFromRecord(dataIndex, item), column, index, item);
+        newColumn.render = _objectSpread(_objectSpread({}, column.render), {}, {
+          description: ''
+        });
+        return (0, _pureColumnRender.renderCell)(getValueFromRecord(dataIndex, item), newColumn, index, item);
       }));
     }
   }));
@@ -315,7 +350,8 @@ function defaultPaddingFixer(width) {
 }
 function sum() {
   var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  return list.reduce(function (a, b) {
+  if (list.length === 0) return 0;
+  return list === null || list === void 0 ? void 0 : list.reduce(function (a, b) {
     return a + b;
   });
 }

package/lib/table/utils/genProColumnToColumn.js

@@ -8,6 +8,7 @@ var _react = _interopRequireDefault(require("react"));
 var _columnRender = require("./columnRender");
 var _skeleton = require("../../skeleton");
 var _utils = require("@teamix/utils");
+var _Cell = _interopRequireDefault(require("../components/Cell"));
 var _excluded = ["filters", "dataIndex", "children"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -51,7 +52,24 @@ showSkeleton, actionRef) {
       dataIndex: dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString(),
       title: (0, _columnRender.renderColumnsTitle)(columnProps, actionRef, bindUrl, bindUrlProps),
       cell: function cell(value, index, record) {
-        return (0, _columnRender.renderCell)(value, columnProps, index, record, actionRef, context, dataTeamixSpm);
+        return /*#__PURE__*/_react.default.createElement(_Cell.default, {
+          value: value,
+          item: columnProps,
+          index: index,
+          record: record,
+          actionRef: actionRef,
+          context: context,
+          dataTeamixSpm: dataTeamixSpm
+        });
+        // return renderCell(
+        //   value,
+        //   columnProps,
+        //   index,
+        //   record,
+        //   actionRef,
+        //   context,
+        //   dataTeamixSpm
+        // )
       }
     });
   });

package/lib/table/utils/processColumns.d.ts

@@ -0,0 +1,8 @@
+import { ProTableColumnProps } from '../typing';
+/**
+ * 处理原生传入的 columns 以便于 选择列 方便处理
+ * @param columns 原生传入的 columns
+ * @returns
+ */
+declare const processColumns: (columns: ProTableColumnProps[], initialColumns: ProTableColumnProps[]) => ProTableColumnProps[];
+export default processColumns;

package/lib/table/utils/processColumns.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _utils = require("@teamix/utils");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+/**
+ * 处理原生传入的 columns 以便于 选择列 方便处理
+ * @param columns 原生传入的 columns
+ * @returns
+ */
+var processColumns = function processColumns(columns, initialColumns) {
+  var _getGlobalConfig;
+  var globalFilterColumns = (_getGlobalConfig = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.filterColumns;
+  var filterColumns = columns.filter(function (item) {
+    return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(_objectSpread({}, item)));
+  });
+  // 处理只剩一列批量选择的情况下宽度错乱问题
+  if (filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) {
+    var _initialColumns$;
+    if ((filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) === 1) {
+      var _filterColumns$, _filterColumns$2;
+      if ((_filterColumns$ = filterColumns[0]) === null || _filterColumns$ === void 0 ? void 0 : _filterColumns$.width) {
+        delete filterColumns[0].width;
+      }
+      if ((_filterColumns$2 = filterColumns[0]) === null || _filterColumns$2 === void 0 ? void 0 : _filterColumns$2.lock) {
+        filterColumns[0].lock = false;
+      }
+    } else if (((_initialColumns$ = initialColumns[0]) === null || _initialColumns$ === void 0 ? void 0 : _initialColumns$.columnFilters) !== false) {
+      var _initialColumns$2, _initialColumns$3;
+      if ((_initialColumns$2 = initialColumns[0]) === null || _initialColumns$2 === void 0 ? void 0 : _initialColumns$2.width) {
+        filterColumns[0].width = initialColumns[0].width;
+      }
+      if ((_initialColumns$3 = initialColumns[0]) === null || _initialColumns$3 === void 0 ? void 0 : _initialColumns$3.lock) {
+        filterColumns[0].lock = initialColumns[0].lock;
+      }
+    }
+  }
+  return filterColumns;
+};
+var _default = processColumns;
+exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.5.30",
+  "version": "1.5.32",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",