From 054e11f4b85b20dea62973abedac7f6c5f434d81 Mon Sep 17 00:00:00 2001
From: mjsoftware <1406993111@qq.com>
Date: Wed, 13 Mar 2024 16:44:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=AC=A1=E6=95=B0=E6=98=BE=E7=A4=BAhalo?=
 =?UTF-8?q?=E7=9A=84=E9=98=85=E8=AF=BB=E7=BB=9F=E8=AE=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml                 | 46 ++++++++++++++++++++++++++---------
 templates/common/footer.html  |  6 ++---
 templates/common/scripts.html |  2 +-
 3 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index 6d7400c..eb28837 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -1268,18 +1268,40 @@ spec:
               validation: required
               help: 请选择结束时间，结束时间须大于开始时间，不包含结束时间。
               label: 灰色模式 - 结束时间
-        - $formkit: radio
-          name: enable_busuanzi
-          label:  开启 busuanzi 访客统计
-          value: true
-          help: '隐藏时不显示统计信息，但依旧会请求 busuanzi 统计访客信息。'
-          options:
-            - value: true
-              label:  开启
-            - value: hide
-              label: 隐藏
-            - value: false
-              label:  关闭
+        - $formkit: group
+          name: busuanzi_group
+          label: busuanzi 访客统计
+          value:
+            enable_gray_mode: false
+            gray_mode_start_time:
+            gray_mode_end_time:
+          children:
+            - $formkit: radio
+              name: enable_busuanzi
+              id: enable_busuanzi
+              label: 开启 busuanzi
+              value: true
+              help: '隐藏时不显示统计信息，但依旧会请求 busuanzi 统计访客信息。'
+              options:
+                - value: true
+                  label: 开启
+                - value: hide
+                  label: 隐藏
+                - value: false
+                  label: 关闭
+            - $formkit: radio
+              name: busuanzi_pv_use_halo
+              if: $get(enable_busuanzi).value === true
+              label: busuanzi 的访问次数显示模式
+              help: '可以择优选择统计次数的显示。'
+              value: busuanzi
+              options:
+                - value: halo
+                  label: Halo统计
+                - value: busuanzi
+                  label: busuanzi统计
+                - value: false
+                  label: 不显示
 #        - $formkit: radio
 #          name: enable_baidu_push
 #          label:  启用百度 URL 自动推送
diff --git a/templates/common/footer.html b/templates/common/footer.html
index a0804bd..f9cc5db 100644
--- a/templates/common/footer.html
+++ b/templates/common/footer.html
@@ -18,12 +18,12 @@
                   th:text="${theme.config.basic_info.record_number}"></a><span th:unless="${theme.config.basic_info.footer_hide_theme_info}" class="footer-truncation">Powered by <a class="powered" href="https://halo.run/" target="_blank">Halo</a> & <a class="powered" href="https://github.com/nineya/halo-theme-dream2.0" target="_blank">Dream</a></span></p>
               <p class="icon-spot" th:if="${!#strings.isEmpty(theme.config.basic_info.website_time) || theme.config.enhance.enable_busuanzi == true}">
                 <span th:if="${!#strings.isEmpty(theme.config.basic_info.website_time)}" id="websiteDate">建站<span class="stand">00</span>天<span class="stand">0</span>时<span class="stand">0</span>分<span class="stand">0</span>秒</span>
-                <span th:if="${theme.config.enhance.enable_busuanzi == true}" class="icon-spot footer-truncation">
+                <span th:if="${theme.config.enhance.busuanzi_group.enable_busuanzi == true}" class="icon-spot footer-truncation">
                             <span id="busuanzi_container_site_uv" style="display: none">
                               <i class="ri-account-circle-line" aria-hidden="true"></i><span class="stand" id="busuanzi_value_site_uv">0</span>访客
                             </span>
-                            <span id="busuanzi_container_site_pv" style="display: none">
-                              <i class="ri-pie-chart-line" aria-hidden="true"></i><span class="stand" id="busuanzi_value_site_pv">0</span>访问
+                            <span th:unless="${theme.config.enhance.busuanzi_group.busuanzi_pv_use_halo == false}" id="busuanzi_container_site_pv" style="display: none">
+                              <i class="ri-pie-chart-line" aria-hidden="true"></i><span class="stand" th:id="${theme.config.enhance.busuanzi_group.busuanzi_pv_use_halo == 'busuanzi' ? 'busuanzi_value_site_pv' : 'halo_value_site_pv'}">[[${stats.visit}]]</span>访问
                             </span>
                         </span>
               </p>
diff --git a/templates/common/scripts.html b/templates/common/scripts.html
index fc9e9ce..02501ac 100644
--- a/templates/common/scripts.html
+++ b/templates/common/scripts.html
@@ -27,7 +27,7 @@
 
     <script th:if="${isPost == true || isPhotos == true}" data-pjax async th:src="@{/assets/lib/fancybox@5.3.7/jquery.fancybox.min.js}"></script>
 
-    <script th:if="${theme.config.enhance.enable_busuanzi != false}" async src="https://busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js"></script>
+    <script th:if="${theme.config.enhance.busuanzi_group.enable_busuanzi != false}" async src="https://busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js"></script>
 
     [(${theme.config.custom.external_js_body})]
     <script th:if="${!#strings.isEmpty(theme.config.custom.inline_js_body)}" type="text/javascript" th:utext="${theme.config.custom.inline_js_body}">