fix(sort):

多列排序时sorter规则优先安置用户传入的sorter方法,如果不传走默认
This commit is contained in:
izbz wh 2019-06-05 14:12:12 +08:00
parent b90ab5e9b6
commit 0b5b6c623f
8 changed files with 87 additions and 87 deletions

View File

@ -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);

View File

@ -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);
}
};

View File

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