learning
/
linux-command
mirror of https://github.com/jaywcjlove/linux-command.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix search sorting issue. #124

This commit is contained in:
jaywcjlove 2019-07-21 22:59:08 +08:00
parent 9f422c0880
commit fcb02cabbe
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
template/js/index.js
View File

@ -88,29 +88,31 @@
arrResultHTML = [], arrResultHTML = [],
resultData = [], resultData = [],
show_list_count = islist ? this.page_size : this.query_size; show_list_count = islist ? this.page_size : this.query_size;
var nameArr = [], desArr = [];
if (arr && arr.length && toString.call(arr).indexOf('Array') > -1) { if (arr && arr.length && toString.call(arr).indexOf('Array') > -1) {
for (; i < page_size; i++) { for (; i < page_size; i++) {
if (!arr[i]) break; if (!arr[i]) break;
var nIdx = self.isSreachIndexOF(arr[i].n, self.query); var nIdx = self.isSreachIndexOF(arr[i].n, self.query);
var dIdx = self.isSreachIndexOF(arr[i].d, self.query); var dIdx = self.isSreachIndexOF(arr[i].d, self.query);
if (nIdx > -1 || dIdx > -1) { if (nIdx > -1) {
var json = arr[i]; var json = arr[i];
json.nIdx = nIdx; json.nIdx = nIdx;
nameArr.push(json);
} else if (dIdx > -1) {
var json = arr[i];
json.dIdx = dIdx; json.dIdx = dIdx;
resultData.push(json); desArr.push(json);
} }
} }
} }
resultData.sort(function (a, b) { nameArr.sort(function (a, b) {
return a.nIdx - b.nIdx return a.nIdx - b.nIdx;
}).sort(function(a, b) {
return a.n.length - b.n.length;
}).sort(function (a, b) {
if (b.n.indexOf(self.query) < 0) {
return -1;
}
return a.n.indexOf(self.query) - b.n.indexOf(self.query);
}); });
desArr.sort(function (a, b) {
return a.nIdx - b.nIdx;
});
resultData = nameArr.concat(desArr);
resultData = resultData.slice(0, show_list_count); resultData = resultData.slice(0, show_list_count);
for (i = 0; i < resultData.length; i++) { for (i = 0; i < resultData.length; i++) {