From 0f0e0c6482dbdb7a02caa255899468bd338ea171 Mon Sep 17 00:00:00 2001
From: yangjian <zmister@qq.com>
Date: Mon, 22 Mar 2021 22:54:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E9=9B=86=E5=86=85?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app_doc/views.py                         | 1 +
 template/app_doc/docs_base.html          | 2 +-
 template/app_doc/project_doc_search.html | 9 ++++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app_doc/views.py b/app_doc/views.py
index 2209779..94002c3 100644
--- a/app_doc/views.py
+++ b/app_doc/views.py
@@ -381,6 +381,7 @@ def project_index(request,pro_id):
         # ).values('id','name','top_doc').order_by('sort')
         if kw != '':
             search_result = Doc.objects.filter(top_doc=int(pro_id),pre_content__icontains=kw)
+            remove_markdown_tag(search_result)
             return render(request,'app_doc/project_doc_search.html',locals())
         return render(request, 'app_doc/project.html', locals())
     except Exception as e:
diff --git a/template/app_doc/docs_base.html b/template/app_doc/docs_base.html
index 088e305..6741603 100644
--- a/template/app_doc/docs_base.html
+++ b/template/app_doc/docs_base.html
@@ -46,7 +46,7 @@
         <!-- 文档搜索 -->
         <form action="{% url 'pro_index' pro_id=project.id %}" method="get">
             <div id="doc-search-input">
-                <input type="text" name="kw" placeholder="{% trans '输入并回车搜索' %}" value="" class="layui-input doc-search-input">
+                <input type="text" name="kw" placeholder="{% trans '在文集内搜索文档' %}" value="" class="layui-input doc-search-input">
             </div>
         </form>
         <!-- 文集名称 -->
diff --git a/template/app_doc/project_doc_search.html b/template/app_doc/project_doc_search.html
index 6b87f7f..23c1dd0 100644
--- a/template/app_doc/project_doc_search.html
+++ b/template/app_doc/project_doc_search.html
@@ -15,7 +15,7 @@
 {% endblock %}
 
 {% block content_head %}
-    <h1>{% trans "搜索" %} {{kw}} {% trans "共有" %}{{ search_result.count }}{% trans "个结果" %} - {{project.name}}</h1><hr>
+    <h1>{% trans "搜索" %} {{kw}} {% trans "共有" %}{{ search_result.count }}{% trans "个结果" %}</h1><hr>
 {% endblock %}
 
 {% block page_content %}
@@ -24,5 +24,12 @@
             <p><a href="{% url 'doc' pro_id=project.id doc_id=result.id %}" target="_blank">{{ result.name }}</a> - <span style="font-size: 14px;color: #999;">{{result.modify_time}}</span></p>
             <p>{{ result.pre_content|truncatechars:300 }}</p>
         </div>
+        <hr>
     {% endfor %}
+{% endblock %}
+
+{% block custom_script %}
+<script>
+    keyLight('doc-content','{{kw}}')
+</script>
 {% endblock %}
\ No newline at end of file