From fd0f2737e8c634707e98c660f8df6936a05350a3 Mon Sep 17 00:00:00 2001
From: yangjian <3280350050@qq.com>
Date: Wed, 24 Jul 2019 17:46:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E6=A1=A3=E9=A1=B5?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app_doc/views.py              | 19 ++++++++++++-------
 template/app_doc/project.html | 31 +++++++++++++++++++++++--------
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/app_doc/views.py b/app_doc/views.py
index c1be29f..f2722ed 100644
--- a/app_doc/views.py
+++ b/app_doc/views.py
@@ -37,14 +37,19 @@ def project_index(request,pro_id):
     if request.method == 'GET':
         # 获取文集信息
         project = Project.objects.get(id=int(pro_id))
-        doc = Doc.objects.filter(top_doc=int(pro_id)).order_by('id')
-        # 获取文集第一篇文档作为默认内容
-        if doc.count() > 0:
-            doc = doc[0]
-        else:
-            doc = None
+        # 获取搜索词
+        kw = request.GET.get('kw','')
+        if kw == '':
+            doc = Doc.objects.filter(top_doc=int(pro_id)).order_by('id')
+            # 获取文集第一篇文档作为默认内容
+            if doc.count() > 0:
+                doc = doc[0]
+            else:
+                doc = None
+        else: # 搜索结果
+            search_result = Doc.objects.filter(top_doc=int(pro_id),pre_content__icontains=kw)
         # 获取文集下所有一级文档
-        project_docs = Doc.objects.filter(top_doc=int(pro_id),parent_doc=0)
+        project_docs = Doc.objects.filter(top_doc=int(pro_id), parent_doc=0)
         return render(request,'app_doc/project.html',locals())
     # 更新文集
     elif request.method == 'PUT':
diff --git a/template/app_doc/project.html b/template/app_doc/project.html
index 4a3967d..19b9e82 100644
--- a/template/app_doc/project.html
+++ b/template/app_doc/project.html
@@ -26,9 +26,11 @@
 <div class="doc">
     <!-- 左侧目录栏 -->
     <div class="doc-summary">
+        <form action="{% url 'pro_index' pro_id=project.id %}" method="get">
         <div id="doc-search-input">
-            <input type="text" placeholder="搜索文档" value="" class="layui-input doc-search-input">
+            <input type="text" name="kw" placeholder="输入并回车搜索" value="" class="layui-input doc-search-input">
         </div>
+        </form>
         <div class="project-title">
             <a href="{% url 'pro_index' pro_id=project.id %}">{{ project.name }}</a>
         </div>
@@ -101,22 +103,35 @@
                 <!-- 文档内容 -->
                 <div class="doc-content">
                     <div class="doc-info">
+                        {% if doc %}
                         <h1>{{ doc.name }}</h1>
-{#                        <p>创建时间：{{ doc.create_time }} 最后修改时间：{{ doc.modify_time }}</p>#}
                         <hr>
                         <p style="color: #cccccc;">
                             <i class="layui-icon layui-icon-date"></i> {{ doc.create_time }}&nbsp;&nbsp;&nbsp;&nbsp;
                             <i class="layui-icon layui-icon-user"></i> {{ doc.create_user.username }}
                         </p>
+                        {% else %}
+                            <h1>共有{{ search_result.count }}个搜索结果</h1>
+                            <hr>
+                        {% endif %}
                     </div>
                     <div class="markdown-body" id="content">
+                        {% if doc %}
 {#                        {{ doc.content | safe }}#}
-                        <style>
-                            ul.markdown-toc-list li,ul.markdown-toc-list > li > ul  li{
-                                list-style: none;
-                            }
-                        </style>
-                        <textarea id="" style="display: none;">{{ doc.pre_content }}</textarea>
+                            <style>
+                                ul.markdown-toc-list li,ul.markdown-toc-list > li > ul  li{
+                                    list-style: none;
+                                }
+                            </style>
+                            <textarea id="" style="display: none;">{{ doc.pre_content }}</textarea>
+                        {% else %}
+                            {% for result in search_result %}
+                                <div>
+                                    <h2><a href="{% url 'doc' pro_id=project.id doc_id=result.id %}">{{ result.name }}</a></h2>
+                                    <p>{{ result.pre_content|truncatechars:300 }}</p>
+                                </div>
+                            {% endfor %}
+                        {% endif %}
                     </div>
                 </div>
                 <!-- 文档目录 -->