@ucloud-fe/react-components 1.11.0 → 1.12.0

package/lib/components/Table/ColumnConfigButton.js

@@ -235,6 +235,7 @@ var ColumnConfigButton = /*#__PURE__*/function (_PureComponent2) {
           modalProps = _this$props3.modalProps,
           rest = (0, _objectWithoutProperties2.default)(_this$props3, _excluded);
       return /*#__PURE__*/_react.default.createElement(_style.ColumnConfigWrap, rest, /*#__PURE__*/_react.default.createElement(_style.ColumnConfigButtonWrap, {
+        shape: "square",
         icon: /*#__PURE__*/_react.default.createElement(_SvgIcon.default, {
           type: "cog",
           size: "14px"

package/lib/components/Table/Table.js

@@ -472,7 +472,8 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
           return /*#__PURE__*/_react.default.createElement(_style.FilterIcon, {
             key: "icon",
             type: "filter",
-            active: active
+            active: active,
+            disabled: rest.disabled
           });
         }.bind(this),
         multiple: multiple
@@ -1006,7 +1007,8 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
               "data-row-key": rowKey,
               onMouseEnter: _this2.setDraggable,
               onMouseLeave: _this2.unsetDraggable,
-              className: _style.draggerCls
+              className: _style.draggerCls,
+              "data-testid": "draggable"
             }, /*#__PURE__*/_react.default.createElement(_SvgIcon.default, {
               type: "dragger",
               size: "16px"
@@ -1138,8 +1140,16 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
     }.bind(this);
 
     _this2.onDragEnd = function (source) {
+      var _this29 = this;
+
       (0, _newArrowCheck2.default)(this, _this3);
 
+      _this2.getTableDom().querySelectorAll('.uc-fe-table-row').forEach(function (row) {
+        (0, _newArrowCheck2.default)(this, _this29);
+        row.classList.remove(_style.dragOverDownCls);
+        row.classList.remove(_style.dragOverUpCls);
+      }.bind(this));
+
       _this2.initDrag(source);
     }.bind(this);
 
@@ -1191,7 +1201,7 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
     }.bind(this);
 
     _this2.renderSearchInfo = function (option) {
-      var _this29 = this;
+      var _this30 = this;
 
       (0, _newArrowCheck2.default)(this, _this3);
       var filters = option.filters,
@@ -1201,15 +1211,15 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
       var first = true;
 
       var renderLabel = function renderLabel(_ref5) {
-        var _this30 = this;
+        var _this31 = this;
 
-        (0, _newArrowCheck2.default)(this, _this29);
+        (0, _newArrowCheck2.default)(this, _this30);
         var value = _ref5.value,
             _ref5$column$filter = _ref5.column.filter,
             multiple = _ref5$column$filter.multiple,
             options = _ref5$column$filter.options;
         options = options.map(function (option) {
-          (0, _newArrowCheck2.default)(this, _this30);
+          (0, _newArrowCheck2.default)(this, _this31);
           return !(0, _isObject2.default)(option) ? {
             value: option,
             label: option
@@ -1218,23 +1228,23 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
 
         if (multiple) {
           var label = (0, _map2.default)(value, function (v) {
-            var _this31 = this;
+            var _this32 = this;
 
-            (0, _newArrowCheck2.default)(this, _this30);
+            (0, _newArrowCheck2.default)(this, _this31);
             var option = (0, _find2.default)(options, function (option) {
-              (0, _newArrowCheck2.default)(this, _this31);
+              (0, _newArrowCheck2.default)(this, _this32);
               return v === option.value;
             }.bind(this));
             return option && option.label;
           }.bind(this));
           var _first = true;
           return (0, _map2.default)(label, function (_label) {
-            (0, _newArrowCheck2.default)(this, _this30);
+            (0, _newArrowCheck2.default)(this, _this31);
             return _first ? [_first = false, _label] : [' | ', _label];
           }.bind(this));
         } else {
           var _option = (0, _find2.default)(options, function (option) {
-            (0, _newArrowCheck2.default)(this, _this30);
+            (0, _newArrowCheck2.default)(this, _this31);
             return value === option.value;
           }.bind(this));
 
@@ -1250,7 +1260,7 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
         closable: false,
         className: "".concat(_style.prefixCls, "-filter-notice")
       }, searchValue && /*#__PURE__*/_react.default.createElement("span", null, locale.search, locale.colon, searchValue, locale.semicolon), !(0, _isEmpty2.default)(filters) && /*#__PURE__*/_react.default.createElement("span", null, locale.filter, locale.colon, (0, _map2.default)(filters, function (filterInfo) {
-        (0, _newArrowCheck2.default)(this, _this29);
+        (0, _newArrowCheck2.default)(this, _this30);
         return first ? [first = false, renderLabel(filterInfo)] : [', ', renderLabel(filterInfo)];
       }.bind(this)), locale.semicolon), /*#__PURE__*/_react.default.createElement("span", null, locale.searchResult, locale.colon, total, locale.items, locale.semicolon), /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement("a", {
         className: "".concat(_style.prefixCls, "-reset-link"),
@@ -1403,7 +1413,7 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
   (0, _createClass2.default)(Table, [{
     key: "render",
     value: function render() {
-      var _this32 = this;
+      var _this33 = this;
 
       /* eslint-disable no-unused-vars */
       var _this$props = this.props,
@@ -1466,7 +1476,7 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
 
       var columns = this.getColumns(dataSource, finalFilters);
       var defaultExpandAllRowsProps = !defaultExpandAllRows ? null : function () {
-        (0, _newArrowCheck2.default)(this, _this32);
+        (0, _newArrowCheck2.default)(this, _this33);
         var _this$state$changedUn = this.state.changedUnExpandedRowKeys,
             changedUnExpandedRowKeys = _this$state$changedUn === void 0 ? {} : _this$state$changedUn;
         var expandedRowKeys = this.getExpandedRowKeys(dataSource, changedUnExpandedRowKeys);
@@ -1528,7 +1538,7 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
         expandedRowRender: expandedRowRender,
         expandIconColumnIndex: expandIconColumnIndex === undefined ? columns[0] && columns[0].key === 'table_row_selection' ? 1 : 0 : expandIconColumnIndex,
         title: function () {
-          (0, _newArrowCheck2.default)(this, _this32);
+          (0, _newArrowCheck2.default)(this, _this33);
           return this.renderTitle({
             filters: finalFilters,
             searchValue: searchValue,
@@ -1537,7 +1547,7 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
           });
         }.bind(this),
         footer: function () {
-          (0, _newArrowCheck2.default)(this, _this32);
+          (0, _newArrowCheck2.default)(this, _this33);
           return this.renderFooter({
             dataSource: _d,
             emptyContent: emptyContent,
@@ -1553,7 +1563,7 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
       }, pagination, {
         className: "".concat(_style.prefixCls, "-pagination"),
         onChange: function (current, pageSize) {
-          (0, _newArrowCheck2.default)(this, _this32);
+          (0, _newArrowCheck2.default)(this, _this33);
           this.setState({
             pagination: {
               current: current,
@@ -1563,7 +1573,7 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
           pagination.onChange && pagination.onChange(current, pageSize);
         }.bind(this),
         onPageSizeChange: function (current, pageSize) {
-          (0, _newArrowCheck2.default)(this, _this32);
+          (0, _newArrowCheck2.default)(this, _this33);
           this.setState({
             pagination: {
               current: current,
@@ -1573,7 +1583,7 @@ var Table = (_dec = (0, _localeConsumerDecorator.default)({
           pagination.onPageSizeChange && pagination.onPageSizeChange(current, pageSize);
         }.bind(this),
         onAdvise: function (current, pageSize) {
-          (0, _newArrowCheck2.default)(this, _this32);
+          (0, _newArrowCheck2.default)(this, _this33);
           this.setState({
             pagination: {
               current: current,