@teamix/pro 1.2.33 → 1.2.34

package/es/table/typing.d.ts

@@ -192,6 +192,7 @@ export declare type ProTableActionType = {
     dataFilterForm?: FormType;
     normalDataFilterForm?: FormType;
     fullscreenDataFilterForm?: FormType;
+    filterEnableRef?: any;
     /** 表格当前的数据 */
     data?: any[];
 } & ProTableActionTypeMutations;

package/es/table/utils/columnRender.js

@@ -223,7 +223,7 @@ var processRenderFunction = function processRenderFunction() {
   var index = arguments.length > 2 ? arguments[2] : undefined;
   var record = arguments.length > 3 ? arguments[3] : undefined;
   // 当 ProField render 类型为 function 时。需要表格预先处理以塞入 record
-  var external = ['linkOnClick', 'link', 'value', 'renderEdit', 'descriptionRenderEdit', 'editPopConfirmProps', 'descriptionEditPopConfirmProps', 'editOnClick', 'descriptionEditOnClick'];
+  var external = ['linkOnClick', 'link', 'value', 'renderEdit', 'descriptionRenderEdit', 'editPopConfirmProps', 'descriptionEditPopConfirmProps', 'editOnClick', 'descriptionEditOnClick', 'extra', 'prefixExtra'];
   return Object.fromEntries(Object.entries(render).map(function (_ref3) {
     var _ref4 = _slicedToArray(_ref3, 2),
         k = _ref4[0],

package/lib/form/Filter/index.js

@@ -108,10 +108,14 @@ var QueryFilter = /*#__PURE__*/(0, _react.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) {
@@ -120,14 +124,25 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
 
     if (form.mounted) {
       if (loadingField.length === 0 && !form.loading) {
-        var onInitResult = onInit && onInit((0, _reactive.toJS)(form.values));
+        // 仅执行一次onInit
+        _onFormInit = function onFormInit() {};
+
+        var onInitResult = onInit === null || onInit === void 0 ? void 0 : onInit((0, _reactive.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
@@ -208,6 +223,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
 
   var filterItem = (0, _react.useRef)([]);
   var currentForm = (0, _react.useRef)(mode === 'panel' ? advancedFilterVisible ? 'advanced' : 'light' : 'simple');
+  var filterEnable = (0, _react.useRef)(false);
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form-query-filter'
   }); // 设置筛选数据
@@ -273,7 +289,22 @@ var QueryFilter = /*#__PURE__*/(0, _react.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((0, _utils.getValidValues)(filterEnable.current));
+    var changeValues = JSON.stringify((0, _utils.getValidValues)(values));
+
+    if (filterEnable.current === true) {
+      return true;
+    } else if (initialValues === changeValues) {
+      filterEnable.current = true;
+      return false;
+    }
+
+    return false;
+  }; // 简单搜索Filter
+
 
   var onSimpleFilter = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
@@ -281,23 +312,31 @@ var QueryFilter = /*#__PURE__*/(0, _react.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();
           }
@@ -308,7 +347,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     return function (_x) {
       return _ref4.apply(this, arguments);
     };
-  }(), [onFilter, currentForm.current, hasRequired]); // 轻量搜索Filter
+  }(), [onFilter, currentForm.current, hasRequired, enableFilter]); // 轻量搜索Filter
 
   var onLightFilter = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
@@ -316,21 +355,29 @@ var QueryFilter = /*#__PURE__*/(0, _react.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();
           }
@@ -341,18 +388,28 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     return function (_x2) {
       return _ref5.apply(this, arguments);
     };
-  }(), [onFilter, currentForm.current]); // 高级搜索Filter
+  }(), [onFilter, currentForm.current, enableFilter]); // 高级搜索Filter
 
   var onAdvancedFilter = (0, _react.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 = (0, _react.useCallback)(function (values) {
+    if (!enableFilter(values)) {
+      return;
+    }
+  }, [enableFilter]); // 高级搜索Reset
 
   var onAdvancedReset = (0, _react.useCallback)(function () {
     setCurrentForm('advanced');
-    onReset && onReset((0, _reactive.toJS)(advancedForm.values));
+    onReset === null || onReset === void 0 ? void 0 : onReset((0, _reactive.toJS)(advancedForm.values));
     configFilterItem(advancedForm);
     lightForm.reset();
   }, [onReset]); // 关闭标签清空表单字段值
@@ -368,11 +425,10 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     advancedForm.setValuesIn(key, newValue);
     configFilterItem(advancedForm);
     configTag();
-    onFilter && onFilter((0, _reactive.toJS)(advancedForm.values));
-  }, []); // 异步默认值回调，设置form的loading状态为false
+    onFilter === null || onFilter === void 0 ? void 0 : onFilter((0, _reactive.toJS)(advancedForm.values));
+  }, []); // initialValues和initialRequest的回调
 
-  var onInitialRequestComplete = (0, _react.useCallback)(function (_, __, _ref6) {
-    var form = _ref6.form;
+  var onInitialComplete = (0, _react.useCallback)(function (form) {
     form.setState({
       loading: false
     });
@@ -398,22 +454,22 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     }, /*#__PURE__*/_react.default.createElement(_SimpleFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
       form: simpleForm,
       onChange: (0, _lodash.default)(onSimpleFilter, filterDebounce),
-      onSubmit: onSimpleFilter
+      onSubmit: onSimpleFilter,
+      onInitialComplete: onInitialComplete
     }))),
     panelContent: mode === 'panel' ? /*#__PURE__*/_react.default.createElement(_AdvancedFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
-      initialRequest: otherProps.initialRequest ? _objectSpread(_objectSpread({}, otherProps.initialRequest), {}, {
-        onComplete: onInitialRequestComplete
-      }) : undefined,
       form: advancedForm,
+      onChange: (0, _lodash.default)(onAdvancedChange, filterDebounce),
       onSubmit: onAdvancedFilter,
-      onReset: onAdvancedReset
+      onReset: onAdvancedReset,
+      onInitialComplete: onInitialComplete
     })) : null
-  }, mode === 'panel' && !advancedFilterVisible ? /*#__PURE__*/_react.default.createElement(_components.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.default.createElement(_components.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.default.createElement(_components.Tag.Closeable, {
       key: (0, _utils.isNum)(index) ? key + label : key,
       afterClose: function afterClose() {

package/lib/form/ProForm/index.js

@@ -31,7 +31,7 @@ var _validate = _interopRequireDefault(require("../locales/validate"));
 
 require("./index.scss");
 
-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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -68,6 +68,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       onChange = _ref.onChange,
       onSubmit = _ref.onSubmit,
       onSubmitFailed = _ref.onSubmitFailed,
+      onInitialComplete = _ref.onInitialComplete,
       className = _ref.className,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
@@ -118,13 +119,12 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   (0, _react.useEffect)(function () {
     if (initialValues) {
       form.setInitialValues(initialValues);
+      onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
     } else if (initialRequest) {
       (0, _useInitialRequest.default)(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/lib/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/lib/form/SchemaForm/initializeRequest.js

@@ -5,15 +5,51 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _utils = require("@teamix/utils");
+
+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; }
+
 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 ((0, _utils.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/lib/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/lib/form/SchemaForm/reactions.js

@@ -14,10 +14,17 @@ 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; }
 
 // 配置请求
-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 = (0, _utils.isPlainObj)(refresh) ? refresh : {};
@@ -36,9 +43,9 @@ var $request = function $request(field, requestConfig, context) {
 
 exports.$request = $request;
 
-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);
     });
   };
@@ -50,7 +57,7 @@ exports.$common = $common;
 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);
     });
   };
@@ -65,7 +72,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 = (0, _utils.getValueByValue)(res, field.value);
       var clearValue = isValueInDataSource ? {} : {
         value: undefined

package/lib/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/lib/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/lib/index.js

@@ -285,5 +285,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.2.33';
+var version = '1.2.34';
 exports.version = version;

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

@@ -25,7 +25,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') {
@@ -44,12 +45,38 @@ 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((0, _utils.getValidValues)(normalDataFilterForm.values));
+    var f = JSON.stringify((0, _utils.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((0, _utils.getValidValues)(normalDataFilterForm.values));
+    var f = JSON.stringify((0, _utils.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; // 消息提示
 
     _components.Message.show({
       type: 'notice',