From 26a888002784eb7e08de872c17f1bd7ece16c5fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BE=A1=E7=BE=A1?= <xyhghy@outlook.com>
Date: Fri, 30 Jun 2023 10:55:54 +0800
Subject: [PATCH] =?UTF-8?q?Fix:=E4=BC=98=E5=8C=96=E6=9C=80=E6=96=B0?=
 =?UTF-8?q?=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/modules/widgets/aside/comments.html |  5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index cbc64ca9..f7379fbe 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -458,6 +458,11 @@ spec:
           label: 分类数量
           value: -1
           help: "小于 0 则展示全部分类"
+        - $formkit: number
+          name: newcommentnumber
+          label: 评论数量
+          value: 5
+          help: "最新评论数量, 小于 0 则展示5条评论"
 
     - group: footer
       label: 页脚
@@ -1398,11 +1403,6 @@ spec:
           label: Twikoo评论-mailMd5
           placeholder: 请输入mailMd5
           help: 注意格式 (`mailMd5`)
-        - $formkit: number
-          name: newcommentnumber
-          label: 评论数量
-          value: 5
-          help: "最新评论数量"
     - group: other
       label: 其他设置
       formSchema:
diff --git a/templates/modules/widgets/aside/comments.html b/templates/modules/widgets/aside/comments.html
index dbaec283..81026bc0 100644
--- a/templates/modules/widgets/aside/comments.html
+++ b/templates/modules/widgets/aside/comments.html
@@ -9,10 +9,13 @@
 </div>
 <script th:src="@{/assets/libs/twikoo/twikoo.all.min.js}"></script>
 <script th:if="${theme.config.comments.twikoo && #strings.equals(theme.config.comments.use, 'Twikoo') && not #strings.isEmpty(theme.config.comments.envId)}">
+    const pagesize = [[${theme.config.sidebar.newcommentnumber}]];
+    const defaultpagesize = 5;
+    const finalpagesize = pagesize <= 0 ? defaultpagesize : pagesize;
     twikoo.getRecentComments({
         envId: [[${ theme.config.comments.envId }]], // 环境 ID
         // region: 'ap-guangzhou', // 环境地域，默认为 ap-shanghai，如果您的环境地域不是上海，需传此参数
-        pageSize: [[${theme.config.comments.newcommentnumber}]], // 获取多少条，默认：10，最大：100
+        pageSize: finalpagesize, // 获取多少条，默认：10，最大：100
         includeReply: false // 是否包括最新回复，默认：false
     }).then(function (res) {
         let commenthtml = '';