增加多关键词搜索

This commit is contained in:
fofolee 2019-05-07 10:04:54 +08:00
parent 4130bb8906
commit 6cf279e189
2 changed files with 18 additions and 9 deletions

View File

@ -23,7 +23,8 @@ list = (path, initial, type, name ,desc) => {
// 显示列表 // 显示列表
showList = (text, index, listnum) => { showList = (text, index, listnum) => {
window.info = []; window.ResultList = [];
window.ResultIndex = [];
var obn = []; var obn = [];
var obd = []; var obd = [];
index.forEach(i => { index.forEach(i => {
@ -43,8 +44,10 @@ showList = (text, index, listnum) => {
// 置顶全字匹配的内容 // 置顶全字匹配的内容
if (i.name.toUpperCase() == text.toUpperCase()) { if (i.name.toUpperCase() == text.toUpperCase()) {
obn.unshift(list(i.path, initial, type, name, desc)); obn.unshift(list(i.path, initial, type, name, desc));
window.ResultIndex.push(i);
} else { } else {
obn.push(list(i.path, initial, type, name, desc)); obn.push(list(i.path, initial, type, name, desc));
window.ResultIndex.push(i);
} }
// 其次显示描述匹配的内容 // 其次显示描述匹配的内容
} else if (match2) { } else if (match2) {
@ -52,8 +55,8 @@ showList = (text, index, listnum) => {
obd.push(list(i.path, initial, type, name, desc)); obd.push(list(i.path, initial, type, name, desc));
} }
}); });
window.info = obn.concat(obd); window.ResultList = obn.concat(obd);
$("#mainlist").html(window.info.slice(0, listnum).join('')); $("#mainlist").html(window.ResultList.slice(0, listnum).join(''));
let num = $(".info").length let num = $(".info").length
utools.setExpendHeight(num > 11 ? 550 : 50 * num); utools.setExpendHeight(num > 11 ? 550 : 50 * num);
$(".select").removeClass('select'); $(".select").removeClass('select');
@ -173,7 +176,7 @@ toggleView = () => {
// 加载剩余列表 // 加载剩余列表
loadList = listnum => { loadList = listnum => {
if ($(window).scrollTop() >= (listnum * 50 - 550) && $(".info").length <= listnum) { if ($(window).scrollTop() >= (listnum * 50 - 550) && $(".info").length <= listnum) {
$("#mainlist").append(window.info.slice(listnum).join('')); $("#mainlist").append(window.ResultList.slice(listnum).join(''));
$('html').getNiceScroll().resize(); $('html').getNiceScroll().resize();
} }
} }
@ -244,8 +247,15 @@ utools.onPluginEnter( async ({ code, type, payload }) => {
} }
// 子输入框 // 子输入框
utools.setSubInput(({ text }) => { utools.setSubInput(({ text }) => {
// 列表搜索
if ($('#manual').is(':hidden')) { if ($('#manual').is(':hidden')) {
showList(text, index, 500); // 空格进行多关键词搜索
if (text.includes(' ')) {
showList(text.split(' ').pop(), window.ResultIndex, 500)
} else {
showList(text, index, 500);
}
// 手册搜索
} else { } else {
highlightManual("#manual", text); highlightManual("#manual", text);
} }

View File

@ -2,13 +2,12 @@
"pluginName": "程序员手册", "pluginName": "程序员手册",
"description": "内置了多个实用的离线中文手册包括Linux、PHP、Python、JS、C、Vim、Git、Docker、Sql、uTools等", "description": "内置了多个实用的离线中文手册包括Linux、PHP、Python、JS、C、Vim、Git、Docker、Sql、uTools等",
"main": "index.html", "main": "index.html",
"homepage": "https://github.com/fofolee/uTools-Manuals",
"publishPage": "https://yuanliao.info/d/356",
"version": "0.0.2", "version": "0.0.2",
"author": "云之轩", "author": "云之轩",
"logo": "logo.png", "logo": "logo.png",
"platform": [ "platform": [ "win32", "darwin" ],
"win32",
"darwin"
],
"preload": "preload.js", "preload": "preload.js",
"features": [ "features": [
{ {