fix(sort):

多列排序时sorter规则优先安置用户传入的sorter方法,如果不传走默认

build/Table.css

@@ -153,13 +153,6 @@
   .u-loading.u-loading-line.u-loading-line-warning > div {
     background-color: #ff9800; }
 
-.u-loading.u-loading-custom > div {
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  -webkit-transform: translate(-50%, -50%);
-  transform: translate(-50%, -50%); }
-
 @keyframes line-scale {
   0% {
     -webkit-transform: scaley(1);

build/lib/sort.js

@@ -198,15 +198,22 @@ function sort(Table, Icon) {
     };
 
     this._sortBy = function (pre, after, orderCols, orderColslen, currentIndex) {
-      var preKey = pre[orderCols[currentIndex].key];
-      var afterKey = after[orderCols[currentIndex].key];
+      var currentCol = orderCols[currentIndex];
+      var preKey = pre[currentCol.key];
+      var afterKey = after[currentCol.key];
+      var colSortFun = currentCol.sorter;
+      if (typeof colSortFun !== 'function') {
+        colSortFun = function colSortFun() {
+          return preKey - afterKey;
+        };
+      }
       if (preKey == afterKey && currentIndex + 1 <= orderColslen) {
         return _this3._sortBy(pre, after, orderCols, orderColslen, currentIndex + 1);
       }
-      if (orderCols[currentIndex].order == "ascend") {
-        return preKey - afterKey;
+      if (currentCol.order == "ascend") {
+        return colSortFun(pre, after);
       } else {
-        return afterKey - preKey;
+        return -colSortFun(pre, after);
       }
     };
 

build/lib/util.js

@@ -1,7 +1,7 @@
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
-  value: true
+    value: true
 });
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -20,29 +20,29 @@ exports.ObjectAssign = ObjectAssign;
 */
 
 function sortBy(arr, prop, desc) {
-  var props = [],
-      ret = [],
-      i = 0,
-      len = arr.length;
-  if (typeof prop == 'string') {
-    for (; i < len; i++) {
-      var oI = arr[i];
-      (props[i] = new String(oI && oI[prop] || ''))._obj = oI;
+    var props = [],
+        ret = [],
+        i = 0,
+        len = arr.length;
+    if (typeof prop == 'string') {
+        for (; i < len; i++) {
+            var oI = arr[i];
+            (props[i] = new String(oI && oI[prop] || ''))._obj = oI;
+        }
+    } else if (typeof prop == 'function') {
+        for (; i < len; i++) {
+            var _oI = arr[i];
+            (props[i] = new String(_oI && prop(_oI) || ''))._obj = _oI;
+        }
+    } else {
+        throw '参数类型错误';
     }
-  } else if (typeof prop == 'function') {
-    for (; i < len; i++) {
-      var _oI = arr[i];
-      (props[i] = new String(_oI && prop(_oI) || ''))._obj = _oI;
+    props.sort();
+    for (i = 0; i < len; i++) {
+        ret[i] = props[i]._obj;
     }
-  } else {
-    throw '参数类型错误';
-  }
-  props.sort();
-  for (i = 0; i < len; i++) {
-    ret[i] = props[i]._obj;
-  }
-  if (desc) ret.reverse();
-  return ret;
+    if (desc) ret.reverse();
+    return ret;
 };
 
 /**
@@ -51,11 +51,11 @@ function sortBy(arr, prop, desc) {
  * @param {} property 
  */
 function compare(property) {
-  return function (a, b) {
-    var value1 = a[property];
-    var value2 = b[property];
-    return value1 - value2;
-  };
+    return function (a, b) {
+        var value1 = a[property];
+        var value2 = b[property];
+        return value1 - value2;
+    };
 }
 
 /**
@@ -63,17 +63,17 @@ function compare(property) {
  * @param {*} obj 要拷贝的对象 
  */
 function ObjectAssign(obj) {
-  var b = obj instanceof Array;
-  var tagObj = b ? [] : {};
-  if (b) {
-    //数组
-    obj.forEach(function (da) {
-      var _da = {};
-      _extends(_da, da);
-      tagObj.push(_da);
-    });
-  } else {
-    _extends(tagObj, obj);
-  }
-  return tagObj;
+    var b = obj instanceof Array;
+    var tagObj = b ? [] : {};
+    if (b) {
+        //数组
+        obj.forEach(function (da) {
+            var _da = {};
+            _extends(_da, da);
+            tagObj.push(_da);
+        });
+    } else {
+        _extends(tagObj, obj);
+    }
+    return tagObj;
 }

package.json

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