@teamix/pro 1.2.31 → 1.2.35

package/lib/info/components/ProInfoItem/index.scss

@@ -17,6 +17,15 @@ $item-padding-bottom: 8px;
 .teamix-pro-field-info-form-item {
   width: 100%;
   padding-bottom: $item-padding-bottom;
+
+  &-header-row {
+    display: flex;
+    align-items: center;
+  }
+  &-base-row {
+    display: flex;
+    align-items: center;
+  }
 }
 
 .teamix-pro-field-info-form-item-label {

package/lib/info/components/baseInfo/index.js

@@ -92,7 +92,8 @@ var ProBaseInfo = function ProBaseInfo(props) {
           infoItem: item,
           record: dataSource !== null && dataSource !== void 0 ? dataSource : result,
           actionRef: actionRef,
-          context: context
+          context: context,
+          props: item.props
         }),
         baseInfoLayout: getFormItemLayout((_item$colSpan = item === null || item === void 0 ? void 0 : item.colSpan) !== null && _item$colSpan !== void 0 ? _item$colSpan : 0),
         tooltip: item.tooltip,

package/lib/info/components/headerInfo/index.js

@@ -68,7 +68,8 @@ var ProHeaderInfo = function ProHeaderInfo(props) {
           dataSource: item.dataSource,
           infoItem: item,
           record: dataSource !== null && dataSource !== void 0 ? dataSource : result,
-          actionRef: actionRef
+          actionRef: actionRef,
+          props: item.props
         }),
         headerInfoLayout: layout !== null && layout !== void 0 ? layout : defaultLayout,
         tooltip: item.tooltip,

package/lib/info/components/tableInfo/index.js

@@ -85,7 +85,8 @@ var ProTableInfo = function ProTableInfo(props) {
       dataSource: item.dataSource,
       infoItem: item,
       record: dataSource !== null && dataSource !== void 0 ? dataSource : result,
-      actionRef: actionRef
+      actionRef: actionRef,
+      props: item.props
     });
   };
 

package/lib/info/index.scss

@@ -1,4 +1,6 @@
+@import '../common.scss';
 .teamix-pro-info {
+  @include hybridcloud-scrollbar;
   color: var(--color-brand1-6);
 
   .teamix-pro-info-content-row {

package/lib/info/typing.d.ts

@@ -94,6 +94,8 @@ export interface ProInfoColumnsProps {
     actions?: ProActionButtonProps[];
     /** 追加在列后 */
     extra?: React.ReactNode;
+    /** 其他 ProField 配置 */
+    props?: any;
 }
 export declare type ProInfoActionType = {
     /** 刷新Info */
@@ -168,6 +170,7 @@ export declare type InfoValueItemProps = {
     render?: ProInfoCellRender;
     dataSource?: ProFieldDataSourceItem[] | ProInfoCellFunProp;
     context?: object;
+    props?: any;
 } & Omit<ProFieldProps, 'render' | 'dataSource'>;
 export declare type ProInfoHeaderProps = Omit<ProCardProps, 'loading'>;
 /** ProInfoGroupContextProps */

package/lib/page-header/index.js

@@ -88,8 +88,8 @@ 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)(color) : backgroundColor;
   var style = {
     color: styleColor,
     backgroundColor: styleBgColor

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

@@ -76,6 +76,19 @@ var Layout = function Layout(props) {
         context: _objectSpread(_objectSpread({}, defaultContext), mainAction.context)
       })));
     } else return mainAction;
+  }; // 渲染 addonAfter
+
+
+  var renderAddonAfter = function renderAddonAfter() {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: cls('addon-after-wrapper')
+    }, extra && !header && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
+      actionRef: actionRef,
+      quickAction: extra,
+      rowSelection: rowSelection
+    }), /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
+      actionRef: actionRef
+    }, otherProps)));
   }; // 渲染新版 QueryFilter
 
 
@@ -103,13 +116,7 @@ var Layout = function Layout(props) {
           },
           panelContent: dataFilter.content,
           addonBefore: renderMainAction(),
-          addonAfter: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, extra && !header && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
-            actionRef: actionRef,
-            quickAction: extra,
-            rowSelection: rowSelection
-          }), /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
-            actionRef: actionRef
-          }, otherProps)))
+          addonAfter: renderAddonAfter()
         }, dataFilter));
       } else if ((dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) >= 0) {
         return /*#__PURE__*/_react.default.createElement(_form.QueryFilter, _objectSpread({
@@ -128,27 +135,18 @@ var Layout = function Layout(props) {
             (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand) && (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand(expand));
           },
           addonBefore: renderMainAction(),
-          addonAfter: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, extra && !header && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
-            actionRef: actionRef,
-            quickAction: extra,
-            rowSelection: rowSelection
-          }), /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
-            actionRef: actionRef
-          }, otherProps)))
+          addonAfter: renderAddonAfter()
         }, dataFilter));
       }
     } else if (mainAction) {
       // 没传 dataFilter 但是传了 mainAction
       return /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
-        className: "mb8",
         addonBefore: renderMainAction(),
-        addonAfter: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, extra && !header && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
-          actionRef: actionRef,
-          quickAction: extra,
-          rowSelection: rowSelection
-        }), /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
-          actionRef: actionRef
-        }, otherProps)))
+        addonAfter: renderAddonAfter()
+      });
+    } else {
+      return /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
+        addonAfter: renderAddonAfter()
       });
     }
   }; // 区域组合渲染
@@ -168,11 +166,19 @@ var Layout = function Layout(props) {
         rowSelection: rowSelection
       }))), renderQueryFilter());
     } else if (header && !mainAction) {
+      var _dataFilter$schema3, _dataFilter$schema4;
+
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
         className: cls('wrapper')
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: cls('left')
-      }, header && /*#__PURE__*/_react.default.createElement(_utils.Header, _objectSpread({}, header)), renderQueryFilter())));
+      }, 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", {
+        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())));
     } else if (!header && mainAction) {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderQueryFilter());
     } else if (!header && !mainAction) {

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

@@ -37,4 +37,11 @@ $prefix: 'teamix-pro-table-layout';
     padding: 16px;
     background: var(--panel-filter-bg, var(--color-fill1-2));
   }
+  &-main-action {
+    margin-bottom: 8px;
+  }
+  &-addon-after-wrapper {
+    display: flex;
+    align-items: center;
+  }
 }

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

@@ -25,35 +25,58 @@ 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;
 
-  function closeByESC(e) {
+  var closeByESC = function closeByESC(e) {
     if (visible && e.code === 'Escape') {
-      var _actionRef$current2, _actionRef$current2$s, _actionRef$current3, _actionRef$current3$f;
+      var _actionRef$current2, _actionRef$current2$f;
 
-      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setFullScreenState) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, false);
-      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$f = _actionRef$current3.fullScreen) === null || _actionRef$current3$f === void 0 ? void 0 : _actionRef$current3$f.call(_actionRef$current3);
+      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$f = _actionRef$current2.fullScreen) === null || _actionRef$current2$f === void 0 ? void 0 : _actionRef$current2$f.call(_actionRef$current2);
     }
-  } // 监听esc按钮
+  }; // 监听esc按钮
 
 
   (0, _react.useEffect)(function () {
-    var _actionRef$current4, _actionRef$current4$s;
-
-    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setFullScreenState) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, visible);
     window.addEventListener('keydown', closeByESC);
     return function () {
       window.removeEventListener('keydown', closeByESC);
     };
-  }, [visible]);
+  }, [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',
@@ -84,9 +107,9 @@ var FullScreen = function FullScreen(props) {
       zIndex: 999
     },
     onRequestClose: function onRequestClose() {
-      var _actionRef$current5, _actionRef$current5$f;
+      var _actionRef$current3, _actionRef$current3$f;
 
-      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$f = _actionRef$current5.fullScreen) === null || _actionRef$current5$f === void 0 ? void 0 : _actionRef$current5$f.call(_actionRef$current5);
+      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$f = _actionRef$current3.fullScreen) === null || _actionRef$current3$f === void 0 ? void 0 : _actionRef$current3$f.call(_actionRef$current3);
     }
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "teamix-pro-table-full-screen"

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

@@ -1,6 +1,7 @@
 .teamix-pro-table-toolbar {
   width: 100%;
   text-align: right;
+  margin-bottom: 8px;
 }
 .teamix-pro-table-toolbar-custom {
   display: inline-block;

package/lib/table/index.js

@@ -165,7 +165,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,
@@ -331,16 +331,21 @@ var ProTable = function ProTable(props) {
   var _useState27 = (0, _react.useState)(false),
       _useState28 = _slicedToArray(_useState27, 2),
       fullscreenState = _useState28[0],
-      setFullscreenState = _useState28[1]; // 非全屏状态下的
+      setFullscreenState = _useState28[1]; // 切换全屏搜索开关
 
 
+  var filterEnableRef = (0, _react.useRef)({
+    fullscreen: false,
+    normal: true
+  }); // 非全屏状态下的
+
   var normalDataFilterFormRef = (0, _react.useRef)();
   var fullscreenDataFilterFormRef = (0, _react.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 = (0, _react.useState)(false),
       _useState30 = _slicedToArray(_useState29, 2),
@@ -507,21 +512,24 @@ var ProTable = function ProTable(props) {
 
   (0, _utils2.useActionType)(actionRef, {
     fullScreen: function fullScreen() {
+      var _actionRef$current2, _actionRef$current2$s;
+
       var state = !fullscreenState; // 全屏时需要重新计算header高度
 
       getHeaderHeight().then(function (height) {
         setHeaderHeight(height);
       });
       setFullscreenState(state);
+      actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setState) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, 'fullScreenState', state);
       return state;
     },
     setColumn: function setColumn(newColumns) {
-      var _actionRef$current2, _actionRef$current2$s;
+      var _actionRef$current3, _actionRef$current3$s;
 
       var update = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       var columns = processColumns(newColumns, propsColumns);
       setFilteredColumns(columns);
-      (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setState) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, 'filterColumns', columns);
+      (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$s = _actionRef$current3.setState) === null || _actionRef$current3$s === void 0 ? void 0 : _actionRef$current3$s.call(_actionRef$current3, 'filterColumns', columns);
 
       if (update) {
         (0, _utils2.emit)('refreshFilterState', newColumns);
@@ -546,12 +554,12 @@ var ProTable = function ProTable(props) {
       _request(params);
     },
     reset: function reset() {
-      var _actionRef$current3, _actionRef$current3$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$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$s = _actionRef$current3.setFilterRules) === null || _actionRef$current3$s === void 0 ? void 0 : _actionRef$current3$s.call(_actionRef$current3, {});
-      (_dataFilterForm = dataFilterForm) === null || _dataFilterForm === void 0 ? void 0 : _dataFilterForm.reset();
+      (_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, {});
+      (_dataFilterFormRef$cu = dataFilterFormRef.current) === null || _dataFilterFormRef$cu === void 0 ? void 0 : _dataFilterFormRef$cu.reset();
       setCurrentPage(1);
 
       _request(_defineProperty({}, targetPageKey, 1));
@@ -573,9 +581,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);
@@ -664,8 +674,8 @@ var ProTable = function ProTable(props) {
     }
   }); // 请求函数
 
-  function _request(params, noLoading) {
-    var _dataFilterForm2, _actionRef$current$ge, _actionRef$current4, _actionRef$current4$g, _objectSpread2;
+  function _request(params, noLoading, filterParams) {
+    var _dataFilterFormRef$cu2, _actionRef$current$ge, _actionRef$current5, _actionRef$current5$g, _objectSpread2;
 
     // 如果没有传 url 且没有 customRequest，直接返回
     if (!url && !customRequest) {
@@ -678,9 +688,9 @@ 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$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$g = _actionRef$current4.getFilterRules) === null || _actionRef$current4$g === void 0 ? void 0 : _actionRef$current4$g.call(_actionRef$current4)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {}; // 格式化后的请求参数
+    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 : {}; // 格式化后的请求参数
 
     var requestData = formatParams(_objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, targetPageKey, currentPage), _defineProperty(_objectSpread2, targetPageSizeKey, pageSize), _objectSpread2), dataFilterParams), propsParams), sortParams), columnsFilterParams)), params));
 
@@ -729,31 +739,24 @@ var ProTable = function ProTable(props) {
   }
 
   (0, _react.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)) {
-        // 在请求发送之前 处理漏斗默认数据
-        (0, _utils2.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) {
-        (0, _utils2.processDefaultFilter)(propsColumns, actionRef, defaultFilterParams);
+    if (requestWhenMount && !hasDataFilter) {
+      (0, _utils2.processDefaultFilter)(propsColumns, actionRef, defaultFilterParams);
 
-        _request();
-      }
+      _request();
     }
 
     return function () {
@@ -767,7 +770,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);
@@ -781,24 +784,44 @@ var ProTable = function ProTable(props) {
   var dataFilter = _objectSpread(_objectSpread({
     mode: 'inline'
   }, propsDataFilter), {}, {
+    onInit: function onInit(values) {
+      // 表单初始化请求处理
+      console.log('onInit');
+      (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$current5, _actionRef$current5$c;
+      var _actionRef$current6, _actionRef$current6$c;
+
+      console.log('onFilter'); // 全屏状态，判断全屏表单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$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$c = _actionRef$current5.clearRowSelection) === null || _actionRef$current5$c === void 0 ? void 0 : _actionRef$current5$c.call(_actionRef$current5);
+      (_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);
     }
   });
 
@@ -882,21 +905,21 @@ var ProTable = function ProTable(props) {
 
   var renderFooter = function renderFooter() {
     function onChangePagination(currentPage) {
-      var _actionRef$current6, _actionRef$current6$c;
+      var _actionRef$current7, _actionRef$current7$c;
 
       var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       // 翻页暂时先清空选择
-      (_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);
+      (_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$current7, _actionRef$current7$c, _request5;
+      var _actionRef$current8, _actionRef$current8$c, _request5;
 
       // 翻页暂时先清空选择
-      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$c = _actionRef$current7.clearRowSelection) === null || _actionRef$current7$c === void 0 ? void 0 : _actionRef$current7$c.call(_actionRef$current7);
+      (_actionRef$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/typing.d.ts

@@ -190,8 +190,11 @@ export declare type ProTableActionType = {
     resetPage?: () => void;
     /** 获取数据过滤区表单实例 */
     dataFilterForm?: FormType;
+    /** 用于在 mount 的时候获取到表单 ref */
+    dataFilterFormRef?: React.MutableRefObject<FormType>;
     normalDataFilterForm?: FormType;
     fullscreenDataFilterForm?: FormType;
+    filterEnableRef?: any;
     /** 表格当前的数据 */
     data?: any[];
 } & ProTableActionTypeMutations;

package/lib/table/utils/columnRender.js

@@ -239,7 +239,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.2.31",
+  "version": "1.2.35",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",