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

implemented "search in subtree"

Browse Source
This commit is contained in:
zadam
2020-12-05 23:00:28 +01:00
parent b0e5ab7533
commit 90d33f56c3
13 changed files with 98 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/public/app/widgets/search_definition.js
View File

@@ -96,13 +96,13 @@ export default class SearchDefinitionWidget extends TabAwareWidget {
async updateSearch() {
const searchString = this.$searchString.val();
const subNoteId = this.$limitSearchToSubtree.getSelectedNoteId();
const subTreeNoteId = this.$limitSearchToSubtree.getSelectedNoteId();
const includeNoteContent = this.$searchWithinNoteContent.is(":checked");
await server.put(`notes/${this.noteId}/attributes`, [
{ type: 'label', name: 'searchString', value: searchString },
{ type: 'label', name: 'includeNoteContent', value: includeNoteContent ? 'true' : 'false' },
subNoteId ? { type: 'label', name: 'subTreeNoteId', value: subNoteId } : undefined,
subTreeNoteId ? { type: 'label', name: 'subTreeNoteId', value: subTreeNoteId } : undefined,
].filter(it => !!it));
if (this.note.title.startsWith('Search: ')) {
@@ -122,7 +122,13 @@ export default class SearchDefinitionWidget extends TabAwareWidget {
this.$component.show();
this.$searchString.val(this.note.getLabelValue('searchString'));
this.$searchWithinNoteContent.prop('checked', this.note.getLabelValue('includeNoteContent') === 'true');
this.$limitSearchToSubtree.val(this.note.getLabelValue('subTreeNoteId'));
const subTreeNoteId = this.note.getLabelValue('subTreeNoteId');
const subTreeNote = subTreeNoteId ? await treeCache.getNote(subTreeNoteId, true) : null;
this.$limitSearchToSubtree
.val(subTreeNote ? subTreeNote.title : "")
.setSelectedNotePath(subTreeNoteId);
this.refreshResults(); // important specifically when this search note was not yet refreshed
}