@teamix/pro 1.5.39 → 1.5.40

package/es/index.d.ts

@@ -30,5 +30,5 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-declare const version = "1.5.39";
+declare const version = "1.5.40";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };

package/es/index.js

@@ -37,7 +37,7 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-var version = '1.5.39';
+var version = '1.5.40';
 // By TeamixTest
 window.postMessage({
   source: 'teamix-test-devtools',

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

@@ -130,7 +130,7 @@ var Layout = function Layout(props) {
     }
   }, [
   //todo: 重复render 问题都在这里
-  dataFilter, mainAction, dataFilterFormRef, afterDataFilter, rowSelection]);
+  dataFilter, mainAction, dataFilterFormRef, afterDataFilter, rowSelection, actionRef]);
   // 区域组合渲染
   var renderLayout = function renderLayout() {
     if (header && mainAction) {

package/es/table/components/ToolBar/FilterColumnIcon.js

@@ -108,7 +108,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   });
   useEffect(function () {
     var _actionRef$current2;
-    setNewColumns(processColumns(columns, (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : _actionRef$current2.filterColumns));
+    setNewColumns(processColumns(newColumns, (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : _actionRef$current2.filterColumns));
   }, [columns, (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : _actionRef$current3.filterColumns]);
   // 全选
   var onChangeAllColumns = function onChangeAllColumns(check) {

package/es/table/components/ToolBar/index.js

@@ -51,6 +51,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 = useRef(null);
@@ -125,7 +126,7 @@ var ToolBar = function ToolBar(props) {
       }
     }
     return result;
-  }, [toolBar]);
+  }, [toolBar, actionRef.current]);
   var renderFlatShape = useMemo(function () {
     return /*#__PURE__*/React.createElement("div", {
       className: cls('content')

package/es/table/index.js

@@ -545,7 +545,7 @@ var ProTable = function ProTable(props) {
     }
   });
   // 绑定 Actions
-  actionRef.current = useActionType(actionRef, {
+  useActionType(actionRef, {
     fullScreen: function fullScreen() {
       var _actionRef$current2, _actionRef$current2$s;
       var state = !fullscreenState;
@@ -585,7 +585,8 @@ var ProTable = function ProTable(props) {
         _request(_objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)), undefined, undefined, true);
         setShowSkeleton(true);
       } else {
-        _request(params);
+        var _objectSpread3;
+        _request(_objectSpread(_objectSpread({}, params), {}, (_objectSpread3 = {}, _defineProperty(_objectSpread3, targetPageKey, currentPage), _defineProperty(_objectSpread3, targetPageSizeKey, pageSize), _objectSpread3)));
       }
     },
     request: function request(params) {
@@ -815,7 +816,7 @@ var ProTable = function ProTable(props) {
   });
   // 请求函数
   var _request = useCallback(function (params, noLoading, filterParams, isReset) {
-    var _dataFilterFormRef$cu2, _actionRef$current$ge, _actionRef$current6, _actionRef$current6$g, _actionRef$current7, _actionRef$current7$p, _actionRef$current8, _actionRef$current8$p, _objectSpread3;
+    var _dataFilterFormRef$cu2, _actionRef$current$ge, _actionRef$current6, _actionRef$current6$g, _objectSpread4;
     // 首次渲染表格，获取 urlState 上的 表头 filter 数据
     if (bindUrl && (bindUrlProps === null || bindUrlProps === void 0 ? void 0 : bindUrlProps.headerFilters) !== false && dataRef.current.flag) {
       getUrlStateFilter(urlState !== null && urlState !== void 0 ? urlState : {}, actionRef);
@@ -836,7 +837,7 @@ var ProTable = function ProTable(props) {
     var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$g = _actionRef$current6.getFilterRules) === null || _actionRef$current6$g === void 0 ? void 0 : _actionRef$current6$g.call(_actionRef$current6)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {};
     // 格式化后的请求参数
     var requestData = {};
-    var preParams = _objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams), {}, (_objectSpread3 = {}, _defineProperty(_objectSpread3, targetPageKey, (actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$p = _actionRef$current7.pageInfo) === null || _actionRef$current7$p === void 0 ? void 0 : _actionRef$current7$p.current) || currentPage), _defineProperty(_objectSpread3, targetPageSizeKey, (actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$p = _actionRef$current8.pageInfo) === null || _actionRef$current8$p === void 0 ? void 0 : _actionRef$current8$p.pageSize) || pageSize), _objectSpread3))), params);
+    var preParams = _objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams), {}, (_objectSpread4 = {}, _defineProperty(_objectSpread4, targetPageKey, currentPage), _defineProperty(_objectSpread4, targetPageSizeKey, pageSize), _objectSpread4))), params);
     if (typeof formatParams === 'string') {
       requestData = getTargetValue(formatParams, {
         params: preParams
@@ -949,7 +950,7 @@ var ProTable = function ProTable(props) {
         return true;
       } : undefined,
       onFilter: function onFilter(values) {
-        var _actionRef$current9, _actionRef$current9$c, _request8;
+        var _actionRef$current7, _actionRef$current7$c, _request8;
         // 全屏状态，判断全屏表单onFilter是否禁用
         if (fullscreenState && !filterEnableRef.current.fullscreen) {
           filterEnableRef.current.fullscreen = true;
@@ -968,7 +969,7 @@ var ProTable = function ProTable(props) {
           }
         }
         // 搜索变化时，暂时先清空选择
-        (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$c = _actionRef$current9.clearRowSelection) === null || _actionRef$current9$c === void 0 ? void 0 : _actionRef$current9$c.call(_actionRef$current9);
+        (_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(1);
         _request((_request8 = {}, _defineProperty(_request8, targetPageKey, 1), _defineProperty(_request8, targetPageSizeKey, pageSize), _request8), false, values);
       },
@@ -1007,9 +1008,9 @@ var ProTable = function ProTable(props) {
         mainAction: mainAction,
         extra: extra,
         toolBar: toolBar,
-        actionRef: {
+        actionRef: _objectSpread(_objectSpread({}, actionRef), {}, {
           current: actionRef.current
-        },
+        }),
         columns: propsColumns,
         dataFilter: dataFilter,
         afterDataFilter: afterDataFilter,
@@ -1092,22 +1093,22 @@ var ProTable = function ProTable(props) {
     } else return footerAction;
   };
   var onChangePagination = useCallback(function (currentPage) {
-    var _objectSpread4;
+    var _objectSpread5;
     var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     // 翻页默认清空选择
     if (!reserveSelectedRecords) {
-      var _actionRef$current10, _actionRef$current10$;
-      (_actionRef$current10 = actionRef.current) === null || _actionRef$current10 === void 0 ? void 0 : (_actionRef$current10$ = _actionRef$current10.clearRowSelection) === null || _actionRef$current10$ === void 0 ? void 0 : _actionRef$current10$.call(_actionRef$current10);
+      var _actionRef$current8, _actionRef$current8$c;
+      (_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);
     }
     setCurrentPage(currentPage);
-    _request(_objectSpread((_objectSpread4 = {}, _defineProperty(_objectSpread4, targetPageKey, currentPage), _defineProperty(_objectSpread4, "pageSize", pageSize), _objectSpread4), params));
+    _request(_objectSpread((_objectSpread5 = {}, _defineProperty(_objectSpread5, targetPageKey, currentPage), _defineProperty(_objectSpread5, "pageSize", pageSize), _objectSpread5), params));
   }, [reserveSelectedRecords, targetPageKey, actionRef, pageSize]);
   var onChangePaginationSize = useCallback(function (currentPageSize) {
     var _request10;
     // 翻页默认清空选择
     if (!reserveSelectedRecords) {
-      var _actionRef$current11, _actionRef$current11$;
-      (_actionRef$current11 = actionRef.current) === null || _actionRef$current11 === void 0 ? void 0 : (_actionRef$current11$ = _actionRef$current11.clearRowSelection) === null || _actionRef$current11$ === void 0 ? void 0 : _actionRef$current11$.call(_actionRef$current11);
+      var _actionRef$current9, _actionRef$current9$c;
+      (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$c = _actionRef$current9.clearRowSelection) === null || _actionRef$current9$c === void 0 ? void 0 : _actionRef$current9$c.call(_actionRef$current9);
     }
     setPageSize(currentPageSize);
     setCurrentPage(1);

package/lib/index.d.ts

@@ -30,5 +30,5 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-declare const version = "1.5.39";
+declare const version = "1.5.40";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -299,7 +299,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMIXPRO_WITHOUT_ICON)) {
   _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 }
-var version = '1.5.39';
+var version = '1.5.40';
 // By TeamixTest
 exports.version = version;
 window.postMessage({

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

@@ -139,7 +139,7 @@ var Layout = function Layout(props) {
     }
   }, [
   //todo: 重复render 问题都在这里
-  dataFilter, mainAction, dataFilterFormRef, afterDataFilter, rowSelection]);
+  dataFilter, mainAction, dataFilterFormRef, afterDataFilter, rowSelection, actionRef]);
   // 区域组合渲染
   var renderLayout = function renderLayout() {
     if (header && mainAction) {

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

@@ -115,7 +115,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   });
   (0, _react.useEffect)(function () {
     var _actionRef$current2;
-    setNewColumns(processColumns(columns, (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : _actionRef$current2.filterColumns));
+    setNewColumns(processColumns(newColumns, (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : _actionRef$current2.filterColumns));
   }, [columns, (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : _actionRef$current3.filterColumns]);
   // 全选
   var onChangeAllColumns = function onChangeAllColumns(check) {

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

@@ -61,6 +61,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.useRef)(null);
@@ -135,7 +136,7 @@ var ToolBar = function ToolBar(props) {
       }
     }
     return result;
-  }, [toolBar]);
+  }, [toolBar, actionRef.current]);
   var renderFlatShape = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: cls('content')

package/lib/table/index.js

@@ -566,7 +566,7 @@ var ProTable = function ProTable(props) {
     }
   });
   // 绑定 Actions
-  actionRef.current = (0, _utils2.useActionType)(actionRef, {
+  (0, _utils2.useActionType)(actionRef, {
     fullScreen: function fullScreen() {
       var _actionRef$current2, _actionRef$current2$s;
       var state = !fullscreenState;
@@ -606,7 +606,8 @@ var ProTable = function ProTable(props) {
         _request(_objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)), undefined, undefined, true);
         setShowSkeleton(true);
       } else {
-        _request(params);
+        var _objectSpread3;
+        _request(_objectSpread(_objectSpread({}, params), {}, (_objectSpread3 = {}, _defineProperty(_objectSpread3, targetPageKey, currentPage), _defineProperty(_objectSpread3, targetPageSizeKey, pageSize), _objectSpread3)));
       }
     },
     request: function request(params) {
@@ -836,7 +837,7 @@ var ProTable = function ProTable(props) {
   });
   // 请求函数
   var _request = (0, _react.useCallback)(function (params, noLoading, filterParams, isReset) {
-    var _dataFilterFormRef$cu2, _actionRef$current$ge, _actionRef$current6, _actionRef$current6$g, _actionRef$current7, _actionRef$current7$p, _actionRef$current8, _actionRef$current8$p, _objectSpread3;
+    var _dataFilterFormRef$cu2, _actionRef$current$ge, _actionRef$current6, _actionRef$current6$g, _objectSpread4;
     // 首次渲染表格，获取 urlState 上的 表头 filter 数据
     if (bindUrl && (bindUrlProps === null || bindUrlProps === void 0 ? void 0 : bindUrlProps.headerFilters) !== false && dataRef.current.flag) {
       (0, _util.getUrlStateFilter)(urlState !== null && urlState !== void 0 ? urlState : {}, actionRef);
@@ -857,7 +858,7 @@ var ProTable = function ProTable(props) {
     var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$g = _actionRef$current6.getFilterRules) === null || _actionRef$current6$g === void 0 ? void 0 : _actionRef$current6$g.call(_actionRef$current6)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {};
     // 格式化后的请求参数
     var requestData = {};
-    var preParams = _objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams), {}, (_objectSpread3 = {}, _defineProperty(_objectSpread3, targetPageKey, (actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$p = _actionRef$current7.pageInfo) === null || _actionRef$current7$p === void 0 ? void 0 : _actionRef$current7$p.current) || currentPage), _defineProperty(_objectSpread3, targetPageSizeKey, (actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$p = _actionRef$current8.pageInfo) === null || _actionRef$current8$p === void 0 ? void 0 : _actionRef$current8$p.pageSize) || pageSize), _objectSpread3))), params);
+    var preParams = _objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams), {}, (_objectSpread4 = {}, _defineProperty(_objectSpread4, targetPageKey, currentPage), _defineProperty(_objectSpread4, targetPageSizeKey, pageSize), _objectSpread4))), params);
     if (typeof formatParams === 'string') {
       requestData = (0, _utils.getTargetValue)(formatParams, {
         params: preParams
@@ -970,7 +971,7 @@ var ProTable = function ProTable(props) {
         return true;
       } : undefined,
       onFilter: function onFilter(values) {
-        var _actionRef$current9, _actionRef$current9$c, _request8;
+        var _actionRef$current7, _actionRef$current7$c, _request8;
         // 全屏状态，判断全屏表单onFilter是否禁用
         if (fullscreenState && !filterEnableRef.current.fullscreen) {
           filterEnableRef.current.fullscreen = true;
@@ -989,7 +990,7 @@ var ProTable = function ProTable(props) {
           }
         }
         // 搜索变化时，暂时先清空选择
-        (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$c = _actionRef$current9.clearRowSelection) === null || _actionRef$current9$c === void 0 ? void 0 : _actionRef$current9$c.call(_actionRef$current9);
+        (_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(1);
         _request((_request8 = {}, _defineProperty(_request8, targetPageKey, 1), _defineProperty(_request8, targetPageSizeKey, pageSize), _request8), false, values);
       },
@@ -1028,9 +1029,9 @@ var ProTable = function ProTable(props) {
         mainAction: mainAction,
         extra: extra,
         toolBar: toolBar,
-        actionRef: {
+        actionRef: _objectSpread(_objectSpread({}, actionRef), {}, {
           current: actionRef.current
-        },
+        }),
         columns: propsColumns,
         dataFilter: dataFilter,
         afterDataFilter: afterDataFilter,
@@ -1113,22 +1114,22 @@ var ProTable = function ProTable(props) {
     } else return footerAction;
   };
   var onChangePagination = (0, _react.useCallback)(function (currentPage) {
-    var _objectSpread4;
+    var _objectSpread5;
     var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     // 翻页默认清空选择
     if (!reserveSelectedRecords) {
-      var _actionRef$current10, _actionRef$current10$;
-      (_actionRef$current10 = actionRef.current) === null || _actionRef$current10 === void 0 ? void 0 : (_actionRef$current10$ = _actionRef$current10.clearRowSelection) === null || _actionRef$current10$ === void 0 ? void 0 : _actionRef$current10$.call(_actionRef$current10);
+      var _actionRef$current8, _actionRef$current8$c;
+      (_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);
     }
     setCurrentPage(currentPage);
-    _request(_objectSpread((_objectSpread4 = {}, _defineProperty(_objectSpread4, targetPageKey, currentPage), _defineProperty(_objectSpread4, "pageSize", pageSize), _objectSpread4), params));
+    _request(_objectSpread((_objectSpread5 = {}, _defineProperty(_objectSpread5, targetPageKey, currentPage), _defineProperty(_objectSpread5, "pageSize", pageSize), _objectSpread5), params));
   }, [reserveSelectedRecords, targetPageKey, actionRef, pageSize]);
   var onChangePaginationSize = (0, _react.useCallback)(function (currentPageSize) {
     var _request10;
     // 翻页默认清空选择
     if (!reserveSelectedRecords) {
-      var _actionRef$current11, _actionRef$current11$;
-      (_actionRef$current11 = actionRef.current) === null || _actionRef$current11 === void 0 ? void 0 : (_actionRef$current11$ = _actionRef$current11.clearRowSelection) === null || _actionRef$current11$ === void 0 ? void 0 : _actionRef$current11$.call(_actionRef$current11);
+      var _actionRef$current9, _actionRef$current9$c;
+      (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$c = _actionRef$current9.clearRowSelection) === null || _actionRef$current9$c === void 0 ? void 0 : _actionRef$current9$c.call(_actionRef$current9);
     }
     setPageSize(currentPageSize);
     setCurrentPage(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.5.39",
+  "version": "1.5.40",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",