@teamix/pro 1.2.33 → 1.2.34

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,9 +331,14 @@ 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;
@@ -549,12 +554,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));
@@ -579,6 +584,7 @@ var ProTable = function ProTable(props) {
     dataFilterForm: dataFilterForm,
     normalDataFilterForm: normalDataFilterForm,
     fullscreenDataFilterForm: fullscreenDataFilterForm,
+    filterEnableRef: filterEnableRef,
     resetTableMaxBodyHeight: function resetTableMaxBodyHeight() {
       getHeaderHeight().then(function (height) {
         setHeaderHeight(height);
@@ -667,8 +673,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) {
@@ -681,7 +687,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 : {}; // 格式化后的请求参数
 
@@ -732,31 +738,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 () {
@@ -770,7 +769,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);
@@ -784,24 +783,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);
     }
   });
 

package/lib/table/typing.d.ts

@@ -192,6 +192,7 @@ export declare type ProTableActionType = {
     dataFilterForm?: 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.33",
+  "version": "1.2.34",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",