github-mirror/BookStack
github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-04-02 21:59:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added name highlighting in search results

Browse Source
This commit is contained in:
Dan Brown 2021-11-13 12:44:27 +00:00
parent f30b937bb0
commit ab4e99bb18
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Entities/Tools/SearchResultsFormatter.php
View File

@ -30,11 +30,17 @@ class SearchResultsFormatter
$textContent = $entity->$textProperty; $textContent = $entity->$textProperty;
$terms = array_merge($options->exacts, $options->searches); $terms = array_merge($options->exacts, $options->searches);
$matchRefs = $this->getMatchPositions($textContent, $terms); $originalContentByNewAttribute = [
$mergedRefs = $this->sortAndMergeMatchPositions($matchRefs); 'preview_name' => $entity->name,
$content = $this->formatTextUsingMatchPositions($mergedRefs, $textContent); 'preview_content' => $textContent,
];
$entity->setAttribute('preview_content', new HtmlString($content)); foreach ($originalContentByNewAttribute as $attributeName => $content) {
$matchRefs = $this->getMatchPositions($content, $terms);
$mergedRefs = $this->sortAndMergeMatchPositions($matchRefs);
$formatted = $this->formatTextUsingMatchPositions($mergedRefs, $content);
$entity->setAttribute($attributeName, new HtmlString($formatted));
}
} }
/** /**

2
resources/views/entities/list-item-basic.blade.php
View File

@ -2,7 +2,7 @@
<a href="{{ $entity->getUrl() }}" class="{{$type}} {{$type === 'page' && $entity->draft ? 'draft' : ''}} {{$classes ?? ''}} entity-list-item" data-entity-type="{{$type}}" data-entity-id="{{$entity->id}}"> <a href="{{ $entity->getUrl() }}" class="{{$type}} {{$type === 'page' && $entity->draft ? 'draft' : ''}} {{$classes ?? ''}} entity-list-item" data-entity-type="{{$type}}" data-entity-id="{{$entity->id}}">
<span role="presentation" class="icon text-{{$type}}">@icon($type)</span> <span role="presentation" class="icon text-{{$type}}">@icon($type)</span>
<div class="content"> <div class="content">
<h4 class="entity-list-item-name break-text">{{ $entity->name }}</h4> <h4 class="entity-list-item-name break-text">{{ $entity->preview_name ?? $entity->name }}</h4>
{{ $slot ?? '' }} {{ $slot ?? '' }}
</div> </div>
</a> </a>