@teamix/pro 1.2.33 → 1.2.34

package/es/form/Filter/index.js

@@ -40,7 +40,7 @@ import debounce from 'lodash.debounce';
 import { Tag } from '@alicloudfe/components';
 import { createForm, onFormReact, onFormInputChange } from '@formily/core';
 import { toJS } from '@formily/reactive';
-import { usePrefixCls, isSignificative, isNum } from '@teamix/utils';
+import { usePrefixCls, isSignificative, isNum, getValidValues } from '@teamix/utils';
 import ProField from '../../field/index';
 import fieldTypeMap from '../fieldTypeMap';
 import { getFormDisplayValues } from '../ProForm/useFormDisplayValues';
@@ -72,10 +72,14 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
 
   var _onFormInit = function onFormInit(form, _ref, configFilterItem) {
     var initialRequest = _ref.initialRequest,
+        initialValues = _ref.initialValues,
         onInit = _ref.onInit;
 
     if (!form.mounted) {
-      form.loading = !!initialRequest;
+      // form的loading为自定义属性
+      form.setState({
+        loading: !!initialRequest || !!initialValues
+      });
     }
 
     var loadingField = Object.values(form.fields).filter(function (field) {
@@ -84,14 +88,25 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
 
     if (form.mounted) {
       if (loadingField.length === 0 && !form.loading) {
-        var onInitResult = onInit && onInit(toJS(form.values));
+        // 仅执行一次onInit
+        _onFormInit = function onFormInit() {};
+
+        var onInitResult = onInit === null || onInit === void 0 ? void 0 : onInit(toJS(form.values));
 
         if (onInitResult) {
           // 根据onInit返回值，判断是否使用该事件执行筛选，使用过则添加筛选标签
-          configFilterItem && configFilterItem(form);
-        }
+          configFilterItem === null || configFilterItem === void 0 ? void 0 : configFilterItem(form);
+          configTag();
+        } // 防止onInit前后的无效onFilter
 
-        _onFormInit = function onFormInit() {};
+
+        if (!Object.keys(form.initialValues).length) {
+          // 如果没有默认值，直接开启onFilter
+          filterEnable.current = true;
+        } else {
+          // 否则，拿onFilter的值与默认值进行比较
+          filterEnable.current = form.initialValues;
+        }
       }
     }
   }; // 设置当前form
@@ -172,6 +187,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
 
   var filterItem = useRef([]);
   var currentForm = useRef(mode === 'panel' ? advancedFilterVisible ? 'advanced' : 'light' : 'simple');
+  var filterEnable = useRef(false);
   var prefixCls = usePrefixCls('', {
     prefix: 'teamix-pro-form-query-filter'
   }); // 设置筛选数据
@@ -237,7 +253,22 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
 
     setAdvancedFilterVisible(result);
     onExpand === null || onExpand === void 0 ? void 0 : onExpand(result);
-  }, [advancedFilterVisible, configTag, currentForm.current]); // 简单搜索Filter
+  }, [advancedFilterVisible, configTag, currentForm.current]); // 是否开启onFilter
+
+  var enableFilter = function enableFilter(values) {
+    var initialValues = JSON.stringify(getValidValues(filterEnable.current));
+    var changeValues = JSON.stringify(getValidValues(values));
+
+    if (filterEnable.current === true) {
+      return true;
+    } else if (initialValues === changeValues) {
+      filterEnable.current = true;
+      return false;
+    }
+
+    return false;
+  }; // 简单搜索Filter
+
 
   var onSimpleFilter = useCallback( /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
@@ -245,23 +276,31 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
+              if (enableFilter(values)) {
+                _context.next = 2;
+                break;
+              }
+
+              return _context.abrupt("return");
+
+            case 2:
               if (!(currentForm.current === 'simple')) {
-                _context.next = 5;
+                _context.next = 7;
                 break;
               }
 
               if (!hasRequired) {
-                _context.next = 4;
+                _context.next = 6;
                 break;
               }
 
-              _context.next = 4;
+              _context.next = 6;
               return simpleForm.validate();
 
-            case 4:
-              onFilter && onFilter(values);
+            case 6:
+              onFilter === null || onFilter === void 0 ? void 0 : onFilter(values);
 
-            case 5:
+            case 7:
             case "end":
               return _context.stop();
           }
@@ -272,7 +311,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     return function (_x) {
       return _ref4.apply(this, arguments);
     };
-  }(), [onFilter, currentForm.current, hasRequired]); // 轻量搜索Filter
+  }(), [onFilter, currentForm.current, hasRequired, enableFilter]); // 轻量搜索Filter
 
   var onLightFilter = useCallback( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
@@ -280,21 +319,29 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
+              if (enableFilter(values)) {
+                _context2.next = 2;
+                break;
+              }
+
+              return _context2.abrupt("return");
+
+            case 2:
               if (!(currentForm.current === 'light')) {
-                _context2.next = 6;
+                _context2.next = 8;
                 break;
               }
 
-              onFilter && onFilter(values);
-              _context2.next = 4;
+              onFilter === null || onFilter === void 0 ? void 0 : onFilter(values);
+              _context2.next = 6;
               return advancedForm.reset();
 
-            case 4:
+            case 6:
               // 不会触发高级筛选的onReset回调函数
               configFilterItem(advancedForm);
               configTag();
 
-            case 6:
+            case 8:
             case "end":
               return _context2.stop();
           }
@@ -305,18 +352,28 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     return function (_x2) {
       return _ref5.apply(this, arguments);
     };
-  }(), [onFilter, currentForm.current]); // 高级搜索Filter
+  }(), [onFilter, currentForm.current, enableFilter]); // 高级搜索Filter
 
   var onAdvancedFilter = useCallback(function (values) {
+    if (!enableFilter(values)) {
+      return;
+    }
+
     setCurrentForm('advanced');
-    onFilter && onFilter(values);
+    onFilter === null || onFilter === void 0 ? void 0 : onFilter(values);
     configFilterItem(advancedForm);
     lightForm.reset();
-  }, [onFilter, currentForm.current]); // 高级搜索Reset
+  }, [onFilter, currentForm.current, enableFilter]); // 高级搜索Change
+
+  var onAdvancedChange = useCallback(function (values) {
+    if (!enableFilter(values)) {
+      return;
+    }
+  }, [enableFilter]); // 高级搜索Reset
 
   var onAdvancedReset = useCallback(function () {
     setCurrentForm('advanced');
-    onReset && onReset(toJS(advancedForm.values));
+    onReset === null || onReset === void 0 ? void 0 : onReset(toJS(advancedForm.values));
     configFilterItem(advancedForm);
     lightForm.reset();
   }, [onReset]); // 关闭标签清空表单字段值
@@ -332,11 +389,10 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     advancedForm.setValuesIn(key, newValue);
     configFilterItem(advancedForm);
     configTag();
-    onFilter && onFilter(toJS(advancedForm.values));
-  }, []); // 异步默认值回调，设置form的loading状态为false
+    onFilter === null || onFilter === void 0 ? void 0 : onFilter(toJS(advancedForm.values));
+  }, []); // initialValues和initialRequest的回调
 
-  var onInitialRequestComplete = useCallback(function (_, __, _ref6) {
-    var form = _ref6.form;
+  var onInitialComplete = useCallback(function (form) {
     form.setState({
       loading: false
     });
@@ -362,22 +418,22 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     }, /*#__PURE__*/React.createElement(SimpleFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
       form: simpleForm,
       onChange: debounce(onSimpleFilter, filterDebounce),
-      onSubmit: onSimpleFilter
+      onSubmit: onSimpleFilter,
+      onInitialComplete: onInitialComplete
     }))),
     panelContent: mode === 'panel' ? /*#__PURE__*/React.createElement(AdvancedFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
-      initialRequest: otherProps.initialRequest ? _objectSpread(_objectSpread({}, otherProps.initialRequest), {}, {
-        onComplete: onInitialRequestComplete
-      }) : undefined,
       form: advancedForm,
+      onChange: debounce(onAdvancedChange, filterDebounce),
       onSubmit: onAdvancedFilter,
-      onReset: onAdvancedReset
+      onReset: onAdvancedReset,
+      onInitialComplete: onInitialComplete
     })) : null
-  }, mode === 'panel' && !advancedFilterVisible ? /*#__PURE__*/React.createElement(Tag.Group, null, tagDataSource.map(function (_ref7) {
-    var key = _ref7.key,
-        label = _ref7.label,
-        value = _ref7.value,
-        type = _ref7.type,
-        index = _ref7.index;
+  }, mode === 'panel' && !advancedFilterVisible ? /*#__PURE__*/React.createElement(Tag.Group, null, tagDataSource.map(function (_ref6) {
+    var key = _ref6.key,
+        label = _ref6.label,
+        value = _ref6.value,
+        type = _ref6.type,
+        index = _ref6.index;
     return /*#__PURE__*/React.createElement(Tag.Closeable, {
       key: isNum(index) ? key + label : key,
       afterClose: function afterClose() {

package/es/form/ProForm/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "className"];
+var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "onInitialComplete", "className"];
 
 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; }
 
@@ -41,6 +41,7 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
       onChange = _ref.onChange,
       onSubmit = _ref.onSubmit,
       onSubmitFailed = _ref.onSubmitFailed,
+      onInitialComplete = _ref.onInitialComplete,
       className = _ref.className,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
@@ -91,13 +92,12 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
   useEffect(function () {
     if (initialValues) {
       form.setInitialValues(initialValues);
+      onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
     } else if (initialRequest) {
       useInitialRequest(initialRequest).then(function (values) {
         form.setInitialValues(values);
       }).finally(function () {
-        initialRequest.onComplete && initialRequest.onComplete(undefined, undefined, {
-          form: form
-        });
+        onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
       });
     }
   }, []); // 配置国际化

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

@@ -1,6 +1,6 @@
 import type { ProFormRequestConfig } from '../typing';
 interface IInitializeRequest {
-    (requestConfig?: ProFormRequestConfig, suffix?: string): {
+    (requestConfig?: ProFormRequestConfig | ProFormRequestConfig[], suffix?: string): {
         reactions: any[];
         scope: {
             [x: string]: any;

package/es/form/SchemaForm/initializeRequest.js

@@ -1,12 +1,48 @@
+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);
+      var requestIndex = (/\d{1,}\w(\d{0,})/g.exec(suffix) || [])[1];
+      return {
+        reactions: ["{{$common($request,".concat(requestConfigName, ",context,").concat(requestIndex, ")}}")],
+        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 $common: (services: any, requestConfig: ProFormRequestConfig, context: any) => (field: any) => any;
+declare const $request: (field: any, requestConfig: ProFormRequestConfig, context: any, type: string | number) => Promise<unknown>;
+declare const $common: (services: any, requestConfig: ProFormRequestConfig, context: any, index: string) => (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;
 export { $request, $common, $dataSource, $validator };

package/es/form/SchemaForm/reactions.js

@@ -6,10 +6,17 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { isFn, isPlainObj, 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;
+  // 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,
       onSuccess = requestConfig.onSuccess;
   var refreshResult = isPlainObj(refresh) ? refresh : {};
@@ -26,9 +33,9 @@ var $request = function $request(field, requestConfig, context) {
 }; // 通用请求配置上下文
 
 
-var $common = function $common(services, requestConfig, context) {
+var $common = function $common(services, requestConfig, context, index) {
   return function (field) {
-    return services(field, requestConfig, context).then(function (res) {
+    return services(field, requestConfig, context, index || 'common').then(function (res) {
       return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
     });
   };
@@ -38,7 +45,7 @@ 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);
     });
   };
@@ -51,7 +58,7 @@ var $dataSource = function $dataSource(services, requestConfig, context) {
       loading: true,
       readOnly: true
     });
-    return services(field, requestConfig, context).then(function (res) {
+    return services(field, requestConfig, context, 'dataSource').then(function (res) {
       var isValueInDataSource = getValueByValue(res, field.value);
       var clearValue = isValueInDataSource ? {} : {
         value: undefined

package/es/form/typing.d.ts

@@ -44,7 +44,7 @@ export interface ProFormSchemaItem {
     readPretty?: boolean | string;
     pattern?: FieldPatternTypes;
     default?: any;
-    request?: ProFormRequestConfig;
+    request?: ProFormRequestConfig | ProFormRequestConfig[];
     data?: AnyObject;
 }
 export declare type ProFormSchema = ProFormSchemaItem[];
@@ -63,6 +63,7 @@ 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;

package/es/index.d.ts

@@ -24,5 +24,5 @@ export * from './skeleton';
 export * from './table';
 export * from './utils';
 export * from './step';
-declare const version = "1.2.33";
+declare const version = "1.2.34";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };

package/es/index.js

@@ -30,7 +30,7 @@ export * from './table';
 export * from './utils'; // export * from './sidebar';
 
 export * from './step';
-var version = '1.2.33';
+var version = '1.2.34';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
 ProStep, hooks, nocode, templates, utils };

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.values));
+    var f = JSON.stringify(getValidValues(fullscreenDataFilterForm.values));
+
+    if (n === f) {
+      // 关闭全屏后，表单值未变化，开启普通表单onFilter
+      filterEnableRef.current.normal = true;
+    } else {
+      // 关闭全屏后，表单值有变化，修改表单值
+      normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.setValues(fullscreenDataFilterForm.values);
+    } // 关闭全屏后，关闭全屏表单onFilter
+
+
+    filterEnableRef.current.fullscreen = false;
   }; // 全屏开启之后
 
 
   var afterOpen = function afterOpen() {
-    fullscreenDataFilterForm.setValues(normalDataFilterForm.values);
+    // 判断全屏前后筛选表单值是否有改变
+    var n = JSON.stringify(getValidValues(normalDataFilterForm.values));
+    var f = JSON.stringify(getValidValues(fullscreenDataFilterForm.values));
+
+    if (n === f) {
+      // 全屏后，表单值未变化，开启全屏表单onFilter
+      filterEnableRef.current.fullscreen = true;
+    } else {
+      // 全屏后，表单值变化，修改表单值
+      fullscreenDataFilterForm === null || fullscreenDataFilterForm === void 0 ? void 0 : fullscreenDataFilterForm.setValues(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

@@ -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,
@@ -287,9 +287,14 @@ 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;
@@ -505,12 +510,12 @@ var ProTable = function ProTable(props) {
       _request(params);
     },
     reset: function reset() {
-      var _actionRef$current4, _actionRef$current4$s, _dataFilterForm;
+      var _actionRef$current4, _actionRef$current4$s;
 
       (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();
+      dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.reset();
       setCurrentPage(1);
 
       _request(_defineProperty({}, targetPageKey, 1));
@@ -535,6 +540,7 @@ var ProTable = function ProTable(props) {
     dataFilterForm: dataFilterForm,
     normalDataFilterForm: normalDataFilterForm,
     fullscreenDataFilterForm: fullscreenDataFilterForm,
+    filterEnableRef: filterEnableRef,
     resetTableMaxBodyHeight: function resetTableMaxBodyHeight() {
       getHeaderHeight().then(function (height) {
         setHeaderHeight(height);
@@ -623,8 +629,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 _actionRef$current$ge, _actionRef$current5, _actionRef$current5$g, _objectSpread2;
 
     // 如果没有传 url 且没有 customRequest，直接返回
     if (!url && !customRequest) {
@@ -637,7 +643,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 : dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.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 +694,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 +725,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);
@@ -740,24 +739,40 @@ var ProTable = function ProTable(props) {
   var dataFilter = _objectSpread(_objectSpread({
     mode: 'inline'
   }, 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) {
       (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();
+      dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.reset();
       setCurrentPage(1);
 
-      _request(_defineProperty({}, targetPageKey, 1));
+      _request(_defineProperty({}, targetPageKey, 1), false, values);
     }
   });