@teamix/pro 1.2.18 → 1.2.22

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

@@ -0,0 +1,174 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _components = require("@alicloudfe/components");
+
+var _utils = require("@teamix/utils");
+
+var _hooks = require("@teamix/hooks");
+
+require("./index.scss");
+
+var _excluded = ["className", "onChange", "total", "totalRender", "pageSize", "current", "pageSizeList", "pageSizeSelector", "type", "onPageSizeChange"];
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+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); }
+
+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(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+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; }
+
+var cls = (0, _utils.baseClass)('teamix-pro-pagination');
+
+var _default = function _default(props) {
+  var className = props.className,
+      onChange = props.onChange,
+      total = props.total,
+      totalRender = props.totalRender,
+      pageSize = props.pageSize,
+      current = props.current,
+      pageSizeList = props.pageSizeList,
+      pageSizeSelector = props.pageSizeSelector,
+      type = props.type,
+      onPageSizeChange = props.onPageSizeChange,
+      otherProps = _objectWithoutProperties(props, _excluded);
+
+  var _useResponsiveProps = (0, _hooks.useResponsiveProps)([480, 590, 700], ['mini', 'small', 'simple', 'normal']),
+      responsiveProps = _useResponsiveProps.responsiveProps,
+      paginationWrapperRef = _useResponsiveProps.ref;
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
+  var commonPaginationProps = {
+    className: className,
+    onChange: onChange,
+    total: total,
+    pageSize: pageSize,
+    shape: 'arrow-only',
+    pageSizeList: pageSizeList,
+    pageSizeSelector: pageSizeSelector,
+    pageSizePosition: 'end',
+    onPageSizeChange: onPageSizeChange
+  };
+
+  var customTotalRender = function customTotalRender(total) {
+    return /*#__PURE__*/_react.default.createElement(_components.Balloon, {
+      visible: visible,
+      closable: false,
+      onVisibleChange: function onVisibleChange(visible) {
+        return setVisible(visible);
+      },
+      align: "t",
+      // triggerType="click"
+      trigger: /*#__PURE__*/_react.default.createElement(_components.Button, {
+        text: true,
+        onMouseEnter: function onMouseEnter() {
+          return setVisible(true);
+        }
+      }, (0, _utils.getMessage)('total', {
+        total: total
+      }))
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: cls('custom-total-content')
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: "title"
+    }, (0, _utils.getMessage)('pageSize')), /*#__PURE__*/_react.default.createElement(_components.Select, {
+      className: cls('custom-page-size-selector'),
+      dataSource: pageSizeList,
+      defaultValue: pageSize,
+      followTrigger: true,
+      menuProps: {
+        hasSelectedIcon: false
+      },
+      onChange: function onChange(value) {
+        setVisible(false);
+        onPageSizeChange === null || onPageSizeChange === void 0 ? void 0 : onPageSizeChange(value);
+      }
+    })));
+  };
+
+  var renderPagination = function renderPagination() {
+    switch (responsiveProps) {
+      case 'normal':
+        return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
+          totalRender: function totalRender(total) {
+            return (0, _utils.getMessage)('total', {
+              total: total
+            });
+          }
+        }, otherProps));
+
+      case 'simple':
+        return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
+          pageShowCount: 3,
+          totalRender: function totalRender(total) {
+            return (0, _utils.getMessage)('total', {
+              total: total
+            });
+          }
+        }, otherProps));
+
+      case 'small':
+        return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
+          pageShowCount: 3,
+          pageSizeSelector: false,
+          totalRender: function totalRender(total) {
+            return customTotalRender(total);
+          }
+        }, otherProps));
+
+      case 'mini':
+        return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
+          pageSizeSelector: false,
+          totalRender: function totalRender(total) {
+            return customTotalRender(total);
+          },
+          type: "simple"
+        }, otherProps));
+
+      default:
+        return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), otherProps));
+    }
+  };
+
+  return (
+    /*#__PURE__*/
+    // 用于获取翻页器响应式 ref
+    _react.default.createElement("div", {
+      ref: paginationWrapperRef,
+      className: cls('wrapper')
+    }, renderPagination())
+  );
+};
+
+exports.default = _default;

package/lib/table/components/Pagination/index.scss

@@ -0,0 +1,22 @@
+$prefix: 'teamix-pro-pagination';
+
+.#{$prefix} {
+  &-custom-total {
+    &-content {
+      display: flex;
+      align-items: center;
+      .next-menu {
+        min-width: 56px !important;
+        .next-menu-item.next-select-menu-item {
+          padding: 0 8px !important;
+        }
+      }
+    }
+  }
+  &-custom-page-size-selector.next-select-trigger {
+    min-width: 56px;
+    .next-select-inner {
+      min-width: 56px;
+    }
+  }
+}

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

@@ -71,7 +71,8 @@ var processColumns = function processColumns(columns) {
 var FilterColumnIcon = function FilterColumnIcon(props) {
   var _props$columns = props.columns,
       columns = _props$columns === void 0 ? [] : _props$columns,
-      actionRef = props.actionRef;
+      actionRef = props.actionRef,
+      filterColumnType = props.filterColumnType;
 
   var _useState = (0, _react.useState)(true),
       _useState2 = _slicedToArray(_useState, 2),
@@ -101,6 +102,26 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       dropdownVisible = _useState10[0],
       setDropdownVisible = _useState10[1];
 
+  (0, _react.useEffect)(function () {
+    _utils2.on === null || _utils2.on === void 0 ? void 0 : (0, _utils2.on)(function (stateFilterColumns) {
+      if (stateFilterColumns && stateFilterColumns.length > 0) {
+        var showDataIndex = stateFilterColumns.map(function (item) {
+          return item.dataIndex;
+        });
+        var stateColumns = (0, _utils2.cloneDeep)(processColumns(columns)).map(function (item) {
+          if (!showDataIndex.includes(item.dataIndex)) {
+            item.columnFilters = false;
+          }
+
+          return item;
+        });
+        setNewColumns(stateColumns);
+      }
+    }, 'refreshFilterState');
+    return function () {
+      (0, _utils2.off)('refreshFilterState');
+    };
+  });
   (0, _react.useEffect)(function () {
     setNewColumns(processColumns(columns));
   }, [columns]); // 全选
@@ -212,7 +233,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
 
     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);
+    (_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);
   }; // 计算全选状态
 
 
@@ -258,7 +279,9 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       align: "tr br"
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: cls()
-    }, /*#__PURE__*/_react.default.createElement(_components.Menu, null, /*#__PURE__*/_react.default.createElement(CheckboxItem, {
+    }, /*#__PURE__*/_react.default.createElement(_components.Menu, {
+      className: cls('all-select')
+    }, /*#__PURE__*/_react.default.createElement(CheckboxItem, {
       indeterminate: indeterminate,
       checked: allVisible,
       onChange: onChangeAllColumns
@@ -271,7 +294,9 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       type: "primary"
     }, (0, _utils.getMessage)('reset'))), /*#__PURE__*/_react.default.createElement(_components.Menu.Divider, {
       key: "divider"
-    }), newColumns.map(function (_ref9, index) {
+    })), /*#__PURE__*/_react.default.createElement(_components.Menu, {
+      className: cls('checkbox-group')
+    }, newColumns.map(function (_ref9, index) {
       var _newColumns$find;
 
       var dataIndex = _ref9.dataIndex,
@@ -329,7 +354,8 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       onOk: onChangeColumnsForDialog,
       onCancel: dialogOnClose,
       onClose: dialogOnClose,
-      width: 480
+      width: 480,
+      className: cls('dialog')
     }, /*#__PURE__*/_react.default.createElement(Row, {
       gutter: 20,
       wrap: true,
@@ -361,12 +387,20 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
         },
         disabled: columnFiltersDisabled
       }, /*#__PURE__*/_react.default.createElement(_utils.Ellipsis, {
-        tooltip: false
+        tooltip: title
       }, title)));
     }))));
   };
 
-  if (newColumns.length > 10) {
+  if (filterColumnType === 'dialog') {
+    return renderDialog();
+  }
+
+  if (filterColumnType === 'dropdown') {
+    return renderDropdown();
+  }
+
+  if (newColumns.length >= 20) {
     return renderDialog();
   }
 

package/lib/table/components/ToolBar/index.scss

@@ -18,10 +18,14 @@
 // FilterColumn
 .teamix-pro-table-toolbar-filter-column {
   min-width: 180px;
-  max-height: 350px;
-  overflow: auto;
   box-shadow: var(--popup-local-shadow, 0px 6px 24px 0px rgba(0, 0, 0, 0.1));
   background: var(--menu-background);
+
+  &-dialog {
+    .next-checkbox-label {
+      line-height: var(--checkbox-size,16px);
+    }
+  }
   &-reset {
     position: absolute;
     right: 16px;
@@ -40,7 +44,6 @@
         visibility: visible;
         cursor: pointer;
       }
-
     }
   }
   .next-menu-item-text {
@@ -76,6 +79,14 @@
     align-items: center;
   }
 }
+.teamix-pro-table-toolbar-filter-column-all-select.teamix-pro-table-toolbar-filter-column-all-select {
+  padding-bottom: 0;
+}
+.teamix-pro-table-toolbar-filter-column-checkbox-group.teamix-pro-table-toolbar-filter-column-checkbox-group {
+  padding-top: 0;
+  max-height: 310px;
+  overflow: auto;
+}
 
 // fullscreen
 .teamix-pro-table-full-screen {
@@ -88,7 +99,7 @@
   background-color: var(--balloon-tooltip-color-bg, #292929);
   border-color: var(--balloon-tooltip-color-border, transparent);
   box-shadow: var(--balloon-tooltip-shadow, none);
-  color: var(--balloon-tooltip-color, #FFFFFF);
+  color: var(--balloon-tooltip-color, #ffffff);
   display: flex;
   align-items: center;
   height: 36px;
@@ -99,7 +110,7 @@
     display: none;
   }
   .next-message-content {
-    color: var(--balloon-tooltip-color, #FFFFFF);
+    color: var(--balloon-tooltip-color, #ffffff);
     padding: 0;
   }
   .teamix-pro-table-full-screen-message-esc {
@@ -108,7 +119,7 @@
     padding: 0 2px;
     position: relative;
     // box-shadow: inset 0 0 1px 1px var(--color-fill1-1);
-    border: 1px solid var(--balloon-tooltip-color, #FFFFFF);
+    border: 1px solid var(--balloon-tooltip-color, #ffffff);
     display: inline-block;
     line-height: 1;
     &-title {

package/lib/table/index.js

@@ -55,7 +55,7 @@ Object.keys(_typing).forEach(function (key) {
     }
   });
 });
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -103,10 +103,38 @@ var toJS = _form.formilyReactive.toJS;
  * @returns
  */
 
-var processColumns = function processColumns(columns) {
-  return columns.filter(function (item) {
+var processColumns = function processColumns(columns, initialColumns) {
+  var filterColumns = columns.filter(function (item) {
     return item.columnFilters !== false;
-  });
+  }); // 处理只剩一列批量选择的情况下宽度错乱问题
+
+  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;
 };
 /** 默认请求翻页参数 */
 
@@ -176,6 +204,8 @@ var ProTable = function ProTable(props) {
     return false;
   } : _props$autoRefresh,
       customRequest = props.customRequest,
+      _props$filterColumnTy = props.filterColumnType,
+      filterColumnType = _props$filterColumnTy === void 0 ? 'auto' : _props$filterColumnTy,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -207,7 +237,7 @@ var ProTable = function ProTable(props) {
       sort = _useState10[0],
       setSort = _useState10[1];
 
-  var _useState11 = (0, _react.useState)(requestWhenMount && propsShowSkeleton),
+  var _useState11 = (0, _react.useState)(!propsDataSource && requestWhenMount && propsShowSkeleton),
       _useState12 = _slicedToArray(_useState11, 2),
       showSkeleton = _useState12[0],
       setShowSkeleton = _useState12[1]; // 首次加载，渲染骨架屏
@@ -219,12 +249,14 @@ var ProTable = function ProTable(props) {
   var _useState13 = (0, _react.useState)(true),
       _useState14 = _slicedToArray(_useState13, 2),
       customTableLoading = _useState14[0],
-      setCustomTableLoading = _useState14[1];
+      setCustomTableLoading = _useState14[1]; // 用于存放 Search 组件之前值的 ref
+
 
+  var searchValueRef = (0, _react.useRef)('');
   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 : [])),
+  var _useState15 = (0, _react.useState)(processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : [], propsColumns)),
       _useState16 = _slicedToArray(_useState15, 2),
       filteredColumns = _useState16[0],
       setFilteredColumns = _useState16[1];
@@ -395,10 +427,16 @@ var ProTable = function ProTable(props) {
   (0, _react.useEffect)(function () {
     var _actionRef$current, _actionRef$current$se;
 
-    var columns = processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : []);
+    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);
-  }, [propsColumns]); // 绑定 Actions
+  }, [propsColumns]); // dataSource 受控
+
+  (0, _react.useEffect)(function () {
+    if (propsDataSource) {
+      setData(propsDataSource);
+    }
+  }, [propsDataSource]); // 绑定 Actions
 
   (0, _utils2.useActionType)(actionRef, {
     fullScreen: function fullScreen() {
@@ -413,9 +451,14 @@ var ProTable = function ProTable(props) {
     setColumn: function setColumn(newColumns) {
       var _actionRef$current2, _actionRef$current2$s;
 
-      var columns = processColumns(newColumns);
+      var update = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      var columns = processColumns(newColumns, propsColumns);
       setFilteredColumns(columns);
       (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setState) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, 'filterColumns', columns);
+
+      if (update) {
+        (0, _utils2.emit)('refreshFilterState', newColumns);
+      }
     },
     setSize: function setSize(mode) {
       _setSize(mode);
@@ -619,10 +662,8 @@ var ProTable = function ProTable(props) {
   }
 
   (0, _react.useEffect)(function () {
-    var _actionRef$current5, _actionRef$current5$i;
-
-    // 初始化 state 状态
-    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$i = _actionRef$current5.initState) === null || _actionRef$current5$i === void 0 ? void 0 : _actionRef$current5$i.call(_actionRef$current5); // 监听 浏览器变化 更吸底状态
+    // 初始化 actionRef state、callback 此时 actionRef 已初始化完成
+    (0, _utils2.initActionRef)(); // 监听 浏览器变化 更吸底状态
 
     if (footerSuction) {
       getFooterSuctionState();
@@ -636,6 +677,14 @@ var ProTable = function ProTable(props) {
       _request();
     }
 
+    var searchName = getSearchName();
+
+    if (searchName) {
+      // 如果有初始值，需要赋值
+      var initialValues = toJS(dataFilterForm.initialValues);
+      searchValueRef.current = initialValues[searchName][1];
+    }
+
     return function () {
       if (autoRefreshTimerRef.current) {
         clearTimeout(autoRefreshTimerRef.current);
@@ -655,22 +704,55 @@ var ProTable = function ProTable(props) {
     setSort(nextSort);
 
     _request(targetFormatSort(nextSort));
-  } // 处理 dataFilter 中的 onFilter、onReset
+  } // 找到 Search 组件对应的 name
+
+
+  var getSearchName = function getSearchName() {
+    var _dataFilter$schema;
 
+    if ((dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.schema) && ((_dataFilter$schema = dataFilter.schema) === null || _dataFilter$schema === void 0 ? void 0 : _dataFilter$schema.length) > 0) {
+      var searchSchema = dataFilter.schema.find(function (item) {
+        return item.component === 'Search';
+      });
 
-  var dataFilter = _objectSpread(_objectSpread({}, propsDataFilter), {}, {
-    onFilter: (0, _lodash.default)(function () {
-      (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(_objectSpread({}, toJS(dataFilterForm.values))));
+      if (searchSchema) {
+        var searchName = searchSchema.name;
+        return searchName;
+      }
+    }
+  }; // 处理 dataFilter 中的 onFilter、onReset
+
+
+  var dataFilter = _objectSpread(_objectSpread({
+    mode: 'inline'
+  }, propsDataFilter), {}, {
+    onFilter: (0, _lodash.default)(function (values) {
+      (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(values));
 
       if (dataFilterForm.validate()) {
-        var _actionRef$current6, _actionRef$current6$c;
+        var _actionRef$current5, _actionRef$current5$c;
+
+        /**
+         * 针对 inline 模式下的 Search 组件做特殊处理
+         * 当切换条件且输入内容为空的时候，类似[a, ''] => [b, ''] 不触发请求
+         */
+        if (dataFilter.mode === 'inline') {
+          var searchName = getSearchName();
+
+          if (searchName) {
+            var searchValue = values[searchName][1];
+
+            if (searchValue === (searchValueRef === null || searchValueRef === void 0 ? void 0 : searchValueRef.current)) {
+              return;
+            }
 
-        // 搜索变化时，暂时先清空选择
-        (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$c = _actionRef$current6.clearRowSelection) === null || _actionRef$current6$c === void 0 ? void 0 : _actionRef$current6$c.call(_actionRef$current6);
-        setCurrentPage(1); // const { mode, schema } = propsDataFilter as ProTableDataFilterProps;
-        // TODO: 针对 inline 模式下的 search 组件做一下处理，如果空值切换下拉的时候不触发请求
-        // if (mode === 'inline') {
-        // }
+            searchValueRef.current = searchValue;
+          }
+        } // 搜索变化时，暂时先清空选择
+
+
+        (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$c = _actionRef$current5.clearRowSelection) === null || _actionRef$current5$c === void 0 ? void 0 : _actionRef$current5$c.call(_actionRef$current5);
+        setCurrentPage(1);
 
         _request(_defineProperty({}, targetPageKey, 1));
       }
@@ -705,7 +787,8 @@ var ProTable = function ProTable(props) {
         columns: propsColumns,
         dataFilter: dataFilter,
         dataFilterForm: dataFilterForm,
-        rowSelection: rowSelection
+        rowSelection: rowSelection,
+        filterColumnType: filterColumnType
       }), /*#__PURE__*/_react.default.createElement(_components.Table.StickyLock, _objectSpread({
         hasBorder: false,
         dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
@@ -763,21 +846,21 @@ var ProTable = function ProTable(props) {
 
   var renderFooter = function renderFooter() {
     function onChangePagination(currentPage) {
-      var _actionRef$current7, _actionRef$current7$c;
+      var _actionRef$current6, _actionRef$current6$c;
 
       var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       // 翻页暂时先清空选择
-      (_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);
+      (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$c = _actionRef$current6.clearRowSelection) === null || _actionRef$current6$c === void 0 ? void 0 : _actionRef$current6$c.call(_actionRef$current6);
       setCurrentPage(currentPage);
 
       _request(_objectSpread(_defineProperty({}, targetPageKey, currentPage), params));
     }
 
     function onChangePaginationSize(currentPageSize) {
-      var _actionRef$current8, _actionRef$current8$c, _request5;
+      var _actionRef$current7, _actionRef$current7$c, _request5;
 
       // 翻页暂时先清空选择
-      (_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);
+      (_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);
       setPageSize(currentPageSize);
       setCurrentPage(1);
 
@@ -817,6 +900,8 @@ var ProTable = function ProTable(props) {
           return onChangePagination(number);
         },
         total: total,
+        shape: "arrow-only",
+        pageSizePosition: "end",
         totalRender: function totalRender(total) {
           return (0, _utils.getMessage)('total', {
             total: total
@@ -824,10 +909,8 @@ var ProTable = function ProTable(props) {
         },
         pageSize: pageSize,
         current: currentPage,
-        shape: "arrow-only",
         pageSizeList: pageSizeList,
         pageSizeSelector: total > (props.pageSize || 10) * 2 ? 'dropdown' : false,
-        pageSizePosition: "end",
         type: total / pageSize <= 2 ? 'simple' : 'normal',
         onPageSizeChange: function onPageSizeChange(number) {
           return onChangePaginationSize(number);

package/lib/table/index.scss

@@ -32,12 +32,18 @@ $fullscreenPadding: 24px;
   }
   &-footer-left-wrapper {
     display: flex;
-    flex: 1;
+    flex-shrink: 0;
     align-items: center;
   }
   &-footer-right-wrapper {
     display: flex;
     justify-content: flex-end;
+    width: 100%;
+  }
+  .teamix-pro-pagination-wrapper {
+    display: flex;
+    justify-content: flex-end;
+    width: 100%;
   }
   &-footer-action {
     margin-left: 16px;