@teamix/pro 1.2.33 → 1.3.1

package/es/form/SchemaForm/initializeRequest.js

@@ -1,12 +1,47 @@
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+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 _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 _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 _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; }
+
+import { isArr } from '@teamix/utils';
+
 var initializeRequest = function initializeRequest(requestConfig, suffix) {
   if (requestConfig) {
-    var requestConfigName = "$requestConfig_".concat(suffix);
-    return {
-      reactions: ["{{$common($request,".concat(requestConfigName, ",context)}}")],
-      scope: _defineProperty({}, requestConfigName, requestConfig)
-    };
+    if (isArr(requestConfig)) {
+      var reactionsMap = [];
+      var scopeMap = {};
+      requestConfig.forEach(function (item, index) {
+        var _initializeRequest = initializeRequest(item, "".concat(suffix).concat(index)),
+            reactions = _initializeRequest.reactions,
+            scope = _initializeRequest.scope;
+
+        reactionsMap = [].concat(_toConsumableArray(reactionsMap), _toConsumableArray(reactions));
+        scopeMap = _objectSpread(_objectSpread({}, scopeMap), scope);
+      });
+      return {
+        reactions: reactionsMap,
+        scope: scopeMap
+      };
+    } else {
+      var requestConfigName = "$requestConfig_".concat(suffix);
+      return {
+        reactions: ["{{$common($request,".concat(requestConfigName, ",context)}}")],
+        scope: _defineProperty({}, requestConfigName, requestConfig)
+      };
+    }
   }
 
   return {

package/es/form/SchemaForm/reactions.d.ts

@@ -1,6 +1,6 @@
 import type { ProFormRequestConfig } from '../typing';
-declare const $request: (field: any, requestConfig: ProFormRequestConfig, context: any) => Promise<unknown>;
+declare const $request: (field: any, requestConfig: ProFormRequestConfig, context: any, type: 'request' | 'validator' | 'dataSource') => Promise<unknown>;
 declare const $common: (services: any, requestConfig: ProFormRequestConfig, context: any) => (field: any) => any;
 declare const $validator: (services: any, requestConfig: ProFormRequestConfig, context: any) => (value: any, rules: any, { field }: any) => any;
-declare const $dataSource: (services: any, requestConfig: ProFormRequestConfig, context: any) => (field: any) => any;
+declare const $dataSource: (services: any, requestConfig: ProFormRequestConfig, context: any, readPretty: any) => (field: any) => any;
 export { $request, $common, $dataSource, $validator };

package/es/form/SchemaForm/reactions.js

@@ -4,16 +4,21 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 { isFn, isPlainObj, doCommonRequest, getValueByValue } from '@teamix/utils'; // 配置请求
+import { isFn, isPureObj, doCommonRequest, getValueByValue } from '@teamix/utils'; // 配置请求
 
-var $request = function $request(field, requestConfig, context) {
+var $request = function $request(field, requestConfig, context, type) {
   var _field$data;
 
-  var refresh = field === null || field === void 0 ? void 0 : (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
   var beforeRequest = requestConfig.beforeRequest,
       onSuccess = requestConfig.onSuccess;
-  var refreshResult = isPlainObj(refresh) ? refresh : {};
   var beforeRequestResult = isFn(beforeRequest) ? beforeRequest(field, context) : {};
+  /**
+   * // 主动触发的请求刷新
+   */
+  // 触发所有配置的请求
+
+  var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
+  var refreshResult = isPureObj(refresh) ? refresh : {};
   return doCommonRequest(_objectSpread(_objectSpread({}, requestConfig), {}, {
     params: _objectSpread(_objectSpread(_objectSpread({}, requestConfig.params), beforeRequestResult), refreshResult),
     beforeRequest: function beforeRequest() {
@@ -28,7 +33,7 @@ var $request = function $request(field, requestConfig, context) {
 
 var $common = function $common(services, requestConfig, context) {
   return function (field) {
-    return services(field, requestConfig, context).then(function (res) {
+    return services(field, requestConfig, context, 'request').then(function (res) {
       return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
     });
   };
@@ -38,35 +43,48 @@ var $common = function $common(services, requestConfig, context) {
 var $validator = function $validator(services, requestConfig, context) {
   return function (value, rules, _ref) {
     var field = _ref.field;
-    return services(field, requestConfig, context).then(function (res) {
+    return services(field, requestConfig, context, 'validator').then(function (res) {
       return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
     });
   };
 }; // 配置DataSource
 
 
-var $dataSource = function $dataSource(services, requestConfig, context) {
+var $dataSource = function $dataSource(services, requestConfig, context, readPretty) {
   return function (field) {
-    field.setState({
-      loading: true,
-      readOnly: true
-    });
-    return services(field, requestConfig, context).then(function (res) {
+    if (!readPretty) {
+      field.setState({
+        loading: true,
+        readOnly: true
+      });
+    }
+
+    return services(field, requestConfig, context, 'dataSource').then(function (res) {
       var isValueInDataSource = getValueByValue(res, field.value);
       var clearValue = isValueInDataSource ? {} : {
         value: undefined
       };
-      field.setState(_objectSpread({
-        dataSource: res,
-        loading: false,
-        readOnly: false
-      }, clearValue));
+
+      if (!readPretty) {
+        field.setState(_objectSpread({
+          dataSource: res,
+          loading: false,
+          readOnly: false
+        }, clearValue));
+      } else {
+        field.setState({
+          dataSource: res
+        });
+      }
+
       return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
     }).catch(function () {
-      field.setState({
-        loading: false,
-        readOnly: false
-      });
+      if (!readPretty) {
+        field.setState({
+          loading: false,
+          readOnly: false
+        });
+      }
     });
   };
 };

package/es/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';
@@ -44,7 +48,7 @@ export interface ProFormSchemaItem {
     readPretty?: boolean | string;
     pattern?: FieldPatternTypes;
     default?: any;
-    request?: ProFormRequestConfig;
+    request?: ProFormRequestConfig | ProFormRequestConfig[];
     data?: AnyObject;
 }
 export declare type ProFormSchema = ProFormSchemaItem[];
@@ -63,12 +67,14 @@ export interface ProFormProps extends IFormLayoutProps {
     onChange?: (values: any, fieldValue?: any, fieldName?: any) => any;
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
+    onInitialComplete?: (form: FormType) => void;
 }
 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;
@@ -92,6 +98,8 @@ export interface QueryFilterProps extends ProFormProps {
     purePanel?: boolean;
     /** 面板是否默认展开，仅在 mode='panel' 时生效 */
     expand?: boolean;
+    /** 是否强制清除 */
+    forceClear?: boolean;
     /** 顶部筛选区前缀 */
     addonBefore?: ReactNode;
     /** 顶部筛选区后缀 */

package/es/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.33";
-export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };
+export * from './timeline';
+declare const version = "1.3.1";
+export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProTimeline, hooks, nocode, templates, utils, };

package/es/index.js

@@ -11,7 +11,7 @@ import ProTable from './table';
 import ProSkeleton from './skeleton';
 import utils from './utils'; // import ProSidebar from './sidebar'
 
-import { ProStep } from './step';
+import { ProTimeline } from './timeline';
 import * as nocode from './nocode';
 import * as templates from './templates';
 import TeamixIcon from '@teamix/icon'; // 设置图标源
@@ -29,8 +29,8 @@ export * from './skeleton';
 export * from './table';
 export * from './utils'; // export * from './sidebar';
 
-export * from './step';
-var version = '1.2.33';
+export * from './timeline';
+var version = '1.3.1';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
-ProStep, hooks, nocode, templates, utils };
+ProTimeline, hooks, nocode, templates, utils };

package/es/nocode/configurators/PageHeader.js

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

package/es/page-header/index.js

@@ -17,7 +17,7 @@ import { useHistory } from 'react-router-dom';
 import classnames from 'classnames';
 import TeamixIcon from '@teamix/icon';
 import { Breadcrumb } from '@alicloudfe/components';
-import { baseClass, goToLink, renderTags, isPresetColor, getColorClassName, getBackgroundColorClassName } from '@teamix/utils';
+import { baseClass, goToLink, renderTags, isPresetColor, getColor, getColorClassName, getBackgroundColorClassName } from '@teamix/utils';
 import { ProActionGroup } from '../actions';
 import { ProSkeletonRaw } from '../skeleton';
 import ProInfo from '../info';
@@ -69,8 +69,12 @@ var getColorAndStyle = function getColorAndStyle(color, backgroundColor, backgro
   var isColorPresetColor = isPresetColor(color);
   var isBgColorPresetColor = isPresetColor(backgroundColor);
   var className = classnames((_classnames = {}, _defineProperty(_classnames, "".concat(getColorClassName(color)), isColorPresetColor), _defineProperty(_classnames, "".concat(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 ? getColor(color) : color;
+  var styleBgColor = isBgColorPresetColor ? getColor(backgroundColor) : backgroundColor; // debugger;
+  // console.log('color', color);
+  // console.log('backgroundColor', backgroundColor);
+  // console.log('styleBgColor', styleBgColor);
+
   var style = {
     color: styleColor,
     backgroundColor: styleBgColor

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

@@ -152,13 +152,13 @@ var Layout = function Layout(props) {
         className: cls('wrapper')
       }, /*#__PURE__*/React.createElement("div", {
         className: cls('left')
-      }, header && /*#__PURE__*/React.createElement(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.createElement("div", {
+      }, header && /*#__PURE__*/React.createElement(Header, _objectSpread({}, header))), /*#__PURE__*/React.createElement("div", {
         className: cls('right')
       }, extra && /*#__PURE__*/React.createElement(QuickAction, {
         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.createElement(React.Fragment, null, renderQueryFilter());
     } else if (!header && !mainAction) {

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

@@ -23,7 +23,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { Pagination, Balloon, Select, Button, Input, Icon } from '@alicloudfe/components';
 import { getMessage, baseClass } from '@teamix/utils';
 import { useResponsiveProps } from '@teamix/hooks';
@@ -46,6 +46,13 @@ export default (function (props) {
       responsiveProps = _useResponsiveProps.responsiveProps,
       paginationWrapperRef = _useResponsiveProps.ref;
 
+  useEffect(function () {
+    // size='mini' 模式下 current 受控
+    if (responsiveProps === 'mini') {
+      setCurrentPage(current);
+    }
+  }, [current]);
+
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
       visible = _useState2[0],
@@ -82,6 +89,9 @@ export default (function (props) {
         text: true,
         onMouseEnter: function onMouseEnter() {
           return setVisible(true);
+        },
+        style: {
+          lineHeight: '18px'
         }
       }, getMessage('total', {
         total: total

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

@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { Message, Overlay } from '@alicloudfe/components';
 import './index.scss';
-import { getMessage } from '@teamix/utils';
+import { getMessage, getValidValues } from '@teamix/utils';
 
 var FullScreen = function FullScreen(props) {
   var children = props.children,
@@ -9,7 +9,8 @@ var FullScreen = function FullScreen(props) {
       actionRef = props.actionRef;
   var _actionRef$current = actionRef.current,
       normalDataFilterForm = _actionRef$current.normalDataFilterForm,
-      fullscreenDataFilterForm = _actionRef$current.fullscreenDataFilterForm;
+      fullscreenDataFilterForm = _actionRef$current.fullscreenDataFilterForm,
+      filterEnableRef = _actionRef$current.filterEnableRef;
 
   var closeByESC = function closeByESC(e) {
     if (visible && e.code === 'Escape') {
@@ -28,12 +29,39 @@ var FullScreen = function FullScreen(props) {
   }, [visible, actionRef]);
 
   var afterClose = function afterClose() {
-    normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.setValues(fullscreenDataFilterForm.values);
+    // 判断全屏前后筛选表单值是否有改变
+    var n = JSON.stringify(getValidValues(normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.values));
+    var f = JSON.stringify(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 === null || fullscreenDataFilterForm === void 0 ? void 0 : fullscreenDataFilterForm.values);
+    } // 关闭全屏后，关闭全屏表单onFilter
+
+
+    filterEnableRef.current.fullscreen = false;
   }; // 全屏开启之后
 
 
   var afterOpen = function afterOpen() {
-    fullscreenDataFilterForm.setValues(normalDataFilterForm.values);
+    // 判断全屏前后筛选表单值是否有改变
+    var n = JSON.stringify(getValidValues(normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.values));
+    var f = JSON.stringify(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 === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.values);
+    } // 全屏后，关闭普通表单onFilter
+
+
+    filterEnableRef.current.normal = false; // 消息提示
+
     Message.show({
       type: 'notice',
       content: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, getMessage('press')), /*#__PURE__*/React.createElement("span", {

package/es/table/index.js

@@ -1,4 +1,4 @@
-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"];
 
 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); }
 
@@ -121,7 +121,7 @@ var globalFormatSort = function globalFormatSort(sort) {
 };
 
 var ProTable = function ProTable(props) {
-  var _rowSelection$selecte, _dataFilterForm4;
+  var _rowSelection$selecte;
 
   var header = props.header,
       className = props.className,
@@ -176,6 +176,8 @@ 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,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -287,16 +289,21 @@ var ProTable = function ProTable(props) {
   var _useState27 = useState(false),
       _useState28 = _slicedToArray(_useState27, 2),
       fullscreenState = _useState28[0],
-      setFullscreenState = _useState28[1]; // 非全屏状态下的
+      setFullscreenState = _useState28[1]; // 切换全屏搜索开关
 
 
+  var filterEnableRef = useRef({
+    fullscreen: false,
+    normal: true
+  }); // 非全屏状态下的
+
   var normalDataFilterFormRef = useRef();
   var fullscreenDataFilterFormRef = useRef();
   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 = useState(false),
       _useState30 = _slicedToArray(_useState29, 2),
@@ -334,7 +341,7 @@ var ProTable = function ProTable(props) {
         result = propsRowSelection.getProps(record, index);
       }
 
-      if (showSkeleton) {
+      if (showSkeleton && result) {
         result.disabled = true;
       }
 
@@ -505,12 +512,12 @@ var ProTable = function ProTable(props) {
       _request(params);
     },
     reset: function reset() {
-      var _actionRef$current4, _actionRef$current4$s, _dataFilterForm;
+      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 = 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));
@@ -532,9 +539,11 @@ var ProTable = function ProTable(props) {
       pageSize: pageSize
     },
     data: data,
-    dataFilterForm: dataFilterForm,
+    dataFilterForm: dataFilterFormRef.current,
+    dataFilterFormRef: dataFilterFormRef,
     normalDataFilterForm: normalDataFilterForm,
     fullscreenDataFilterForm: fullscreenDataFilterForm,
+    filterEnableRef: filterEnableRef,
     resetTableMaxBodyHeight: function resetTableMaxBodyHeight() {
       getHeaderHeight().then(function (height) {
         setHeaderHeight(height);
@@ -623,8 +632,8 @@ var ProTable = function ProTable(props) {
     }
   }); // 请求函数
 
-  function _request(params, noLoading) {
-    var _dataFilterForm2, _actionRef$current$ge, _actionRef$current5, _actionRef$current5$g, _objectSpread2;
+  function _request(params, noLoading, filterParams) {
+    var _dataFilterFormRef$cu2, _actionRef$current$ge, _actionRef$current5, _actionRef$current5$g, _objectSpread2;
 
     // 如果没有传 url 且没有 customRequest，直接返回
     if (!url && !customRequest) {
@@ -637,7 +646,7 @@ var ProTable = function ProTable(props) {
 
     var sortParams = targetFormatSort(sort); // 筛选区请求参数
 
-    var dataFilterParams = toJS((_dataFilterForm2 = dataFilterForm) === null || _dataFilterForm2 === void 0 ? void 0 : _dataFilterForm2.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 : {}; // 格式化后的请求参数
 
@@ -688,31 +697,24 @@ var ProTable = function ProTable(props) {
   }
 
   useEffect(function () {
-    dataFilterForm = dataFilterFormRef.current; // 监听 浏览器变化 更吸底状态
+    var _propsDataFilter$sche, _propsDataFilter$sche2;
 
+    // 监听 浏览器变化 更吸底状态
     if (footerSuction) {
       getFooterSuctionState();
 
       window.onresize = function () {
         getFooterSuctionState();
       };
-    }
+    } // 如果不传 dataFilter，则在这里初始化请求
 
-    if (propsDataFilter) {
-      var _dataFilterForm3;
 
-      if (requestWhenMount && ((_dataFilterForm3 = dataFilterForm) === null || _dataFilterForm3 === void 0 ? void 0 : _dataFilterForm3.id)) {
-        // 在请求发送之前 处理漏斗默认数据
-        processDefaultFilter(propsColumns, actionRef, defaultFilterParams);
+    var hasDataFilter = (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : (_propsDataFilter$sche = propsDataFilter.schema) === null || _propsDataFilter$sche === void 0 ? void 0 : _propsDataFilter$sche.length) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : (_propsDataFilter$sche2 = propsDataFilter.schema) === null || _propsDataFilter$sche2 === void 0 ? void 0 : _propsDataFilter$sche2.length) > 0;
 
-        _request();
-      }
-    } else {
-      if (requestWhenMount) {
-        processDefaultFilter(propsColumns, actionRef, defaultFilterParams);
+    if (requestWhenMount && !hasDataFilter) {
+      processDefaultFilter(propsColumns, actionRef, defaultFilterParams);
 
-        _request();
-      }
+      _request();
     }
 
     return function () {
@@ -726,7 +728,7 @@ var ProTable = function ProTable(props) {
 
       actionRef.current = undefined;
     };
-  }, [(_dataFilterForm4 = dataFilterForm) === null || _dataFilterForm4 === void 0 ? void 0 : _dataFilterForm4.id]);
+  }, []);
 
   function onSort(dataIndex, order) {
     var nextSort = _defineProperty({}, dataIndex, order);
@@ -738,26 +740,45 @@ var ProTable = function ProTable(props) {
 
 
   var dataFilter = _objectSpread(_objectSpread({
-    mode: 'inline'
+    mode: 'inline',
+    forceClear: true
   }, propsDataFilter), {}, {
+    onInit: function onInit(values) {
+      // 表单初始化请求处理
+      (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit(values));
+      !fullscreenState && _request({}, false, values);
+      return true;
+    },
     onFilter: function onFilter(values) {
       var _actionRef$current6, _actionRef$current6$c;
 
+      // 全屏状态，判断全屏表单onFilter是否禁用
+      if (fullscreenState && !filterEnableRef.current.fullscreen) {
+        filterEnableRef.current.fullscreen = true;
+        return;
+      } // 非全屏状态，判断普通表单onFiler是否禁用
+
+
+      if (!fullscreenState && !filterEnableRef.current.normal) {
+        filterEnableRef.current.normal = true;
+        return;
+      }
+
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(values)); // 搜索变化时，暂时先清空选择
 
       (_actionRef$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);
 
-      _request(_defineProperty({}, targetPageKey, 1));
+      _request(_defineProperty({}, targetPageKey, 1), false, values);
     },
-    onReset: function onReset() {
-      var _dataFilterForm5;
+    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());
-      (_dataFilterForm5 = dataFilterForm) === null || _dataFilterForm5 === void 0 ? void 0 : _dataFilterForm5.reset();
+      (_dataFilterFormRef$cu3 = dataFilterFormRef.current) === null || _dataFilterFormRef$cu3 === void 0 ? void 0 : _dataFilterFormRef$cu3.reset();
       setCurrentPage(1);
 
-      _request(_defineProperty({}, targetPageKey, 1));
+      _request(_defineProperty({}, targetPageKey, 1), false, values);
     }
   });
 
@@ -841,21 +862,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);