@teamix/pro 1.5.39 → 1.5.40

package/dist/pro.js

@@ -82596,6 +82596,9 @@ var MenuSelect = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().forwa
     }
     if (value.length === allKey.length) {
       setCheckboxChecked(true);
+    } else {
+      //对于异步请求的数据,dataSource变化时需要重新判断
+      setCheckboxChecked(false);
     }
   }, [value, dataSource]);
   // 获取瀑布流列数
@@ -112962,7 +112965,7 @@ if (!((_window = window) != null && _window.TEAMIXPRO_WITHOUT_ICON)) {
 
 
 
-var version = '1.5.39';
+var version = '1.5.40';
 
 // By TeamixTest
 window.postMessage({
@@ -118487,7 +118490,7 @@ var Layout = function Layout(props) {
   // todo: 有问题
   mainAction,
   // todo: 有问题
-  dataFilterFormRef, afterDataFilter, rowSelection]);
+  dataFilterFormRef, afterDataFilter, rowSelection, actionRef]);
 
   // 区域组合渲染
   var renderLayout = function renderLayout() {
@@ -119285,7 +119288,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   });
   (0,react__WEBPACK_IMPORTED_MODULE_3__.useEffect)(function () {
     var _actionRef$current2;
-    setNewColumns(processColumns(columns, (_actionRef$current2 = actionRef.current) == null ? void 0 : _actionRef$current2.filterColumns));
+    setNewColumns(processColumns(newColumns, (_actionRef$current2 = actionRef.current) == null ? void 0 : _actionRef$current2.filterColumns));
   }, [columns, (_actionRef$current3 = actionRef.current) == null ? void 0 : _actionRef$current3.filterColumns]);
 
   // 全选
@@ -119985,6 +119988,7 @@ var ToolBar = function ToolBar(props) {
   var toolBar = props.toolBar,
     fullScreenState = props.fullScreenState,
     switchCardView = props.switchCardView,
+    actionRef = props.actionRef,
     _props$toolBarAutoWid = props.toolBarAutoWidth,
     toolBarAutoWidth = _props$toolBarAutoWid === void 0 ? true : _props$toolBarAutoWid;
   var toolBarRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)(null);
@@ -120060,7 +120064,7 @@ var ToolBar = function ToolBar(props) {
       }
     }
     return result;
-  }, [toolBar]);
+  }, [toolBar, actionRef.current]);
   var renderFlatShape = (0,react__WEBPACK_IMPORTED_MODULE_1__.useMemo)(function () {
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("div", {
       className: cls('content')
@@ -120689,7 +120693,7 @@ var ProTable = function ProTable(props) {
   });
 
   // 绑定 Actions
-  actionRef.current = (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .useActionType */ .tx)(actionRef, {
+  (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .useActionType */ .tx)(actionRef, {
     fullScreen: function fullScreen() {
       var _actionRef$current2;
       var state = !fullscreenState;
@@ -120732,7 +120736,8 @@ var ProTable = function ProTable(props) {
         _request(_extends({}, params, (_extends2 = {}, _extends2[targetPageKey] = 1, _extends2)), undefined, undefined, true);
         setShowSkeleton(true);
       } else {
-        _request(params);
+        var _extends3;
+        _request(_extends({}, params, (_extends3 = {}, _extends3[targetPageKey] = currentPage, _extends3[targetPageSizeKey] = pageSize, _extends3)));
       }
     },
     request: function request(params) {
@@ -120969,7 +120974,7 @@ var ProTable = function ProTable(props) {
 
   // 请求函数
   var _request = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (params, noLoading, filterParams, isReset) {
-    var _dataFilterFormRef$cu2, _actionRef$current$ge, _actionRef$current6, _actionRef$current7, _actionRef$current7$p, _actionRef$current8, _actionRef$current8$p, _extends3;
+    var _dataFilterFormRef$cu2, _actionRef$current$ge, _actionRef$current6, _extends4;
     // 首次渲染表格，获取 urlState 上的 表头 filter 数据
     if (bindUrl && (bindUrlProps == null ? void 0 : bindUrlProps.headerFilters) !== false && dataRef.current.flag) {
       (0,_utils_util__WEBPACK_IMPORTED_MODULE_18__/* .getUrlStateFilter */ .a)(urlState != null ? urlState : {}, actionRef);
@@ -120992,7 +120997,7 @@ var ProTable = function ProTable(props) {
 
     // 格式化后的请求参数
     var requestData = {};
-    var preParams = _extends({}, !showPagination ? _extends({}, dataFilterParams, propsParams, sortParams, columnsFilterParams) : _extends({}, dataFilterParams, propsParams, sortParams, columnsFilterParams, (_extends3 = {}, _extends3[targetPageKey] = (actionRef == null ? void 0 : (_actionRef$current7 = actionRef.current) == null ? void 0 : (_actionRef$current7$p = _actionRef$current7.pageInfo) == null ? void 0 : _actionRef$current7$p.current) || currentPage, _extends3[targetPageSizeKey] = (actionRef == null ? void 0 : (_actionRef$current8 = actionRef.current) == null ? void 0 : (_actionRef$current8$p = _actionRef$current8.pageInfo) == null ? void 0 : _actionRef$current8$p.pageSize) || pageSize, _extends3)), params);
+    var preParams = _extends({}, !showPagination ? _extends({}, dataFilterParams, propsParams, sortParams, columnsFilterParams) : _extends({}, dataFilterParams, propsParams, sortParams, columnsFilterParams, (_extends4 = {}, _extends4[targetPageKey] = currentPage, _extends4[targetPageSizeKey] = pageSize, _extends4)), params);
     if (typeof formatParams === 'string') {
       requestData = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getTargetValue)(formatParams, {
         params: preParams
@@ -121110,7 +121115,7 @@ var ProTable = function ProTable(props) {
         return true;
       } : undefined,
       onFilter: function onFilter(values) {
-        var _actionRef$current9, _request8;
+        var _actionRef$current7, _request8;
         // 全屏状态，判断全屏表单onFilter是否禁用
         if (fullscreenState && !filterEnableRef.current.fullscreen) {
           filterEnableRef.current.fullscreen = true;
@@ -121129,7 +121134,7 @@ var ProTable = function ProTable(props) {
           }
         }
         // 搜索变化时，暂时先清空选择
-        (_actionRef$current9 = actionRef.current) == null ? void 0 : _actionRef$current9.clearRowSelection == null ? void 0 : _actionRef$current9.clearRowSelection();
+        (_actionRef$current7 = actionRef.current) == null ? void 0 : _actionRef$current7.clearRowSelection == null ? void 0 : _actionRef$current7.clearRowSelection();
         setCurrentPage(1);
         _request((_request8 = {}, _request8[targetPageKey] = 1, _request8[targetPageSizeKey] = pageSize, _request8), false, values);
       },
@@ -121168,9 +121173,9 @@ var ProTable = function ProTable(props) {
         mainAction: mainAction,
         extra: extra,
         toolBar: toolBar,
-        actionRef: {
+        actionRef: _extends({}, actionRef, {
           current: actionRef.current
-        },
+        }),
         columns: propsColumns,
         dataFilter: dataFilter,
         afterDataFilter: afterDataFilter,
@@ -121254,24 +121259,24 @@ var ProTable = function ProTable(props) {
     } else return footerAction;
   };
   var onChangePagination = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (currentPage, params) {
-    var _extends4;
+    var _extends5;
     if (params === void 0) {
       params = {};
     }
     // 翻页默认清空选择
     if (!reserveSelectedRecords) {
-      var _actionRef$current10;
-      (_actionRef$current10 = actionRef.current) == null ? void 0 : _actionRef$current10.clearRowSelection == null ? void 0 : _actionRef$current10.clearRowSelection();
+      var _actionRef$current8;
+      (_actionRef$current8 = actionRef.current) == null ? void 0 : _actionRef$current8.clearRowSelection == null ? void 0 : _actionRef$current8.clearRowSelection();
     }
     setCurrentPage(currentPage);
-    _request(_extends((_extends4 = {}, _extends4[targetPageKey] = currentPage, _extends4.pageSize = pageSize, _extends4), params));
+    _request(_extends((_extends5 = {}, _extends5[targetPageKey] = currentPage, _extends5.pageSize = pageSize, _extends5), params));
   }, [reserveSelectedRecords, targetPageKey, actionRef, pageSize]);
   var onChangePaginationSize = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (currentPageSize) {
     var _request10;
     // 翻页默认清空选择
     if (!reserveSelectedRecords) {
-      var _actionRef$current11;
-      (_actionRef$current11 = actionRef.current) == null ? void 0 : _actionRef$current11.clearRowSelection == null ? void 0 : _actionRef$current11.clearRowSelection();
+      var _actionRef$current9;
+      (_actionRef$current9 = actionRef.current) == null ? void 0 : _actionRef$current9.clearRowSelection == null ? void 0 : _actionRef$current9.clearRowSelection();
     }
     setPageSize(currentPageSize);
     setCurrentPage(1);