@teamix/pro 1.2.34 → 1.3.2

package/lib/form/SchemaForm/reactions.js

@@ -17,20 +17,19 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 var $request = function $request(field, requestConfig, context, type) {
   var _field$data;
 
-  // let refresh
-  // if(isStr(type)){
-  //   refresh = field.data?.refreshMap?.[type]
-  // }else if(isNum(type)){
-  // }else{
-  //   refresh = field.data?.refresh;
-  // }
-  var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
-  var beforeRequest = requestConfig.beforeRequest,
+  var params = requestConfig.params,
+      beforeRequest = requestConfig.beforeRequest,
       onSuccess = requestConfig.onSuccess;
-  var refreshResult = (0, _utils.isPlainObj)(refresh) ? refresh : {};
   var beforeRequestResult = (0, _utils.isFn)(beforeRequest) ? beforeRequest(field, context) : {};
+  /**
+   * 主动触发的请求刷新
+   */
+  // 触发所有配置的请求
+
+  var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
+  var refreshResult = (0, _utils.isPureObj)(refresh) ? refresh : {};
   return (0, _utils.doCommonRequest)(_objectSpread(_objectSpread({}, requestConfig), {}, {
-    params: _objectSpread(_objectSpread(_objectSpread({}, requestConfig.params), beforeRequestResult), refreshResult),
+    params: _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult),
     beforeRequest: function beforeRequest() {
       return beforeRequestResult;
     },
@@ -43,10 +42,12 @@ var $request = function $request(field, requestConfig, context, type) {
 
 exports.$request = $request;
 
-var $common = function $common(services, requestConfig, context, index) {
+var $common = function $common(services, requestConfig, context) {
   return function (field) {
-    return services(field, requestConfig, context, index || 'common').then(function (res) {
-      return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
+    return services(field, requestConfig, context, 'request').then(function (res) {
+      var _requestConfig$onComp;
+
+      return (_requestConfig$onComp = requestConfig.onComplete) === null || _requestConfig$onComp === void 0 ? void 0 : _requestConfig$onComp.call(requestConfig, res, field, context);
     });
   };
 }; // 配置校验
@@ -58,7 +59,9 @@ var $validator = function $validator(services, requestConfig, context) {
   return function (value, rules, _ref) {
     var field = _ref.field;
     return services(field, requestConfig, context, 'validator').then(function (res) {
-      return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
+      var _requestConfig$onComp2;
+
+      return (_requestConfig$onComp2 = requestConfig.onComplete) === null || _requestConfig$onComp2 === void 0 ? void 0 : _requestConfig$onComp2.call(requestConfig, res, field, context);
     });
   };
 }; // 配置DataSource
@@ -69,23 +72,31 @@ exports.$validator = $validator;
 var $dataSource = function $dataSource(services, requestConfig, context) {
   return function (field) {
     field.setState({
-      loading: true,
+      loading: true
+    });
+    field.setComponentProps({
       readOnly: true
     });
     return services(field, requestConfig, context, 'dataSource').then(function (res) {
+      var _requestConfig$onComp3;
+
       var isValueInDataSource = (0, _utils.getValueByValue)(res, field.value);
       var clearValue = isValueInDataSource ? {} : {
         value: undefined
       };
       field.setState(_objectSpread({
         dataSource: res,
-        loading: false,
-        readOnly: false
+        loading: false
       }, clearValue));
-      return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
+      field.setComponentProps({
+        readOnly: false
+      });
+      return (_requestConfig$onComp3 = requestConfig.onComplete) === null || _requestConfig$onComp3 === void 0 ? void 0 : _requestConfig$onComp3.call(requestConfig, res, field, context);
     }).catch(function () {
       field.setState({
-        loading: false,
+        loading: false
+      });
+      field.setComponentProps({
         readOnly: false
       });
     });

package/lib/form/fieldTypeMap.d.ts

@@ -1,4 +1,7 @@
 declare const fieldTypeMap: {
     [x: string]: string;
 };
+declare const datePicker2TypeArray: string[];
+declare const timePicker2TypeArray: string[];
+export { datePicker2TypeArray, timePicker2TypeArray };
 export default fieldTypeMap;

package/lib/form/fieldTypeMap.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.timePicker2TypeArray = exports.default = exports.datePicker2TypeArray = void 0;
 var fieldTypeMap = {
   Input: 'text',
   Password: 'password',
@@ -46,5 +46,9 @@ var fieldTypeMap = {
   Search: 'search',
   SelectGroup: 'selectGroup'
 };
+var datePicker2TypeArray = ['DatePicker', 'DateTimePicker', 'WeekPicker', 'MonthPicker', 'YearPicker', 'QuarterPicker', 'DateRangePicker', 'DateTimeRangePicker', 'WeekRangePicker', 'MonthRangePicker', 'YearRangePicker', 'QuarterRangePicker'];
+exports.datePicker2TypeArray = datePicker2TypeArray;
+var timePicker2TypeArray = ['TimePicker', 'TimeRangePicker'];
+exports.timePicker2TypeArray = timePicker2TypeArray;
 var _default = fieldTypeMap;
 exports.default = _default;

package/lib/form/typing.d.ts

@@ -10,6 +10,10 @@ declare type FieldDisplayTypes = 'none' | 'hidden' | 'visible';
 export interface ProFormInitializeItem {
     (item: ProFormSchemaItem, props?: any): ProFormSchemaItem;
 }
+/**
+ * ProForm 实例类型
+ */
+export declare type ProFormType = FormType;
 declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'MultipleTagPicker' | 'Range' | 'Search' | 'SelectGroup';
 declare type IButtonComponent = 'Submit' | 'Reset';
 declare type IComboComponent = 'ArrayCards' | 'ArrayCards.Addition' | 'ArrayCards.Remove' | 'ArrayCards.MoveUp' | 'ArrayCards.MoveDown' | 'ArrayCards.Index' | 'ArrayCollapse' | 'ArrayCollapse.CollapsePanel' | 'ArrayCollapse.Addition' | 'ArrayCollapse.Remove' | 'ArrayCollapse.MoveUp' | 'ArrayCollapse.MoveDown' | 'ArrayCollapse.Index' | 'ArrayTable' | 'ArrayTable.Column' | 'ArrayTable.SortHandle' | 'ArrayTable.Addition' | 'ArrayTable.Remove' | 'ArrayTable.MoveDown' | 'ArrayTable.MoveUp' | 'ArrayTable.Index' | 'ArrayItems' | 'ArrayItems.Item' | 'ArrayItems.SortHandle' | 'ArrayItems.Addition' | 'ArrayItems.Remove' | 'ArrayItems.MoveDown' | 'ArrayItems.MoveUp' | 'ArrayItems.Index' | 'Editable' | 'Editable.Popover' | 'Editable.Dialog' | 'Editable.Drawer';
@@ -68,8 +72,9 @@ export interface ProFormProps extends IFormLayoutProps {
 export interface FilterProps extends ProFormProps {
     form: FormType;
     defaultFilterValue?: string;
+    activeFilterValueRef?: React.MutableRefObject<any>;
+    forceClear?: boolean;
     onReset?: (payload?: any) => void;
-    onResetClick?: () => void;
 }
 export interface QueryFilterLayoutProps {
     prefixCls?: string;
@@ -93,6 +98,8 @@ export interface QueryFilterProps extends ProFormProps {
     purePanel?: boolean;
     /** 面板是否默认展开，仅在 mode='panel' 时生效 */
     expand?: boolean;
+    /** 是否强制清除 */
+    forceClear?: boolean;
     /** 顶部筛选区前缀 */
     addonBefore?: ReactNode;
     /** 顶部筛选区后缀 */

package/lib/index.d.ts

@@ -9,7 +9,7 @@ import ProPageHeader from './page-header';
 import ProTable from './table';
 import ProSkeleton from './skeleton';
 import utils from './utils';
-import { ProStep } from './step';
+import { ProTimeline } from './timeline';
 import * as nocode from './nocode';
 import * as templates from './templates';
 export * from './actions';
@@ -23,6 +23,6 @@ export * from './page-header';
 export * from './skeleton';
 export * from './table';
 export * from './utils';
-export * from './step';
-declare const version = "1.2.34";
-export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };
+export * from './timeline';
+declare const version = "1.3.2";
+export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProTimeline, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -18,7 +18,7 @@ var _exportNames = {
   ProTable: true,
   ProSkeleton: true,
   utils: true,
-  ProStep: true,
+  ProTimeline: true,
   nocode: true,
   templates: true
 };
@@ -70,16 +70,16 @@ Object.defineProperty(exports, "ProSkeleton", {
     return _skeleton.default;
   }
 });
-Object.defineProperty(exports, "ProStep", {
+Object.defineProperty(exports, "ProTable", {
   enumerable: true,
   get: function get() {
-    return _step.ProStep;
+    return _table.default;
   }
 });
-Object.defineProperty(exports, "ProTable", {
+Object.defineProperty(exports, "ProTimeline", {
   enumerable: true,
   get: function get() {
-    return _table.default;
+    return _timeline.ProTimeline;
   }
 });
 Object.defineProperty(exports, "hooks", {
@@ -239,16 +239,16 @@ Object.keys(_utils).forEach(function (key) {
   });
 });
 
-var _step = require("./step");
+var _timeline = require("./timeline");
 
-Object.keys(_step).forEach(function (key) {
+Object.keys(_timeline).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _step[key]) return;
+  if (key in exports && exports[key] === _timeline[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _step[key];
+      return _timeline[key];
     }
   });
 });
@@ -285,5 +285,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.2.34';
+var version = '1.3.2';
 exports.version = version;

package/lib/nocode/configurators/PageHeader.js

@@ -88,11 +88,11 @@ var schema = [{
         }, {
           name: 'iconColor',
           title: '图标颜色',
-          component: 'ColorSwatches'
+          component: 'ColorPicker'
         }, {
           name: 'iconBackgroundColor',
           title: '图标背景颜色',
-          component: 'ColorSwatches'
+          component: 'ColorPicker'
         }, {
           name: 'iconBackgroundType',
           title: '图标背景形状',

package/lib/page-header/index.js

@@ -88,8 +88,12 @@ var getColorAndStyle = function getColorAndStyle(color, backgroundColor, backgro
   var isColorPresetColor = (0, _utils.isPresetColor)(color);
   var isBgColorPresetColor = (0, _utils.isPresetColor)(backgroundColor);
   var className = (0, _classnames2.default)((_classnames = {}, _defineProperty(_classnames, "".concat((0, _utils.getColorClassName)(color)), isColorPresetColor), _defineProperty(_classnames, "".concat((0, _utils.getBackgroundColorClassName)(backgroundColor)), isBgColorPresetColor), _defineProperty(_classnames, "".concat(cls("bg-type-".concat(backgroundType))), !!backgroundType), _classnames));
-  var styleColor = isColorPresetColor ? undefined : color;
-  var styleBgColor = isBgColorPresetColor ? undefined : backgroundColor;
+  var styleColor = isColorPresetColor ? (0, _utils.getColor)(color) : color;
+  var styleBgColor = isBgColorPresetColor ? (0, _utils.getColor)(backgroundColor) : backgroundColor; // debugger;
+  // console.log('color', color);
+  // console.log('backgroundColor', backgroundColor);
+  // console.log('styleBgColor', styleBgColor);
+
   var style = {
     color: styleColor,
     backgroundColor: styleBgColor

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

@@ -172,13 +172,13 @@ var Layout = function Layout(props) {
         className: cls('wrapper')
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: cls('left')
-      }, header && /*#__PURE__*/_react.default.createElement(_utils.Header, _objectSpread({}, header)), (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema3 = dataFilter.schema) === null || _dataFilter$schema3 === void 0 ? void 0 : _dataFilter$schema3.length) && renderQueryFilter()), /*#__PURE__*/_react.default.createElement("div", {
+      }, header && /*#__PURE__*/_react.default.createElement(_utils.Header, _objectSpread({}, header))), /*#__PURE__*/_react.default.createElement("div", {
         className: cls('right')
       }, extra && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
         actionRef: actionRef,
         quickAction: extra,
         rowSelection: rowSelection
-      }), !(dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema4 = dataFilter.schema) === null || _dataFilter$schema4 === void 0 ? void 0 : _dataFilter$schema4.length) && renderQueryFilter())));
+      }), !(dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema3 = dataFilter.schema) === null || _dataFilter$schema3 === void 0 ? void 0 : _dataFilter$schema3.length) && renderQueryFilter())), (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema4 = dataFilter.schema) === null || _dataFilter$schema4 === void 0 ? void 0 : _dataFilter$schema4.length) && renderQueryFilter());
     } else if (!header && mainAction) {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderQueryFilter());
     } else if (!header && !mainAction) {

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

@@ -64,6 +64,13 @@ var _default = function _default(props) {
       responsiveProps = _useResponsiveProps.responsiveProps,
       paginationWrapperRef = _useResponsiveProps.ref;
 
+  (0, _react.useEffect)(function () {
+    // size='mini' 模式下 current 受控
+    if (responsiveProps === 'mini') {
+      setCurrentPage(current);
+    }
+  }, [current]);
+
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       visible = _useState2[0],
@@ -100,6 +107,9 @@ var _default = function _default(props) {
         text: true,
         onMouseEnter: function onMouseEnter() {
           return setVisible(true);
+        },
+        style: {
+          lineHeight: '18px'
         }
       }, (0, _utils.getMessage)('total', {
         total: total

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

@@ -39,9 +39,11 @@ var RadioItem = _components.Menu.RadioItem;
 var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-icon');
 
 var DensityIcon = function DensityIcon(props) {
+  var _actionRef$current;
+
   var actionRef = props.actionRef;
 
-  var _useState = (0, _react.useState)('medium'),
+  var _useState = (0, _react.useState)(((_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : _actionRef$current.size) || 'medium'),
       _useState2 = _slicedToArray(_useState, 2),
       size = _useState2[0],
       setSize = _useState2[1]; // const [fullscreen, setFullscreen] = useState<boolean>(false);
@@ -61,10 +63,10 @@ var DensityIcon = function DensityIcon(props) {
 
 
   var radioOnchange = function radioOnchange(mode) {
-    var _actionRef$current, _actionRef$current$se;
+    var _actionRef$current2, _actionRef$current2$s;
 
     setSize(mode);
-    (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setSize) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, mode);
+    (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setSize) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, mode);
   }; // // 销毁监听函数
   // useEffect(() => {
   //   return () => {

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

@@ -54,9 +54,18 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 var CheckboxItem = _components.Menu.CheckboxItem;
 var Row = _components.Grid.Row,
     Col = _components.Grid.Col;
-var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-filter-column');
+var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-filter-column'); // 判断是否是 root 组织
+
+var isRoot = (0, _utils.getCookie)('organizationId') === '1';
 
 var processColumns = function processColumns(columns) {
+  if (isRoot) {
+    // root 组织下不显示标签管理
+    columns = columns.filter(function (item) {
+      return item.valueType !== 'selectGroup';
+    });
+  }
+
   return columns.map(function (item) {
     if (item.columnFilters === false) {
       return item;
@@ -313,7 +322,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
           return onChangeColumns(check, dataIndex);
         },
         disabled: columnFiltersDisabled
-      }, title, !lock && /*#__PURE__*/_react.default.createElement("div", {
+      }, title, !lock && !columnFiltersDisabled && /*#__PURE__*/_react.default.createElement("div", {
         className: cls({
           sort: true
         })

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

@@ -46,15 +46,15 @@ var FullScreen = function FullScreen(props) {
 
   var afterClose = function afterClose() {
     // 判断全屏前后筛选表单值是否有改变
-    var n = JSON.stringify((0, _utils.getValidValues)(normalDataFilterForm.values));
-    var f = JSON.stringify((0, _utils.getValidValues)(fullscreenDataFilterForm.values));
+    var n = JSON.stringify((0, _utils.getValidValues)(normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.values));
+    var f = JSON.stringify((0, _utils.getValidValues)(fullscreenDataFilterForm === null || fullscreenDataFilterForm === void 0 ? void 0 : fullscreenDataFilterForm.values));
 
     if (n === f) {
       // 关闭全屏后，表单值未变化，开启普通表单onFilter
       filterEnableRef.current.normal = true;
     } else {
       // 关闭全屏后，表单值有变化，修改表单值
-      normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.setValues(fullscreenDataFilterForm.values);
+      normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.setValues(fullscreenDataFilterForm === null || fullscreenDataFilterForm === void 0 ? void 0 : fullscreenDataFilterForm.values);
     } // 关闭全屏后，关闭全屏表单onFilter
 
 
@@ -64,15 +64,15 @@ var FullScreen = function FullScreen(props) {
 
   var afterOpen = function afterOpen() {
     // 判断全屏前后筛选表单值是否有改变
-    var n = JSON.stringify((0, _utils.getValidValues)(normalDataFilterForm.values));
-    var f = JSON.stringify((0, _utils.getValidValues)(fullscreenDataFilterForm.values));
+    var n = JSON.stringify((0, _utils.getValidValues)(normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.values));
+    var f = JSON.stringify((0, _utils.getValidValues)(fullscreenDataFilterForm === null || fullscreenDataFilterForm === void 0 ? void 0 : fullscreenDataFilterForm.values));
 
     if (n === f) {
       // 全屏后，表单值未变化，开启全屏表单onFilter
       filterEnableRef.current.fullscreen = true;
     } else {
       // 全屏后，表单值变化，修改表单值
-      fullscreenDataFilterForm === null || fullscreenDataFilterForm === void 0 ? void 0 : fullscreenDataFilterForm.setValues(normalDataFilterForm.values);
+      fullscreenDataFilterForm === null || fullscreenDataFilterForm === void 0 ? void 0 : fullscreenDataFilterForm.setValues(normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.values);
     } // 全屏后，关闭普通表单onFilter
 
 

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

@@ -29,7 +29,7 @@
   }
   &-reset {
     position: absolute;
-    right: 16px;
+    right: 0px;
     top: 6px;
   }
   // .next-menu {
@@ -59,7 +59,7 @@
     .teamix-pro-table-toolbar-filter-column-sort {
       visibility: hidden;
       position: absolute;
-      right: 16px;
+      right: 0px;
       top: 0;
       color: var(--color-text1-7);
       i {

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", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams"];
+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", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -220,6 +220,11 @@ var ProTable = function ProTable(props) {
       _props$filterColumnTy = props.filterColumnType,
       filterColumnType = _props$filterColumnTy === void 0 ? 'auto' : _props$filterColumnTy,
       defaultFilterParams = props.defaultFilterParams,
+      _props$reserveSelecte = props.reserveSelectedRecords,
+      reserveSelectedRecords = _props$reserveSelecte === void 0 ? false : _props$reserveSelecte,
+      _props$size = props.size,
+      propsSize = _props$size === void 0 ? 'medium' : _props$size,
+      disableSelectAll = props.disableSelectAll,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -273,7 +278,7 @@ var ProTable = function ProTable(props) {
       filteredColumns = _useState16[0],
       setFilteredColumns = _useState16[1];
 
-  var _useState17 = (0, _react.useState)('medium'),
+  var _useState17 = (0, _react.useState)(propsSize),
       _useState18 = _slicedToArray(_useState17, 2),
       size = _useState18[0],
       _setSize = _useState18[1];
@@ -344,8 +349,8 @@ var ProTable = function ProTable(props) {
   var normalDataFilterForm = normalDataFilterFormRef.current;
   var fullscreenDataFilterForm = fullscreenDataFilterFormRef.current; // 传给 QueryFilter 的 formRef
 
-  var dataFilterFormRef = !fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef;
-  var dataFilterForm = dataFilterFormRef.current; // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
+  var dataFilterFormRef = !fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef; // let dataFilterForm = dataFilterFormRef.current;
+  // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
 
   var _useState29 = (0, _react.useState)(false),
       _useState30 = _slicedToArray(_useState29, 2),
@@ -383,7 +388,7 @@ var ProTable = function ProTable(props) {
         result = propsRowSelection.getProps(record, index);
       }
 
-      if (showSkeleton) {
+      if (showSkeleton && result) {
         result.disabled = true;
       }
 
@@ -396,7 +401,7 @@ var ProTable = function ProTable(props) {
         result = propsRowSelection.titleProps();
       }
 
-      if (showSkeleton) {
+      if (showSkeleton || disableSelectAll) {
         result.disabled = true;
       }
 
@@ -431,7 +436,7 @@ var ProTable = function ProTable(props) {
       return selectedRowKeys.includes(k);
     });
     return {
-      disabled: showLoading && !showSkeleton && (getData.loading || props.loading),
+      disabled: disableSelectAll || showLoading && !showSkeleton && (getData.loading || props.loading),
       onChange: function onChange(check) {
         if (check) {
           var result = selectedRowKeys.concat([]);
@@ -535,6 +540,7 @@ var ProTable = function ProTable(props) {
         (0, _utils2.emit)('refreshFilterState', newColumns);
       }
     },
+    size: size,
     setSize: function setSize(mode) {
       _setSize(mode);
     },
@@ -554,12 +560,12 @@ var ProTable = function ProTable(props) {
       _request(params);
     },
     reset: function reset() {
-      var _actionRef$current4, _actionRef$current4$s;
+      var _actionRef$current4, _actionRef$current4$s, _dataFilterFormRef$cu;
 
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset()); // 清空列过滤参数
 
       (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setFilterRules) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, {});
-      dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.reset();
+      (_dataFilterFormRef$cu = dataFilterFormRef.current) === null || _dataFilterFormRef$cu === void 0 ? void 0 : _dataFilterFormRef$cu.reset();
       setCurrentPage(1);
 
       _request(_defineProperty({}, targetPageKey, 1));
@@ -581,7 +587,8 @@ var ProTable = function ProTable(props) {
       pageSize: pageSize
     },
     data: data,
-    dataFilterForm: dataFilterForm,
+    dataFilterForm: dataFilterFormRef.current,
+    dataFilterFormRef: dataFilterFormRef,
     normalDataFilterForm: normalDataFilterForm,
     fullscreenDataFilterForm: fullscreenDataFilterForm,
     filterEnableRef: filterEnableRef,
@@ -674,7 +681,7 @@ var ProTable = function ProTable(props) {
   }); // 请求函数
 
   function _request(params, noLoading, filterParams) {
-    var _actionRef$current$ge, _actionRef$current5, _actionRef$current5$g, _objectSpread2;
+    var _dataFilterFormRef$cu2, _actionRef$current$ge, _actionRef$current5, _actionRef$current5$g, _objectSpread2;
 
     // 如果没有传 url 且没有 customRequest，直接返回
     if (!url && !customRequest) {
@@ -687,7 +694,7 @@ var ProTable = function ProTable(props) {
 
     var sortParams = targetFormatSort(sort); // 筛选区请求参数
 
-    var dataFilterParams = filterParams !== null && filterParams !== void 0 ? filterParams : dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.values; // 列过滤请求参数
+    var dataFilterParams = filterParams !== null && filterParams !== void 0 ? filterParams : (_dataFilterFormRef$cu2 = dataFilterFormRef.current) === null || _dataFilterFormRef$cu2 === void 0 ? void 0 : _dataFilterFormRef$cu2.values; // 列过滤请求参数
 
     var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$g = _actionRef$current5.getFilterRules) === null || _actionRef$current5$g === void 0 ? void 0 : _actionRef$current5$g.call(_actionRef$current5)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {}; // 格式化后的请求参数
 
@@ -781,7 +788,8 @@ var ProTable = function ProTable(props) {
 
 
   var dataFilter = _objectSpread(_objectSpread({
-    mode: 'inline'
+    mode: 'inline',
+    forceClear: true
   }, propsDataFilter), {}, {
     onInit: function onInit(values) {
       // 表单初始化请求处理
@@ -812,8 +820,10 @@ var ProTable = function ProTable(props) {
       _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());
-      dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.reset();
+      (_dataFilterFormRef$cu3 = dataFilterFormRef.current) === null || _dataFilterFormRef$cu3 === void 0 ? void 0 : _dataFilterFormRef$cu3.reset();
       setCurrentPage(1);
 
       _request(_defineProperty({}, targetPageKey, 1), false, values);
@@ -900,21 +910,30 @@ var ProTable = function ProTable(props) {
 
   var renderFooter = function renderFooter() {
     function onChangePagination(currentPage) {
-      var _actionRef$current7, _actionRef$current7$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);
+
+      // 翻页默认清空选择
+      if (!reserveSelectedRecords) {
+        var _actionRef$current7, _actionRef$current7$c;
+
+        (_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(currentPage);
 
       _request(_objectSpread(_defineProperty({}, targetPageKey, currentPage), params));
     }
 
     function onChangePaginationSize(currentPageSize) {
-      var _actionRef$current8, _actionRef$current8$c, _request5;
+      var _request5;
+
+      // 翻页默认清空选择
+      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);
+      }
 
-      // 翻页暂时先清空选择
-      (_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);
       setPageSize(currentPageSize);
       setCurrentPage(1);
 

package/lib/table/index.scss

@@ -118,4 +118,10 @@ $fullscreenPadding: 24px;
 
 .mb8 {
   margin-bottom: 8px;
+}
+
+.next-table {
+  .next-form-preview.next-form-preview {
+    line-height: unset;
+  }
 }