@ucloud-fe/react-components 1.7.1 → 1.8.1

package/lib/components/Select/Select.js

@@ -1319,7 +1319,7 @@ var Select = function Select(_ref19) {
 
   var _useState5 = (0, _react.useState)(function () {
     (0, _newArrowCheck2.default)(this, _this21);
-    return hasSubGroup || !!(search && (renderContent || renderSelector));
+    return hasSubGroup || !!(search && renderSelector);
   }.bind(this)),
       _useState6 = (0, _slicedToArray2.default)(_useState5, 1),
       v1 = _useState6[0];

package/lib/components/Slider/Slider.js

@@ -64,7 +64,7 @@ var _style = require("./style");
 var _zh_CN = _interopRequireDefault(require("./locale/zh_CN"));
 
 var _excluded = ["value", "dragging", "index", "tipFormatter"],
-    _excluded2 = ["value", "defaultValue", "onChange", "className", "style", "disabled", "min", "max", "step", "sliderClassName", "sliderStyle", "numberInput", "numberInputTipFormatter", "tipFormatter", "size", "marks", "isSensitive", "locale", "onLastChange"];
+    _excluded2 = ["value", "defaultValue", "range", "onChange", "className", "style", "disabled", "min", "max", "step", "sliderClassName", "sliderStyle", "numberInput", "numberInputTipFormatter", "tipFormatter", "size", "marks", "isSensitive", "locale", "onLastChange"];
 
 var _this = void 0,
     _dec,
@@ -86,6 +86,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 var Handle = _rcSlider.default.Handle;
+var Range = _rcSlider.default.Range;
 var Size = ['sm', 'md', 'lg'];
 
 var handle = function handle(props) {
@@ -258,7 +259,9 @@ var Slider = (_dec = (0, _localeConsumerDecorator.default)({
         return null;
       }
 
-      var max = props.max;
+      var _props$max = props.max,
+          max = _props$max === void 0 ? 100 : _props$max,
+          range = props.range;
       var marks = {};
       var baseRatio = 0;
       (0, _each2.default)(_marks, function (_mark) {
@@ -268,7 +271,7 @@ var Slider = (_dec = (0, _localeConsumerDecorator.default)({
           return;
         }
 
-        var value = (baseRatio += _mark.ratio) / 100 * sliderSplit;
+        var value = (baseRatio += _mark.ratio) / 100 * (range ? max : sliderSplit);
         var mark = {
           label: _mark.label,
           style: _objectSpread(_objectSpread({
@@ -340,8 +343,8 @@ var Slider = (_dec = (0, _localeConsumerDecorator.default)({
 
     _this3.onSliderChange = function (v, latest) {
       (0, _newArrowCheck2.default)(this, _this4);
-
-      var value = _this3.translateSliderValueToValue(v);
+      var range = _this3.props.range;
+      var value = range ? v : _this3.translateSliderValueToValue(v);
 
       _this3.handleChange(value, latest);
     }.bind(this);
@@ -607,6 +610,7 @@ var Slider = (_dec = (0, _localeConsumerDecorator.default)({
       var _this$props = this.props,
           value = _this$props.value,
           defaultValue = _this$props.defaultValue,
+          range = _this$props.range,
           onChange = _this$props.onChange,
           className = _this$props.className,
           style = _this$props.style,
@@ -662,6 +666,31 @@ var Slider = (_dec = (0, _localeConsumerDecorator.default)({
       });
 
       var isNumberInputValid = numberInputValue + '' === value + '';
+
+      if (range) {
+        return /*#__PURE__*/_react.default.createElement(_style.SliderWrap, {
+          disabled: disabled,
+          style: style,
+          className: className,
+          size: size
+        }, /*#__PURE__*/_react.default.createElement(_style.RcSliderWrap, null, /*#__PURE__*/_react.default.createElement(Range, (0, _extends2.default)({
+          min: min,
+          max: max,
+          defaultValue: defaultValue,
+          value: value,
+          step: step,
+          prefixCls: _style.prefixCls,
+          marks: marksForSlider || {},
+          handle: function (handleProps) {
+            (0, _newArrowCheck2.default)(this, _this9);
+            return handle(_objectSpread(_objectSpread({}, handleProps), {}, {
+              // value,
+              tipFormatter: tipFormatter
+            }));
+          }.bind(this)
+        }, sliderProps, sharingProps))));
+      }
+
       return /*#__PURE__*/_react.default.createElement(_style.SliderWrap, {
         disabled: disabled,
         style: style,
@@ -702,10 +731,13 @@ var Slider = (_dec = (0, _localeConsumerDecorator.default)({
   return Slider;
 }(_react.Component), _class2.propTypes = {
   /** 值，受控 */
-  value: _propTypes.default.number,
+  value: _propTypes.default.number | _propTypes.default.arrayOf(_propTypes.default.number),
 
   /** 默认值，非受控 */
-  defaultValue: _propTypes.default.number,
+  defaultValue: _propTypes.default.number | _propTypes.default.arrayOf(_propTypes.default.number),
+
+  /** 是否为双滑块模式 */
+  range: _propTypes.default.bool,
 
   /** 修改回调 */
   onChange: _propTypes.default.func,
@@ -771,6 +803,7 @@ var Slider = (_dec = (0, _localeConsumerDecorator.default)({
     (0, _newArrowCheck2.default)(this, _this);
   }.bind(void 0),
   defaultValue: 0,
+  range: false,
   step: 1,
   size: 'md',
   min: 0,

package/lib/components/Table/Table.js

@@ -586,7 +586,7 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
         array.forEach(function (record) {
           (0, _newArrowCheck2.default)(this, _this17);
 
-          if (record[childrenName]) {
+          if (record && record[childrenName]) {
             var newRecord = _objectSpread({}, record);
 
             delete newRecord[childrenName];
@@ -656,7 +656,7 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
         }.bind(this) : _columnInfo$filter$ha;
         return (0, _filter2.default)(dataSource, function (record) {
           (0, _newArrowCheck2.default)(this, _this19);
-          return handleFilter(record[dataIndex], record, value, multiple);
+          return handleFilter(record && record[dataIndex], record, value, multiple);
         }.bind(this));
       }.bind(this);
 
@@ -757,7 +757,7 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
     _this2.getRowKey = function (record, index) {
       (0, _newArrowCheck2.default)(this, _this3);
       var rowKey = _this2.props.rowKey;
-      var key = typeof rowKey === 'function' ? rowKey(record, index) : record[rowKey];
+      var key = typeof rowKey === 'function' ? rowKey(record, index) : record && record[rowKey];
       return key === undefined ? index : key;
     }.bind(this);
 
@@ -1503,7 +1503,9 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
         "data-table-id": this.tableId
       }, /*#__PURE__*/_react.default.createElement(_style.PopupContainer, {
         ref: this.savePopupContainer
-      }), /*#__PURE__*/_react.default.createElement(_rcTable.default, (0, _extends2.default)({}, defaultExpandAllRowsProps, {
+      }), /*#__PURE__*/_react.default.createElement(_rcTable.default, (0, _extends2.default)({
+        defaultExpandAllRows: defaultExpandAllRows
+      }, defaultExpandAllRowsProps, {
         onExpand: this.onExpandHandler
       }, rest, {
         scroll: scroll,

package/lib/libs/rc-table/ExpandableRow.js

@@ -146,7 +146,7 @@ var ExpandableRow = /*#__PURE__*/function (_React$Component) {
           fixed = _this$props5.fixed;
       this.expandIconAsCell = fixed !== 'right' ? this.props.expandIconAsCell : false;
       this.expandIconColumnIndex = fixed !== 'right' ? this.props.expandIconColumnIndex : -1;
-      var childrenData = record[childrenColumnName];
+      var childrenData = record && record[childrenColumnName];
       this.expandable = !!(childrenData || expandedRowRender);
       var expandableRowProps = {
         indentSize: indentSize,

package/lib/libs/rc-table/ExpandableTable.js

@@ -125,7 +125,7 @@ var ExpandableTable = /*#__PURE__*/function (_React$Component) {
           expandedRowClassName = _this$props3.expandedRowClassName,
           expandedRowRender = _this$props3.expandedRowRender,
           childrenColumnName = _this$props3.childrenColumnName;
-      var childrenData = record[childrenColumnName];
+      var childrenData = record && record[childrenColumnName];
       var nextAncestorKeys = [].concat((0, _toConsumableArray2.default)(ancestorKeys), [parentKey]);
       var nextIndent = indent + 1;
 
@@ -250,7 +250,7 @@ var ExpandableTable = /*#__PURE__*/function (_React$Component) {
           children = _this$props5.children;
       var needIndentSpaced = data.some(function (record) {
         (0, _newArrowCheck2.default)(this, _this4);
-        return record[childrenColumnName];
+        return record && record[childrenColumnName];
       }.bind(this));
       return children({
         props: this.props,
@@ -294,8 +294,12 @@ ExpandableTable.defaultProps = {
   defaultExpandedRowKeys: [],
   childrenColumnName: 'children',
   indentSize: 15,
-  onExpand: function onExpand() {},
-  onExpandedRowsChange: function onExpandedRowsChange() {}
+  onExpand: function onExpand() {
+    (0, _newArrowCheck2.default)(this, _this5);
+  }.bind(void 0),
+  onExpandedRowsChange: function onExpandedRowsChange() {
+    (0, _newArrowCheck2.default)(this, _this5);
+  }.bind(void 0)
 };
 (0, _reactLifecyclesCompat.polyfill)(ExpandableTable);
 

package/lib/libs/rc-table/Table.js

@@ -72,7 +72,7 @@ var Table = /*#__PURE__*/function (_React$Component) {
     _this.getRowKey = function (record, index) {
       (0, _newArrowCheck2.default)(this, _this2);
       var rowKey = _this.props.rowKey;
-      var key = typeof rowKey === 'function' ? rowKey(record, index) : record[rowKey];
+      var key = typeof rowKey === 'function' ? rowKey(record, index) : record && record[rowKey];
       (0, _utils.warningOnce)(key !== undefined, 'Each record in table should have a unique `key` prop,' + 'or set `rowKey` to an unique primary key.');
       return key === undefined ? index : key;
     }.bind(this);

package/lib/libs/rc-table/TableCell.js

@@ -84,7 +84,7 @@ var TableCell = /*#__PURE__*/function (_React$Component) {
       var colSpan;
       var rowSpan;
 
-      if (render) {
+      if (render && record) {
         text = render(text, record, index);
 
         if (isInvalidRenderCellText(text)) {

package/package.json

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