zhangyuheng/MrDoc
1
0
Fork 0
forked from mirror/MrDoc
Code Pull Requests Activity

新增站点文档搜索的「匹配搜索」功能和切换开关

Browse Source
This commit is contained in:
zmister 2021-07-08 14:55:59 +08:00
parent 1561b8851c
commit 8045394eb7
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -3,6 +3,7 @@
### v0.6.9 2021-07
- [新增]后台管理中心的图片管理和附件管理功能；
- [新增]站点搜索中文档搜索支持「全文搜索」和「匹配搜索」功能和切换开关；
- [修复]vditor编辑器粘贴多图片文本时图片只有一张图的问题;
- [修复]找回密码邮件发送失败的问题；
- [优化]个人中心我协作的文集页面及功能；

15
template/app_doc/search_result.html
View File

@ -17,6 +17,9 @@
<link href="{% static 'mrdoc/mrdoc-search-result.css' %}?version={{mrdoc_version}}" rel="stylesheet">
<link rel="icon" href="{% static 'search/mrdoc_logo_300.png' %}" sizes="192x192" />
<style>
.layui-form-switch{
margin-top: 0px !important;
}
</style>
</head>
<body class="layui-container">
@ -146,7 +149,10 @@
</div>
</div>
<!-- 筛选结束 -->
<div class="layui-input-inline" style="float: right;">
<div class="layui-input-inline" style="float: right;display: flex;">
<div class="layui-input-inline">
<input type="checkbox" name="switch" lay-filter="search_match" lay-skin="switch" lay-text="精准搜索|全文搜索">
</div>
<select name="d_range" lay-verify="sel_recent" id="sel_recent">
<option value="">{% trans "时间筛选" %}</option>
<option value="all">{% trans "全部时间" %}</option>
@ -329,10 +335,15 @@
// 侦听Select下拉框的选择事件
form.on('select()', function(data){
var filter_data = form.val("filter-time-form");
console.log(filter_data)
// console.log(filter_data)
window.location.href = '{% url "search" %}?kw={{kw}}&type={{search_type}}' + '&d_range=' + filter_data['d_range']
});
// 切换到匹配搜索
form.on('switch(search_match)', function(data){
window.location.href = "{% url 'doc_search' %}?q={{kw}}&d_range={{d_range}}";
});
// 当前搜索类型动态设置
tagCurrentSearchType = function(){
if('{{ search_type }}' == 'doc'){

15
template/search/search.html
View File

@ -17,6 +17,9 @@
<link href="{% static 'mrdoc/mrdoc-search-result.css' %}?version={{mrdoc_version}}" rel="stylesheet">
<link rel="icon" href="{% static 'search/mrdoc_logo_300.png' %}" sizes="192x192" />
<style>
.layui-form-switch{
margin-top: 0px !important;
}
</style>
</head>
<body class="layui-container">
@ -142,7 +145,10 @@
</div>
</div>
<!-- 筛选结束 -->
<div class="layui-input-inline" style="float: right;">
<div class="layui-input-inline" style="float: right;display: flex;">
<div class="layui-input-inline">
<input type="checkbox" name="switch" lay-filter="search_match" lay-skin="switch" lay-text="全文搜索|精准搜索">
</div>
<select name="d_range" lay-verify="sel_recent" id="sel_recent">
<option value="">{% trans "时间筛选" %}</option>
<option value="all">{% trans "全部时间" %}</option>
@ -273,10 +279,15 @@
// 侦听Select下拉框的选择事件
form.on('select()', function(data){
var filter_data = form.val("filter-time-form");
console.log(filter_data)
// console.log(filter_data)
window.location.href = '?q={{query}}&d_range=' + filter_data['d_range']
});
// 切换到匹配搜索
form.on('switch(search_match)', function(data){
window.location.href = "{% url 'search' %}?kw={{query}}&type=doc&d_range={{d_range}}";
});
// 当前搜索类型动态设置
tagCurrentSearchType = function(){
if('{{ search_type }}' == 'doc'){