8231_testToMaster_2448 #997

Merged
alexm merged 400 commits from 8231_testToMaster_2448 into master 2024-11-26 06:28:29 +00:00
1 changed files with 4 additions and 3 deletions
Showing only changes of commit 8269037faa - Show all commits

View File

@ -1,4 +1,5 @@
function orderData(data, order) {
if (typeof order === 'function') return data.sort(data);
if (typeof order === 'string') order = [order];
if (Array.isArray(order)) {
let orderComp = [];
@ -12,13 +13,13 @@ function orderData(data, order) {
}
return data.sort((a, b) => sortFunc(a, b, orderComp));
} else if (typeof order === 'function') return data.sort(data);
}
return data;
}
function sortFunc(a, b, order) {
for (let i of order) {
let compRes = compareFunc(a[i.field], b[i.field]) * i.way;
for (let { field, way } of order) {
let compRes = compareFunc(a[field], b[field]) * way;
if (compRes !== 0) return compRes;
}