From 0dcad3e16072cede4ee8d2506e23bae5a222a7e8 Mon Sep 17 00:00:00 2001
From: j m <1406993111@qq.com>
Date: Sun, 15 Sep 2024 20:01:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E8=AE=BA=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=96=B9=E5=BC=8F=E9=85=8D=E7=BD=AE=EF=BC=8C=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E8=AF=84=E8=AE=BA=E6=8F=92=E4=BB=B6=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=EF=BC=8C=E5=85=81=E8=AE=B8=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E8=AF=84=E8=AE=BA=E6=8F=92=E4=BB=B6=E5=B9=B6?=
 =?UTF-8?q?=E8=AE=BE=E4=B8=BA=E9=BB=98=E8=AE=A4=E8=AF=84=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml                | 10 ++++++++++
 templates/common/layout.html |  2 +-
 templates/links.html         |  4 ++--
 templates/main/article.html  |  4 ++--
 templates/moment.html        |  4 ++--
 templates/moments.html       |  4 ++--
 theme.yaml                   |  2 +-
 7 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index a30522a..42fca97 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -1256,6 +1256,16 @@ spec:
               label:  开启
             - value: false
               label:  关闭
+        - $formkit: radio
+          name: enable_comment_type
+          label:  评论加载方式
+          value: true
+          help: '在使用Halo评论组件时，建议您关闭Pjax加载功能以获得最佳体验。同时，Halo评论组件支持评论插件的新特性。而对于Web评论组件，它支持Pjax加载，但请注意，部分新特性可能不被Web评论组件所支持。'
+          options:
+            - value: true
+              label: Halo评论组件
+            - value: false
+              label: Web评论组件
         - $formkit: radio
           name: effects_lantern_mode
           id: effects_lantern_mode
diff --git a/templates/common/layout.html b/templates/common/layout.html
index 1fe9739..2de7478 100644
--- a/templates/common/layout.html
+++ b/templates/common/layout.html
@@ -2,7 +2,7 @@
       th:class="${theme.config.basic_style.theme_style}"
       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')}">
+      enableComment = ${baseEnableComment == true && site.comment.enable}">
 
   <th:block th:with="stats = ${siteStatsFinder.getStats()}">
     <th:block th:replace="~{common/head :: head}"/>
diff --git a/templates/links.html b/templates/links.html
index 8be17cb..9986237 100644
--- a/templates/links.html
+++ b/templates/links.html
@@ -49,7 +49,7 @@
         </div>
         <div class="card card-content comment-wrapper-z-index" id="comment-wrapper" th:if="${enableComment}">
             <h3 class="comment-title">评论</h3>
-            <th:block th:if="${theme.config.enhance.enable_pjax}">
+            <th:block th:unless="${theme.config.enhance.enable_comment_type}">
                 <th:block th:if="${theme.config.page_config.link_enable_comment == 'custom'}">
                     <comment-widget
                             group="content.halo.run"
@@ -69,7 +69,7 @@
                     ></comment-widget>
                 </th:block>
             </th:block>
-            <th:block th:unless="${theme.config.enhance.enable_pjax}">
+            <th:block th:if="${theme.config.enhance.enable_comment_type}">
                 <th:block th:if="${theme.config.page_config.link_enable_comment == 'custom'}">
                     <halo:comment
                             group="content.halo.run"
diff --git a/templates/main/article.html b/templates/main/article.html
index 56a4c7e..dbf759a 100644
--- a/templates/main/article.html
+++ b/templates/main/article.html
@@ -92,7 +92,7 @@
 
     <div class="card card-content comment-wrapper-z-index" id="comment-wrapper" th:if="${enableComment}">
         <h3 class="comment-title">评论</h3>
-        <th:block th:if="${theme.config.enhance.enable_pjax}">
+        <th:block th:unless="${theme.config.enhance.enable_comment_type}">
             <comment-widget
                     group="content.halo.run"
                     th:kind="${type}"
@@ -101,7 +101,7 @@
                     with-replies="false"
             ></comment-widget>
         </th:block>
-        <th:block th:unless="${theme.config.enhance.enable_pjax}">
+        <th:block th:if="${theme.config.enhance.enable_comment_type}">
             <halo:comment
                     group="content.halo.run"
                     th:kind="${type}"
diff --git a/templates/moment.html b/templates/moment.html
index f18940d..16e8964 100644
--- a/templates/moment.html
+++ b/templates/moment.html
@@ -57,7 +57,7 @@
         </div>
       </div>
       <div class="journal-comment comment-wrapper-z-index" th:if="${enableComment}">
-        <th:block th:if="${theme.config.enhance.enable_pjax}">
+        <th:block th:unless="${theme.config.enhance.enable_comment_type}">
           <comment-widget
                   group="moment.halo.run"
                   kind="Moment"
@@ -66,7 +66,7 @@
                   with-replies="false"
           ></comment-widget>
         </th:block>
-        <th:block th:unless="${theme.config.enhance.enable_pjax}">
+        <th:block th:if="${theme.config.enhance.enable_comment_type}">
           <halo:comment
                   group="moment.halo.run"
                   kind="Moment"
diff --git a/templates/moments.html b/templates/moments.html
index 1fff4d6..1d4f680 100644
--- a/templates/moments.html
+++ b/templates/moments.html
@@ -68,7 +68,7 @@
         </div>
       </div>
       <div class="journal-comment comment-wrapper-z-index" th:if="${enableComment}">
-        <th:block th:if="${theme.config.enhance.enable_pjax}">
+        <th:block th:unless="${theme.config.enhance.enable_comment_type}">
           <comment-widget
                   group="moment.halo.run"
                   kind="Moment"
@@ -77,7 +77,7 @@
                   with-replies="false"
           ></comment-widget>
         </th:block>
-        <th:block th:unless="${theme.config.enhance.enable_pjax}">
+        <th:block th:if="${theme.config.enhance.enable_comment_type}">
           <halo:comment
                   group="moment.halo.run"
                   kind="Moment"
diff --git a/theme.yaml b/theme.yaml
index 75389fc..bc52da9 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.9.beta1
+  version: 1.3.0
   # 最低支持的 Halo 版本
   require: ">=2.19.0"
   # 许可