@ucloud-fe/react-components 1.17.0 → 1.17.1

package/lib/components/Table/Table.js

@@ -416,18 +416,34 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
       var _this14 = this;
 
       (0, _newArrowCheck2.default)(this, _this3);
-      var rowSelection = _this2.props.rowSelection;
+      var _this2$props = _this2.props,
+          rowSelection = _this2$props.rowSelection,
+          dataSource = _this2$props.dataSource;
       var parentSelectedRowKeys = _this2.state.parentSelectedRowKeys;
       if (!rowSelection) return;
       var selectedRowKeys = [];
       (0, _each2.default)(selectedRowKeyMap, function (selected, key) {
         (0, _newArrowCheck2.default)(this, _this14);
         selected && selectedRowKeys.push(key);
+      }.bind(this)); // 计算所有选中的行数据，包括折叠的子项
+
+      var flatDataSource = _this2.flatDataSource(dataSource);
+
+      flatDataSource.forEach(function (item) {
+        (0, _newArrowCheck2.default)(this, _this14);
+
+        if (selectedRowKeyMap[item.key]) {
+          _this2._selectedRowsMap[item.key] = item.record;
+        }
       }.bind(this));
 
       if ((0, _isObject2.default)(rowSelection)) {
         if (rowSelection.onChange) {
-          rowSelection.onChange(selectedRowKeys);
+          var selectedRows = selectedRowKeys.map(function (key) {
+            (0, _newArrowCheck2.default)(this, _this14);
+            return _this2._selectedRowsMap[key];
+          }.bind(this));
+          rowSelection.onChange(selectedRowKeys, selectedRows);
         }
 
         if (!('selectedRowKeys' in rowSelection)) {
@@ -692,10 +708,10 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
       var _this20 = this;
 
       (0, _newArrowCheck2.default)(this, _this3);
-      var _this2$props = _this2.props,
-          dataSource = _this2$props.dataSource,
-          handleSearch = _this2$props.handleSearch,
-          doNotHandleCondition = _this2$props.doNotHandleCondition;
+      var _this2$props2 = _this2.props,
+          dataSource = _this2$props2.dataSource,
+          handleSearch = _this2$props2.handleSearch,
+          doNotHandleCondition = _this2$props2.doNotHandleCondition;
       var _this2$state2 = _this2.state,
           order = _this2$state2.order,
           searchValue = _this2$state2.searchValue;
@@ -1011,10 +1027,10 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
       var _this31 = this;
 
       (0, _newArrowCheck2.default)(this, _this3);
-      var _this2$props2 = _this2.props,
-          dragSorting = _this2$props2.dragSorting,
-          expandedRowRender = _this2$props2.expandedRowRender,
-          columns = _this2$props2.columns;
+      var _this2$props3 = _this2.props,
+          dragSorting = _this2$props3.dragSorting,
+          expandedRowRender = _this2$props3.expandedRowRender,
+          columns = _this2$props3.columns;
       if (!dragSorting) return false; // 排序暂不支持有展开行配置的table
 
       if (expandedRowRender || columns && columns.findIndex(function (column) {
@@ -1032,13 +1048,13 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
       var _this32 = this;
 
       (0, _newArrowCheck2.default)(this, _this3);
-      var _this2$props3 = _this2.props,
-          columns = _this2$props3.columns,
-          rowSelection = _this2$props3.rowSelection,
-          columnPlaceholder = _this2$props3.columnPlaceholder,
-          locale = _this2$props3.locale,
-          dataSource = _this2$props3.dataSource,
-          columnResizable = _this2$props3.columnResizable;
+      var _this2$props4 = _this2.props,
+          columns = _this2$props4.columns,
+          rowSelection = _this2$props4.rowSelection,
+          columnPlaceholder = _this2$props4.columnPlaceholder,
+          locale = _this2$props4.locale,
+          dataSource = _this2$props4.dataSource,
+          columnResizable = _this2$props4.columnResizable;
       var _this2$state3 = _this2.state,
           _this2$state3$order = _this2$state3.order,
           currentOrder = _this2$state3$order === void 0 ? {} : _this2$state3$order,
@@ -1587,10 +1603,10 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
 
     _this2.onRow = function (record, index) {
       (0, _newArrowCheck2.default)(this, _this3);
-      var _this2$props4 = _this2.props,
-          _this2$props4$onRow = _this2$props4.onRow,
-          onRow = _this2$props4$onRow === void 0 ? noop : _this2$props4$onRow,
-          contextMenu = _this2$props4.contextMenu;
+      var _this2$props5 = _this2.props,
+          _this2$props5$onRow = _this2$props5.onRow,
+          onRow = _this2$props5$onRow === void 0 ? noop : _this2$props5$onRow,
+          contextMenu = _this2$props5.contextMenu;
       return _objectSpread(_objectSpread({}, onRow(record, index)), {}, {
         record: record,
         contextMenu: contextMenu
@@ -1618,7 +1634,8 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
       columnConfig: _props.defaultColumnConfig,
       searchValue: ''
     };
-    _this2.tableId = "uc_table_uid_".concat(uid++); // init pagination
+    _this2.tableId = "uc_table_uid_".concat(uid++);
+    _this2._selectedRowsMap = {}; // init pagination
 
     var _pagination = _props.pagination;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ucloud-fe/react-components",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "title": "UCloud react components",
   "description": "UCloud react components",
   "keywords": [