Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-02 11:26:15 +01:00
Code Issues Packages Projects Releases Activity

improvements in search UI

Browse Source
This commit is contained in:
zadam
2020-11-26 23:00:27 +01:00
parent 02043d9109
commit eaed7ec86f
27 changed files with 251 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/routes/api/search.js
View File

@@ -46,27 +46,23 @@ async function searchFromNote(req) {
return [400, `Note ${req.params.noteId} is not search note.`]
}
const json = note.getJsonContent();
if (!json || !json.searchString) {
return [];
}
const searchString = note.getLabelValue('searchString');
let searchResultNoteIds;
try {
if (json.searchString.startsWith('=')) {
const relationName = json.searchString.substr(1).trim();
if (searchString.startsWith('=')) {
const relationName = searchString.substr(1).trim();
searchResultNoteIds = await searchFromRelation(note, relationName);
} else {
const searchContext = new SearchContext({
includeNoteContent: true,
includeNoteContent: note.getLabelValue('includeNoteContent') === 'true',
excludeArchived: true,
fuzzyAttributeSearch: false
});
searchResultNoteIds = searchService.findNotesWithQuery(json.searchString, searchContext)
searchResultNoteIds = searchService.findNotesWithQuery(searchString, searchContext)
.map(sr => sr.noteId);
}
}