From 6575aeac16fdab4c92eac56d201764d7dfc92648 Mon Sep 17 00:00:00 2001
From: mjsoftware <1406993111@qq.com>
Date: Fri, 19 Jul 2024 11:51:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E6=90=9C=E7=B4=A2=E7=95=8C?=
=?UTF-8?q?=E9=9D=A2=E6=94=AF=E6=8C=81=E6=9C=80=E5=A4=A7=E6=90=9C=E7=B4=A2?=
=?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=95=B0=E9=87=8F=E8=AE=BE=E7=BD=AE=EF=BC=8C?=
=?UTF-8?q?=E6=9C=AA=E8=BE=93=E5=85=A5=E5=86=85=E5=AE=B9=E5=92=8C=E8=BE=93?=
=?UTF-8?q?=E5=85=A5*=E5=8F=B7=E5=BC=80=E5=A4=B4=E6=8F=90=E7=A4=BA?=
=?UTF-8?q?=E6=96=87=E6=9C=AC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
settings.yaml | 8 ++++++++
templates/search.html | 3 ++-
theme.yaml | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/settings.yaml b/settings.yaml
index cbda10c..80aa426 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -1156,6 +1156,14 @@ spec:
value: '没有搜索结果'
height: 240px
help: '搜索页面-无搜索结果提示语，支持 HTML 格式。'
+ - $formkit: number
+ if: $get(search_enable).value
+ name: search_limit
+ validation: required
+ label: "搜索页面-搜索结果最大显示数量"
+ value: 10
+ height: 240px
+ help: '搜索页面-搜索结果最大显示数量。'
- group: enhance
label: '增强功能'
formSchema:
diff --git a/templates/search.html b/templates/search.html
index 1805e63..2e81320 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -19,7 +19,7 @@
// 阻止表单提交
event.preventDefault()
// 显示错误信息
- Qmsg.warning(!query ? '请输入搜索内容' : '搜索内容不能以 * 开头')
+ Qmsg.warning(!query ? '请输入内容' : '不能输入星号（*）作为内容开头')
return
}
if(DreamConfig.pjax_state) {
@@ -31,6 +31,7 @@
})
</script>
<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
id="halo-search-form-text-input"
class="text-input"
diff --git a/theme.yaml b/theme.yaml
index 6d32daa..4bb183d 100644
--- a/theme.yaml
+++ b/theme.yaml
@@ -30,7 +30,7 @@ spec:
settingName: theme-dream2-plus-setting
configMapName: theme-dream2-plus-configMap
# 版本号
- version: 1.2.6.beta6
+ version: 1.2.6.beta8
# 最低支持的 Halo 版本
require: ">=2.15.0"
# 许可