feat(bee-table): 去掉console，排序修改

build/lib/newMultiSelect.js

@@ -111,7 +111,6 @@ function newMultiSelect(Table, Checkbox) {
           width: 50,
           render: function render(text, record, index) {
             var attr = {};
-            console.log("record._disabled---", record._disabled);
             record._disabled ? attr.disabled = record._disabled : "";
             return _react2["default"].createElement(Checkbox, _extends({
               key: index,

build/lib/sort.js

@@ -38,9 +38,9 @@ function sort(Table, Icon) {
 
       _this.toggleSortOrder = function (order, column) {
         var _this$state = _this.state,
-            sortOrder = _this$state.sortOrder,
             data = _this$state.data,
-            oldData = _this$state.oldData;
+            oldData = _this$state.oldData,
+            columns = _this$state.columns;
 
         var ascend_sort = function ascend_sort(key) {
           return function (a, b) {
@@ -52,10 +52,10 @@ function sort(Table, Icon) {
             return b.key - a.key;
           };
         };
-        if (sortOrder === order) {
-          // 切换为未排序状态
-          order = "";
-        }
+        // if (sortOrder === order) {
+        //   // 切换为未排序状态
+        //   order = "";
+        // }
         if (!oldData) {
           oldData = data.concat();
         }
@@ -70,42 +70,25 @@ function sort(Table, Icon) {
         } else {
           data = oldData.concat();
         }
+        var seleObj = columns.find(function (da) {
+          return da.key == column.key;
+        });
+        seleObj.order = order;
         _this.setState({
-          sortOrder: order,
           data: data,
-          oldData: oldData
+          oldData: oldData,
+          columns: columns
         });
       };
 
-      _this.state = {
-        sortOrder: "",
-        data: _this.props.data
-      };
-      return _this;
-    }
-
-    SortTable.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
-      if (nextProps.data !== this.props.data) {
-        this.setState({
-          sortOrder: "",
-          data: nextProps.data,
-          oldData: nextProps.data.concat()
-        });
-      }
-    };
-
-    SortTable.prototype.renderColumnsDropdown = function renderColumnsDropdown(columns) {
-      var _this2 = this;
-
-      var sortOrder = this.state.sortOrder;
-
-      var prefixCls = this.props.prefixCls || "bee-table";
+      _this.renderColumnsDropdown = function (columns) {
+        var prefixCls = _this.props.prefixCls || "bee-table";
         return columns.map(function (originColumn) {
           var column = _extends({}, originColumn);
           var sortButton = void 0;
           if (column.sorter) {
-          var isAscend = sortOrder === "ascend";
-          var isDescend = sortOrder === "descend";
+            var isAscend = column.order && column.order === "ascend";
+            var isDescend = column.order && column.order === "descend";
             sortButton = _react2["default"].createElement(
               "div",
               { className: prefixCls + "-column-sorter" },
@@ -115,7 +98,8 @@ function sort(Table, Icon) {
                   className: prefixCls + "-column-sorter-up " + (isAscend ? "on" : "off"),
                   title: "\u2191",
                   onClick: function onClick() {
-                  _this2.toggleSortOrder("ascend", column);
+                    _this.toggleSortOrder("ascend", column);
+
                     if (column.sorterClick) {
                       column.sorterClick(column, "up");
                     }
@@ -129,7 +113,7 @@ function sort(Table, Icon) {
                   className: prefixCls + "-column-sorter-down " + (isDescend ? "on" : "off"),
                   title: "\u2193",
                   onClick: function onClick() {
-                  _this2.toggleSortOrder("descend", column);
+                    _this.toggleSortOrder("descend", column);
                     if (column.sorterClick) {
                       column.sorterClick(column, "down");
                     }
@@ -149,8 +133,29 @@ function sort(Table, Icon) {
         });
       };
 
+      _this.state = {
+        data: _this.props.data,
+        columns: props.columns
+      };
+      return _this;
+    }
+
+    SortTable.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
+      if (nextProps.data !== this.props.data) {
+        this.setState({
+          data: nextProps.data,
+          oldData: nextProps.data.concat()
+        });
+      }
+      if (nextProps.columns !== this.props.columns) {
+        this.setState({
+          columns: nextProps.columns
+        });
+      }
+    };
+
     SortTable.prototype.render = function render() {
-      var columns = this.renderColumnsDropdown(this.props.columns.concat());
+      var columns = this.renderColumnsDropdown(this.state.columns.concat());
       return _react2["default"].createElement(Table, _extends({}, this.props, { columns: columns, data: this.state.data }));
     };
 

package.json

@@ -1,6 +1,6 @@
 {
  "name": "bee-table",
- "version": "1.3.2",
+ "version": "1.3.3",
  "description": "Table ui component for react",
  "keywords": [
   "react",