Merge pull request #24 from zsjy/dev

Dev
This commit is contained in:
mjking 2024-07-21 11:05:51 +08:00 committed by GitHub
commit 3608f7837e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 14 deletions

View File

@ -1156,6 +1156,14 @@ spec:
value: '没有搜索结果' value: '没有搜索结果'
height: 240px height: 240px
help: '搜索页面-无搜索结果提示语,支持 HTML 格式。' help: '搜索页面-无搜索结果提示语,支持 HTML 格式。'
- $formkit: number
if: $get(search_enable).value
name: search_limit
validation: required
label: "搜索页面-搜索结果最大显示数量"
value: 10
height: 240px
help: '搜索页面-搜索结果最大显示数量。'
- group: enhance - group: enhance
label: '增强功能' label: '增强功能'
formSchema: formSchema:

View File

@ -3,17 +3,8 @@
th:fragment="layout (title, canonical, content, isPost)"> th:fragment="layout (title, canonical, content, isPost)">
<th:block th:with="contributor = ${contributorFinder.getContributor(theme.config.basic_info.metadata_name)}, <th:block th:with="contributor = ${contributorFinder.getContributor(theme.config.basic_info.metadata_name)},
enableComment = ${baseEnableComment == true && site.comment.enable && pluginFinder.available('PluginCommentWidget')}"> enableComment = ${baseEnableComment == true && site.comment.enable && pluginFinder.available('PluginCommentWidget')}">
<th:block th:if="${!#strings.equals('',param._pjax)}">
<th:block th:replace="~{common/head :: head}"/> <th:block th:with="stats = ${siteStatsFinder.getStats()}">
<body>
<div class="column-main">
<th:block th:replace="${content}"/>
</div>
<th:block th:replace="~{common/scripts}"/>
</body>
</th:block>
<th:block th:unless="${!#strings.equals('',param._pjax)}"
th:with="stats = ${siteStatsFinder.getStats()}">
<th:block th:replace="~{common/head :: head}"/> <th:block th:replace="~{common/head :: head}"/>
<body> <body>
<th:block th:replace="~{common/navbar}"/> <th:block th:replace="~{common/navbar}"/>

View File

@ -19,7 +19,7 @@
// 阻止表单提交 // 阻止表单提交
event.preventDefault() event.preventDefault()
// 显示错误信息 // 显示错误信息
Qmsg.warning(!query ? '请输入搜索内容' : '搜索内容不能以 * 开头') Qmsg.warning(!query ? '请输入内容' : '不能输入星号(*)作为内容开头')
return return
} }
if(DreamConfig.pjax_state) { if(DreamConfig.pjax_state) {
@ -31,6 +31,7 @@
}) })
</script> </script>
<form id="halo-search-form" class="search-form-inner" method="get" action="/search" role="search"> <form id="halo-search-form" class="search-form-inner" method="get" action="/search" role="search">
<input type="hidden" name="limit" th:value="${theme.config.page_config.search.search_limit}">
<input <input
id="halo-search-form-text-input" id="halo-search-form-text-input"
class="text-input" class="text-input"
@ -50,7 +51,9 @@
<a th:href="${hit.permalink}" th:target="${theme.config.page_config.search.search_target}" > <a th:href="${hit.permalink}" th:target="${theme.config.page_config.search.search_target}" >
<div class="card-content main"> <div class="card-content main">
<h2 class="title" th:utext="${hit.title}"></h2> <h2 class="title" th:utext="${hit.title}"></h2>
<div class="main-content not-toc" th:utext="${hit.description}"></div> <div class="main-content not-toc">
<span th:utext="${hit.description}"></span>
</div>
<hr/> <hr/>
<div class="meta"> <div class="meta">
<div></div> <div></div>

View File

@ -30,7 +30,7 @@ spec:
settingName: theme-dream2-plus-setting settingName: theme-dream2-plus-setting
configMapName: theme-dream2-plus-configMap configMapName: theme-dream2-plus-configMap
# 版本号 # 版本号
version: 1.2.6.beta6 version: 1.2.6.beta9
# 最低支持的 Halo 版本 # 最低支持的 Halo 版本
require: ">=2.15.0" require: ">=2.15.0"
# 许可 # 许可