Merge pull request #24 from zsjy/dev

Dev
2025-03-15 16:39:40 +08:00 · 2024-07-21 11:05:51 +08:00 · 2024-07-21 11:05:51 +08:00 · 3608f7837e
commit 3608f7837e
parent b2dc9e99dd 2d0d35ffe5
4 changed files with 16 additions and 14 deletions
--- 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:
--- a/templates/common/layout.html
+++ b/templates/common/layout.html
@ -3,17 +3,8 @@
      th:fragment="layout (title, canonical, content, isPost)">
 <th:block th:with="contributor = ${contributorFinder.getContributor(theme.config.basic_info.metadata_name)},
      enableComment = ${baseEnableComment == true && site.comment.enable && pluginFinder.available('PluginCommentWidget')}">
-  <th:block th:if="${!#strings.equals('',param._pjax)}">
-    <th:block th:replace="~{common/head :: head}"/>
-    <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:with="stats = ${siteStatsFinder.getStats()}">
    <th:block th:replace="~{common/head :: head}"/>
    <body>
    <th:block th:replace="~{common/navbar}"/>
--- 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"
@ -50,7 +51,9 @@
      <a th:href="${hit.permalink}" th:target="${theme.config.page_config.search.search_target}" >
        <div class="card-content main">
          <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/>
          <div class="meta">
            <div></div>
--- 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.beta9
  # 最低支持的 Halo 版本
  require: ">=2.15.0"
  # 许可