@teamix/pro 1.5.33 → 1.5.35

package/es/table/components/Pagination/index.js

@@ -16,13 +16,14 @@ import { Pagination, Balloon, Select, Button, Input, Icon } from '@alicloudfe/co
 import { getMessage, cls, usePrefixCls } from '@teamix/utils';
 import { useResponsiveProps } from '@teamix/hooks';
 import './index.scss';
-export default (function (props) {
+var ProPagination = function ProPagination(props) {
   var className = props.className,
     propsOnChange = props.onChange,
     total = props.total,
     pageSize = props.pageSize,
     current = props.current,
-    pageSizeList = props.pageSizeList,
+    _props$pageSizeList = props.pageSizeList,
+    pageSizeList = _props$pageSizeList === void 0 ? [5, 10, 20, 50, 100] : _props$pageSizeList,
     pageSizeSelector = props.pageSizeSelector,
     onPageSizeChange = props.onPageSizeChange,
     responsivePaginationType = props.responsivePaginationType,
@@ -241,4 +242,5 @@ export default (function (props) {
       className: prefixCls('wrapper')
     }, renderPagination())
   );
-});
+};
+export default /*#__PURE__*/React.memo(ProPagination);

package/es/table/components/TableContent/index.d.ts

@@ -0,0 +1,7 @@
+import { EmptyContentProps } from '@teamix/pro-field';
+import { TableProps } from '@alicloudfe/components/types/table';
+export interface ITableContentProps extends TableProps {
+    emptyProps?: EmptyContentProps;
+}
+declare const TableContent: (props: ITableContentProps) => JSX.Element;
+export default TableContent;

package/es/table/components/TableContent/index.js

@@ -0,0 +1,23 @@
+var _excluded = ["emptyProps"];
+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 _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; }
+import React, { useMemo } from 'react';
+import { Table } from '@alicloudfe/components';
+import { EmptyContent } from '@teamix/pro-field';
+import getTableSortIcons from '../../utils/getTableSortIcons';
+var TableContent = function TableContent(props) {
+  var emptyProps = props.emptyProps,
+    rest = _objectWithoutProperties(props, _excluded);
+  var memorizedEmptyContent = useMemo(function () {
+    return /*#__PURE__*/React.createElement(EmptyContent, _objectSpread({}, emptyProps));
+  }, [emptyProps]);
+  var memorizedGetTableSortIcons = useMemo(getTableSortIcons, []);
+  return /*#__PURE__*/React.createElement(Table.StickyLock, _objectSpread({
+    sortIcons: memorizedGetTableSortIcons,
+    emptyContent: memorizedEmptyContent
+  }, rest));
+};
+export default TableContent;

package/es/table/components/ToolBar/FilterColumnIcon.js

@@ -27,7 +27,11 @@ var Row = Grid.Row,
 var cls = usePrefixCls('teamix-pro-table-toolbar-filter-column');
 var processColumns = function processColumns(columns) {
   var _getGlobalConfig;
+  var filterColumns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var globalFilterColumns = (_getGlobalConfig = getGlobalConfig('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.filterColumns;
+  var filterColumnsKey = filterColumns.map(function (item) {
+    return item === null || item === void 0 ? void 0 : item.dataIndex;
+  });
   // hidden 为 true 时不展示
   columns = columns.filter(function (item) {
     return (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(item));
@@ -37,11 +41,14 @@ var processColumns = function processColumns(columns) {
       return item;
     }
     return _objectSpread(_objectSpread({}, item), {}, {
-      columnFilters: true
+      columnFilters: filterColumnsKey.findIndex(function (key) {
+        return item.dataIndex === key;
+      }) >= 0 ? true : false
     });
   });
 };
 var FilterColumnIcon = function FilterColumnIcon(props) {
+  var _actionRef$current, _actionRef$current3;
   var _props$columns = props.columns,
     columns = _props$columns === void 0 ? [] : _props$columns,
     actionRef = props.actionRef,
@@ -54,7 +61,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     indeterminate = _useState4[0],
     setIndeterminate = _useState4[1];
-  var _useState5 = useState(processColumns(columns)),
+  var _useState5 = useState(processColumns(columns, (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : _actionRef$current.filterColumns)),
     _useState6 = _slicedToArray(_useState5, 2),
     newColumns = _useState6[0],
     setNewColumns = _useState6[1];
@@ -100,8 +107,9 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
     };
   });
   useEffect(function () {
-    setNewColumns(processColumns(columns));
-  }, [columns]);
+    var _actionRef$current2;
+    setNewColumns(processColumns(columns, (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : _actionRef$current2.filterColumns));
+  }, [columns, (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : _actionRef$current3.filterColumns]);
   // 全选
   var onChangeAllColumns = function onChangeAllColumns(check) {
     setAllVisible(check);
@@ -193,10 +201,10 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   };
   // 通知表格渲染
   var notifyTableRender = function notifyTableRender(columns) {
-    var _actionRef$current, _actionRef$current$se;
+    var _actionRef$current4, _actionRef$current4$s;
     calculateSelectAllState(columns);
     setNewColumns(columns);
-    (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setColumn) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, columns, false);
+    (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setColumn) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, columns, false);
   };
   // 计算全选状态
   var calculateSelectAllState = function calculateSelectAllState(columns) {

package/es/table/index.js

@@ -5,6 +5,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); }
@@ -13,23 +16,18 @@ 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; }
-import React, { useState, useEffect, useRef, useMemo } from 'react';
+import React, { useState, useEffect, useRef, useMemo, useCallback } from 'react';
 import { Table, Checkbox } from '@alicloudfe/components';
 import Pagination from './components/Pagination';
+import TableContent from './components/TableContent';
 import genProColumnToColumn from './utils/genProColumnToColumn';
 import { getGlobalConfig, useRequest, request as utilResquest, getDeepValue, getMessage, pickProps, usePrefixCls, getTargetValue } from '@teamix/utils';
-import { ProSkeletonRaw as Skeleton } from '../skeleton';
 import './index.scss';
 import Layout from './components/Layout';
 import { actionRefUseStateOn, emit, initActionRef, processDefaultFilter, useActionType } from './utils';
 import getTableProps from './utils/getTableProps';
-import getTableSortIcons from './utils/getTableSortIcons';
 import useTableSelection from './utils/useTableSelection';
 import FullScreen from './components/ToolBar/Fullscreen';
-import { EmptyContent } from '@teamix/pro-field';
 import { ProActionGroup } from '../actions';
 import classNames from 'classnames';
 import ProPageContainer from '../page-container';
@@ -38,42 +36,9 @@ import debounce from 'lodash.debounce';
 import CardView from './components/CardView';
 import { useUrlState } from '@teamix/hooks';
 import { getUrlStateFilter } from './utils/util';
+import processColumns from './utils/processColumns';
 export * from './typing';
 var cls = usePrefixCls('teamix-pro-table');
-/**
- * 处理原生传入的 columns 以便于 选择列 方便处理
- * @param columns 原生传入的 columns
- * @returns
- */
-var processColumns = function processColumns(columns, initialColumns) {
-  var _getGlobalConfig;
-  var globalFilterColumns = (_getGlobalConfig = 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';
@@ -198,7 +163,9 @@ var ProTable = function ProTable(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     showSkeleton = _useState12[0],
     setShowSkeleton = _useState12[1]; // 首次加载，渲染骨架屏
-  var skeletonDataSource = new Array(skeletonSize).fill({});
+  var skeletonDataSource = useMemo(function () {
+    return new Array(skeletonSize).fill({});
+  }, [skeletonSize]);
   var requestDataKey = method.toLowerCase() === 'get' ? 'params' : 'data';
   // 如果使用 customRequest 的话，内置 loading
   var _useState13 = useState(requestWhenMount),
@@ -214,8 +181,8 @@ var ProTable = function ProTable(props) {
     setFilteredColumns = _useState16[1];
   // 全局状态 ： 自适应表格
   var autoWidth = useMemo(function () {
-    var _getGlobalConfig2;
-    return ((_getGlobalConfig2 = getGlobalConfig('ProTable')) === null || _getGlobalConfig2 === void 0 ? void 0 : _getGlobalConfig2.autoWidth) || autoWidthProp;
+    var _getGlobalConfig;
+    return ((_getGlobalConfig = getGlobalConfig('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.autoWidth) || autoWidthProp;
   }, [autoWidthProp]);
   // 判断是否有操作列，有的话则渲染一个 shadow dom
   var hasActionColumn = false;
@@ -330,7 +297,9 @@ var ProTable = function ProTable(props) {
   // 获取header高度，用作全屏吸底吸底高度计算以及固定body高度计算（滚动条在底部）
   var getHeaderHeight = function getHeaderHeight(isFullscreen, offset) {
     var _tableDom$getElements, _tableDom$getElements2, _document$querySelect, _document$querySelect2, _document$querySelect3;
-    if (!fixedTableBody) {
+    if (isFullscreen) {
+      // 开启全屏的时候先往下面走
+    } else if (!fixedTableBody) {
       return;
     }
     var tableDom = tableRef.current;
@@ -405,8 +374,8 @@ var ProTable = function ProTable(props) {
   });
   // 全局状态 ： 大数据截断
   var globalUseMaxData = useMemo(function () {
-    var _getGlobalConfig3;
-    return (_getGlobalConfig3 = getGlobalConfig('ProTable')) === null || _getGlobalConfig3 === void 0 ? void 0 : _getGlobalConfig3.useMaxData;
+    var _getGlobalConfig2;
+    return (_getGlobalConfig2 = getGlobalConfig('ProTable')) === null || _getGlobalConfig2 === void 0 ? void 0 : _getGlobalConfig2.useMaxData;
   }, []);
   // 非全屏状态下的
   var normalDataFilterFormRef = useRef();
@@ -453,7 +422,9 @@ var ProTable = function ProTable(props) {
       if (showSkeleton && result) {
         result.disabled = true;
       }
-      return result;
+      return _objectSpread(_objectSpread({
+        _primaryKey: props.primaryKey
+      }, record), result);
     },
     titleProps: function titleProps() {
       var result = {};
@@ -523,11 +494,22 @@ var ProTable = function ProTable(props) {
     var columns = processColumns(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);
+    if (autoWidth) {
+      reGenFilteredColumnsByAutoWidth(columns);
+    }
   }, [propsColumns]);
   // dataSource 受控
   useEffect(function () {
     if (propsDataSource) {
       _setData(propsDataSource);
+      if (autoWidth) {
+        shadowContainer({
+          columns: filteredColumns,
+          data: propsDataSource,
+          shadowContainerRef: shadowContainerRef
+        });
+        reGenFilteredColumnsByAutoWidth();
+      }
     }
   }, [propsDataSource]);
   // 初始化 ActionRef。
@@ -745,7 +727,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));
       emit('PRO_TABLE_REFRESH_TIMER_FLAG', Number(time));
     }
@@ -830,7 +814,7 @@ var ProTable = function ProTable(props) {
     }
   });
   // 请求函数
-  function _request(params, noLoading, filterParams, isReset) {
+  var _request = 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) {
@@ -934,7 +918,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));
             emit('PRO_TABLE_REFRESH_TIMER_FLAG', Number(time));
           }
@@ -945,57 +929,74 @@ var ProTable = function ProTable(props) {
         getData.run(requestData);
       }
     }
-  }
-  function onSort(dataIndex, order) {
+  }, [bindUrl, bindUrlProps, dataRef, url, customRequest, currentPage, pageSize, propsParams]);
+  var onSort = 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 = 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));
+        if (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) {
+          var filterResult = propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(values);
+          if (filterResult === false) {
+            return false;
+          }
+        }
+        // 搜索变化时，暂时先清空选择
+        (_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 = 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]);
+  useEffect(function () {
+    if (autoWidth) {
+      reGenFilteredColumnsByAutoWidth();
+    }
+  }, [shadowContainerRef === null || shadowContainerRef === void 0 ? void 0 : shadowContainerRef.current]);
+  var memorizedGenProColumnToColumn = useMemo(function () {
+    var result = genProColumnToColumn(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.createElement("div", {
@@ -1022,11 +1023,15 @@ var ProTable = function ProTable(props) {
         autoRefreshProps: autoRefreshProps,
         bindUrlProps: bindUrlProps,
         bindUrl: bindUrl
-      }), switchViewState === 'table' && /*#__PURE__*/React.createElement(Table.StickyLock, _objectSpread({
+      }), autoWidth && shadowContainer({
+        columns: filteredColumns,
+        data: data,
+        shadowContainerRef: shadowContainerRef
+      }), hasActionColumn && shadowActionColumnContainer(filteredColumns, shadowActionColumnContainerRef), switchViewState === 'table' && /*#__PURE__*/React.createElement(TableContent, _objectSpread({
         hasBorder: false,
         dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
-        columns: genProColumnToColumn(filteredColumns, showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps),
-        loading: getTableLoading(),
+        columns: memorizedGenProColumnToColumn,
+        loading: isLoading,
         className: classNames('teamix-pro-table', tableClassName, {
           'with-row-select': rowSelection,
           'teamix-pro-tree-table': isTree
@@ -1037,14 +1042,12 @@ var ProTable = function ProTable(props) {
         sort: sort,
         primaryKey: primaryKey,
         rowSelection: rowSelection,
-        emptyContent: /*#__PURE__*/React.createElement(EmptyContent, _objectSpread({}, emptyProps)),
-        sortIcons: getTableSortIcons(),
         fixedHeader: fullscreenState || fixedTableBody,
         maxBodyHeight: "calc(100vh - ".concat(headerHeight, "px)")
       }, pickProps(getTableProps(), otherProps))), switchViewState === 'card' && /*#__PURE__*/React.createElement(CardView, {
         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,
@@ -1086,34 +1089,33 @@ 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 = useCallback(function (currentPage) {
+    var _objectSpread4;
+    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((_objectSpread4 = {}, _defineProperty(_objectSpread4, targetPageKey, currentPage), _defineProperty(_objectSpread4, "pageSize", pageSize), _objectSpread4), params));
+  }, [reserveSelectedRecords, targetPageKey, actionRef, pageSize]);
+  var onChangePaginationSize = 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, currentPage]);
+  var renderFooter = function renderFooter() {
     function renderRowSelection() {
       if (rowSelection) {
         if (showSkeleton) {
-          return /*#__PURE__*/React.createElement("div", {
-            className: cls('footer-left-wrapper')
-          }, /*#__PURE__*/React.createElement(Skeleton.Footer.Operation, null));
+          return null;
         } else {
           return /*#__PURE__*/React.createElement("div", {
             className: cls('footer-left-wrapper')
@@ -1127,9 +1129,7 @@ var ProTable = function ProTable(props) {
         }
       } else if (footerAction) {
         if (showSkeleton) {
-          return /*#__PURE__*/React.createElement("div", {
-            className: cls('footer-left-wrapper')
-          }, /*#__PURE__*/React.createElement(Skeleton.Footer.Operation, null));
+          return null;
         } else {
           return /*#__PURE__*/React.createElement("div", {
             className: cls('footer-left-wrapper')
@@ -1150,7 +1150,7 @@ var ProTable = function ProTable(props) {
         })
       }, renderRowSelection(), /*#__PURE__*/React.createElement("div", {
         className: cls('footer-right-wrapper')
-      }, showSkeleton ? /*#__PURE__*/React.createElement(Skeleton.Footer.Pagination, null) : /*#__PURE__*/React.createElement(React.Fragment, null, data.length > 0 && /*#__PURE__*/React.createElement(Pagination, _objectSpread({
+      }, showSkeleton ? null : /*#__PURE__*/React.createElement(React.Fragment, null, data.length > 0 && /*#__PURE__*/React.createElement(Pagination, _objectSpread({
         className: cls('pagination'),
         onChange: function onChange(number, e) {
           onChangePagination(number);
@@ -1178,7 +1178,7 @@ var ProTable = function ProTable(props) {
         })
       }, renderRowSelection(), /*#__PURE__*/React.createElement("div", {
         className: cls('footer-right-wrapper')
-      }, showSkeleton ? /*#__PURE__*/React.createElement(Skeleton.Footer.Pagination, null) : footer));
+      }, showSkeleton ? null : footer));
     }
   };
   // 判断是否需要吸底
@@ -1205,7 +1205,7 @@ var ProTable = function ProTable(props) {
         // 'footer-suction': footerSuctionState && footerSuction,
       }),
       ref: tableRef
-    }, showShadowContainer && shadowContainer({
+    }, autoWidth && shadowContainer({
       columns: filteredColumns,
       data: data,
       shadowContainerRef: shadowContainerRef

package/es/table/index.scss

@@ -71,7 +71,7 @@ $fullscreenPadding: 24px;
       box-shadow: var(--shadow-1-up);
       background-color: var(--table-row-bg, #ffffff);
       margin: 0;
-      z-index: 2;
+      z-index: 5;
     }
 
     .next-table-body {
@@ -103,7 +103,7 @@ $fullscreenPadding: 24px;
     pointer-events: none;
     display: flex;
   }
-  
+
   // sort icon
   .next-table-sort.next-table-header-icon {
     line-height: 16px;
@@ -126,6 +126,15 @@ $fullscreenPadding: 24px;
   }
 }
 
+// .teamix-pro-table-fullscreen {
+//   .teamix-pro-table-container {
+//     height: calc(100vh - 74px);
+//     overflow: hidden;
+//     overflow-y: auto;
+//   }
+// }
+
+
 .teamix-pro-table-footer-suction {
   margin-bottom: 50px;
   .teamix-pro-table-footer {

package/es/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;
     /** 是否自动适应该列宽度 */
@@ -182,7 +184,8 @@ export declare type ProTableProps = {
     autoRedirect?: boolean;
     /** 使用超大数据模式 **/
     useMaxData?: boolean;
-} & Omit<TableProps, 'columns'> & ProTableTopAreaProps;
+    rowSelection?: rowSelectionType;
+} & Omit<TableProps, 'columns' | 'rowSelection'> & ProTableTopAreaProps;
 export declare type rowSelectionType = {
     getProps?: (record: any, index: number) => any;
     onChange?: (selectedRowKeys: Array<any>, records: Array<any>) => void;
@@ -194,7 +197,11 @@ export declare type rowSelectionType = {
     titleProps?: () => any;
     columnProps?: () => any;
     titleAddons?: () => any;
-};
+    /** 默认选中的 Key 值 **/
+    defaultSelectedRowKeys?: any[];
+    /** 默认选中的 record 值 **/
+    defaultSelectedRecords?: any[];
+} & TableProps['rowSelection'];
 export declare type innerRowSelectionType = {
     rowSelection: rowSelectionType;
     selectedRowKeys: string[];

package/es/table/utils/genAutoWidthColumns.d.ts

@@ -6,13 +6,13 @@ import { ProTableColumnProps, ITableCellRender } from '../typing';
  * @param data
  * @returns
  */
-export declare function genAutoWidthColumns(fileteredColumns: ProTableColumnProps[], ref: MutableRefObject<HTMLDivElement | null>, data: any[], size: 'small' | 'medium', useRowSelection?: boolean | undefined, actionColumnRef?: MutableRefObject<HTMLDivElement | null>): ProTableColumnProps[];
+export declare function genAutoWidthColumns(columns: ProTableColumnProps[], ref: MutableRefObject<HTMLDivElement | null>, data: any[], size: 'small' | 'medium', useRowSelection?: boolean | undefined, actionColumnRef?: MutableRefObject<HTMLDivElement | null>): ProTableColumnProps[];
 interface IShadowContainerProps {
     columns: ProTableColumnProps[];
     data: any[];
     shadowContainerRef: MutableRefObject<null>;
 }
-export declare const shadowContainer: (props: IShadowContainerProps) => JSX.Element;
+export declare const shadowContainer: (props: IShadowContainerProps) => JSX.Element | null;
 export declare const shadowActionColumnContainer: (columns: ProTableColumnProps[], shadowActionColumnContainerRef: MutableRefObject<null>) => JSX.Element | undefined;
 export declare const computeableWidthTypeList: {
     dateTime: (data: any[], render: ITableCellRender) => any;