@teamix/pro 1.5.39 → 1.5.41

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.41';
 
 // By TeamixTest
 window.postMessage({
@@ -116552,7 +116555,7 @@ function renderTreeNode(data) {
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_0__.Tree.Node, _extends({
       key: item.value,
       label: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(ProSideBarTreeNode, labelProps)
-    }, nodeProps), item.children && item.children.length > 0 && renderTreeNode(item.children));
+    }, nodeProps), (item == null ? void 0 : item.children) && item.children.length > 0 && renderTreeNode(item.children));
   });
 }
 
@@ -116847,7 +116850,7 @@ var ProSidebarTree = function ProSidebarTree(props) {
     if (extra != null && (_extra$event = extra.event) != null && (_extra$event$target = _extra$event.target) != null && _extra$event$target.closest != null && _extra$event$target.closest('.teamix-pro-sidebar-delete-overlay')) {
       return;
     }
-    if (!selectedKeys) {
+    if (!selectedKeysProp) {
       setSelectedKeys(value);
     }
     onSelect == null ? void 0 : onSelect(value, extra);
@@ -116866,6 +116869,12 @@ var ProSidebarTree = function ProSidebarTree(props) {
     setExpandedKeys(key);
     setAutoExpandParent(false);
   };
+  var renderTreeNodeGroup = function renderTreeNodeGroup() {
+    if (onBeforeRenderNodeEvent) {
+      return (0,_tree_node__WEBPACK_IMPORTED_MODULE_3__/* .renderTreeNodeDependenceValue */ .S1)(dataSource, onBeforeRenderNodeEvent, checkedKeys, selectedKeys);
+    }
+    return (0,_tree_node__WEBPACK_IMPORTED_MODULE_3__/* .renderTreeNode */ .uT)(dataSource);
+  };
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default().createElement("div", {
     className: cls({
       '': true,
@@ -116885,7 +116894,7 @@ var ProSidebarTree = function ProSidebarTree(props) {
     className: cls({
       checkable: others.checkable
     }) + " " + className
-  }, others), !onBeforeRenderNodeEvent && (0,_tree_node__WEBPACK_IMPORTED_MODULE_3__/* .renderTreeNode */ .uT)(dataSource), onBeforeRenderNodeEvent && (0,_tree_node__WEBPACK_IMPORTED_MODULE_3__/* .renderTreeNodeDependenceValue */ .S1)(dataSource, onBeforeRenderNodeEvent, checkedKeys, selectedKeys)));
+  }, others), renderTreeNodeGroup()));
 };
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (ProSidebarTree);
 
@@ -118041,7 +118050,7 @@ var equalColumns = function equalColumns(prevProps, nextProps) {
   }
 
   // 操作列的时候强制刷新 || 当 value 值拿不到的时候
-  if (preValue === false && nextValue === false || nextValue === undefined) {
+  if (preValue === false || nextValue === false || preValue === undefined || nextValue === undefined) {
     return false;
   }
 
@@ -118052,19 +118061,6 @@ var equalColumns = function equalColumns(prevProps, nextProps) {
   if (preValue === nextValue) {
     return true;
   }
-
-  // 针对 value 是数组类型的判断 value 是否和原来相等，相等则不渲染
-  if (Array.isArray(nextValue) && Array.isArray(preValue)) {
-    var nextValueStr = nextValue.map(function (item) {
-      return item.TagValue;
-    });
-    var preValueStr = preValue.map(function (item) {
-      return item.TagValue;
-    });
-    if (nextValueStr.toString() === preValueStr.toString()) {
-      return true;
-    }
-  }
   return false;
 };
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (/*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().memo(Cell, equalColumns));
@@ -118487,7 +118483,7 @@ var Layout = function Layout(props) {
   // todo: 有问题
   mainAction,
   // todo: 有问题
-  dataFilterFormRef, afterDataFilter, rowSelection]);
+  dataFilterFormRef, afterDataFilter, rowSelection, actionRef]);
 
   // 区域组合渲染
   var renderLayout = function renderLayout() {
@@ -119285,7 +119281,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]);
 
   // 全选
@@ -119303,7 +119299,11 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   // 重置
   var restColumns = function restColumns(e) {
     e.stopPropagation();
-    var keyNewColumns = processColumns(columns);
+    var keyNewColumns = processColumns(columns).map(function (item) {
+      return _extends({}, item, {
+        columnFilters: (item == null ? void 0 : item.columnFilters) === undefined ? true : item == null ? void 0 : item.columnFilters
+      });
+    });
     notifyTableRender(keyNewColumns);
   };
 
@@ -119985,6 +119985,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 +120061,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 +120690,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 +120733,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) {
@@ -120968,8 +120970,8 @@ 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 _request = function _request(params, noLoading, filterParams, isReset) {
+    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 +120994,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
@@ -121089,14 +121091,13 @@ var ProTable = function ProTable(props) {
         getData.run(requestData);
       }
     }
-  }, [bindUrl, bindUrlProps, dataRef, url, customRequest, currentPage, pageSize, propsParams, actionRef.current]);
-  var onSort = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (dataIndex, order) {
+  };
+  var onSort = function onSort(dataIndex, order) {
     var _nextSort;
     var nextSort = (_nextSort = {}, _nextSort[dataIndex] = order, _nextSort);
     setSort(nextSort);
     _request(targetFormatSort(nextSort));
-  }, [_request, targetFormatSort]);
-
+  };
   // 处理 dataFilter 中的 onFilter、onReset
   var dataFilter = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
     return _extends({
@@ -121110,7 +121111,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 +121130,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 +121169,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,
@@ -121253,30 +121254,30 @@ var ProTable = function ProTable(props) {
       })));
     } else return footerAction;
   };
-  var onChangePagination = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (currentPage, params) {
-    var _extends4;
+  var onChangePagination = function onChangePagination(currentPage, params) {
+    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));
-  }, [reserveSelectedRecords, targetPageKey, actionRef, pageSize]);
-  var onChangePaginationSize = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (currentPageSize) {
+    _request(_extends((_extends5 = {}, _extends5[targetPageKey] = currentPage, _extends5.pageSize = pageSize, _extends5), params));
+  };
+  var onChangePaginationSize = function onChangePaginationSize(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);
     _request((_request10 = {}, _request10[targetPageSizeKey] = currentPageSize, _request10[targetPageKey] = 1, _request10));
-  }, [reserveSelectedRecords, actionRef.current, targetPageSizeKey, targetPageKey, currentPage]);
+  };
   var renderFooter = function renderFooter() {
     function renderRowSelection() {
       if (rowSelection) {