Mao 4 лет назад
Родитель
Сommit
d16f4d4541

+ 6 - 1
packages/app/src/components/SearchPage/SearchResultList.jsx

@@ -11,7 +11,12 @@ class SearchResultList extends React.Component {
       const pageId = `#${page._id}`;
       let snippet = '';
       if (page.snippet == null) {
-        snippet = page.contentWithNoKeyword;
+        if (page.contentWithNoKeyword.length >= 40) {
+          snippet = page.contentWithNoKeyword.substr(0, 40);
+        }
+        else {
+          snippet = page.contentWithNoKeyword;
+        }
       }
       else {
         snippet = page.snippet;

+ 5 - 1
packages/app/src/server/routes/search.js

@@ -158,7 +158,7 @@ module.exports = function(crowi, app) {
         },
       };
       const myXss = new xss.FilterXSS(options);
-      // add tags and snippet data/contentWithNoKeyword to result pages
+      // add tags snippet data/contentWithNoKeyword and mattched page name to result pages
       await Promise.all(findResult.pages.map(async(page) => {
         const data = esResult.data.find((data) => { return page.id === data._id });
         page._doc.tags = data._source.tag_names;
@@ -170,6 +170,10 @@ module.exports = function(crowi, app) {
           const snippet = data._highlight['body.en'] == null ? data._highlight['body.ja'] : data._highlight['body.en'];
           page._doc.snippet = myXss.process(snippet);
         }
+        if (data._highlight['path.en'] !== null && data._highlight['path.ja'] !== null) {
+          const pathMatch = data._highlight['path.en'] == null ? data._highlight['path.ja'] : data._highlight['path.en'];
+          page._doc.mattchedPath = pathMatch;
+        }
         return page;
       }));
 

+ 1 - 1
packages/app/src/styles/theme/_apply-colors.scss

@@ -592,7 +592,7 @@ body.pathname-sidebar {
   .search-result-list {
     .page-list {
       .highlighted-keyword {
-        background: linear-gradient(transparent 60%, $bgcolor-keyword-highlighted 60%);
+        background-color: $bgcolor-keyword-highlighted;
       }
       .page-list-ul {
         > li.nav-item > a.nav-link {