@ucloud-fe/react-components 1.16.0 → 1.17.1

package/lib/components/Select/Select.js

@@ -801,6 +801,7 @@ var MultipleListSelector = /*#__PURE__*/_react.default.memo(function MultipleSel
       value = props.value,
       onChange = props.onChange,
       placeholder = props.placeholder,
+      renderContent = props.renderContent,
       search = props.search,
       _props$searchValue = props.searchValue,
       searchValue = _props$searchValue === void 0 ? '' : _props$searchValue,
@@ -825,10 +826,10 @@ var MultipleListSelector = /*#__PURE__*/_react.default.memo(function MultipleSel
       (0, _newArrowCheck2.default)(this, _this14);
       return {
         key: v,
-        children: childrenMap.has(v) ? childrenMap.get(v) : v
+        children: childrenMap.has(v) ? renderContent ? renderContent(v) : childrenMap.get(v) : v
       };
     }.bind(this));
-  }.bind(this), [childrenMap, value]);
+  }.bind(this), [childrenMap, value, renderContent]);
   var handleClose = (0, _react.useCallback)(function (key) {
     var _this15 = this;
 
@@ -923,6 +924,7 @@ var MultipleSelector = /*#__PURE__*/_react.default.memo(function MultipleSelecto
       value = props.value,
       onChange = props.onChange,
       placeholder = props.placeholder,
+      renderContent = props.renderContent,
       search = props.search,
       _props$searchValue2 = props.searchValue,
       searchValue = _props$searchValue2 === void 0 ? '' : _props$searchValue2,
@@ -946,10 +948,10 @@ var MultipleSelector = /*#__PURE__*/_react.default.memo(function MultipleSelecto
       (0, _newArrowCheck2.default)(this, _this17);
       return {
         key: v,
-        children: childrenMap.has(v) ? childrenMap.get(v) : v
+        children: childrenMap.has(v) ? renderContent ? renderContent(v) : childrenMap.get(v) : v
       };
     }.bind(this));
-  }.bind(this), [childrenMap, value]);
+  }.bind(this), [childrenMap, value, renderContent]);
   var handleClose = (0, _react.useCallback)(function (key) {
     var _this18 = this;
 

package/lib/components/Table/Table.js

@@ -237,6 +237,16 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
 
         (0, _newArrowCheck2.default)(this, _this6);
 
+        if (rowSelection.resetSelected) {
+          _this2.onSelectedRowKeysChange({});
+
+          _this2.setState({
+            indeterminateSelectedRowKeyMap: {}
+          });
+
+          return;
+        }
+
         if (rowSelection.multiple !== false && rowSelection.linkage && flatDataSourceKeys.length) {
           var _Object$keys$reduce = Object.keys(selectedRowKeyMap).reduce(function (p, key) {
             (0, _newArrowCheck2.default)(this, _this7);
@@ -406,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)) {
@@ -682,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;
@@ -1001,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) {
@@ -1022,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,
@@ -1577,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
@@ -1608,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;
 
@@ -1665,9 +1692,15 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
 
   (0, _createClass2.default)(Table, [{
     key: "initLinkageRowSelectionMap",
-    value: function initLinkageRowSelectionMap(nowSelectedRowKeyMap, checked, key, flatDataSourceKeys, indeterminateSelectedRowKeyMap) {
+    value: function initLinkageRowSelectionMap() {
       var _this41 = this;
 
+      var nowSelectedRowKeyMap = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var checked = arguments.length > 1 ? arguments[1] : undefined;
+      var key = arguments.length > 2 ? arguments[2] : undefined;
+      var flatDataSourceKeys = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+      var indeterminateSelectedRowKeyMap = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+
       if (!flatDataSourceKeys.length) {
         return {
           mergeMap: {},
@@ -1689,7 +1722,11 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
       }.bind(this)); // 禁用需要剔除的key
 
       var disabledItems = this.initDisabledOfRow(flatDataSourceKeys);
-      indeterminate[String(record.key)] = false; // 子被动全选
+
+      if (record) {
+        indeterminate[String(record.key)] = false;
+      } // 子被动全选
+
 
       if (record && record.childrenKeys && record.childrenKeys.length > 0) {
         record.childrenKeys.forEach(function (childKey) {
@@ -1745,7 +1782,7 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
         }
       }
 
-      if (record.parent) {
+      if (record && record.parent) {
         changeParentChecked(record.parent, checked, disabledItems);
       }
 
@@ -2089,7 +2126,12 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
      * 需配合 columns.children 使用，控制是否开启父子联动，默认关闭
      * @default false
      */
-    linkage: _propTypes.default.bool
+    linkage: _propTypes.default.bool,
+
+    /**
+     * dataSource变更时, 是否重置选中项 ，默认为false
+     */
+    resetSelected: _propTypes.default.bool
   }), _propTypes.default.oneOf([true])]),
 
   /** 拖拽排序 */

package/lib/components/Tabs/TabBar.js

@@ -657,7 +657,7 @@ var TabBar = function TabBar(props) {
     justifyContent: "space-between",
     alignItems: "center"
   }, /*#__PURE__*/_react.default.createElement(_Box.default, {
-    flex: 1,
+    flex: "1",
     className: (0, _classnames8.default)((0, _defineProperty2.default)({}, "".concat(_style2.prefixCls, "-srcoll-box"), 1))
   }, /*#__PURE__*/_react.default.createElement(ScrollableTabBarNode, props, /*#__PURE__*/_react.default.createElement(TabBarTabsNode, props), styleType === 'ink' ? /*#__PURE__*/_react.default.createElement(InkTabBarNode, props) : null)), /*#__PURE__*/_react.default.createElement(_Box.default, {
     justifyContent: "flex-end",

package/package.json

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