From 31052df05b274f8f1a1c7d4dd5e9395267ea8c82 Mon Sep 17 00:00:00 2001
From: mjking <1406993111@qq.com>
Date: Mon, 29 Jan 2024 17:42:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix=EF=BC=9A=E6=A0=87=E7=AD=BE=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E6=98=BE=E7=A4=BA=E9=85=8D=E7=BD=AE=E9=A1=B9=E6=9C=AA?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/widget/tags.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/widget/tags.html b/templates/widget/tags.html
index d08cb49..83f0a98 100644
--- a/templates/widget/tags.html
+++ b/templates/widget/tags.html
@@ -7,7 +7,7 @@
      enableTagsColor = ${theme.config.sidebar.enable_tag_color}">
     <div class="card-title">
         <i class="ri-price-tag-3-line card-title-label"></i><span>标签</span>
-        <a th:if="${tags.hasNext}" class="card-more" th:href="@{/tags}">更多<i class="ri-arrow-right-double-line"></i></a>
+        <a th:if="${tags.hasNext && theme.config.sidebar.tags_more}" class="card-more" th:href="@{/tags}">更多<i class="ri-arrow-right-double-line"></i></a>
     </div>
     <div th:if="${isEmpty}" class="card-empty">暂无标签</div>
     <div th:unless="${isEmpty}" class="card-content">
@@ -17,4 +17,4 @@
           th:text="${tag.spec.displayName}"
           th:style="${(enableTagsColor && tag.spec.color != '#ffffff')? 'color: ' + tag.spec.color +'; border-color: ' + tag.spec.color +'; background: ' + tag.spec.color +'20;' : ''}"></a>
     </div>
-</div>
\ No newline at end of file
+</div>

From 962e34fc3f88a406b455518601d6953f657d411b Mon Sep 17 00:00:00 2001
From: mjking <1406993111@qq.com>
Date: Mon, 29 Jan 2024 17:43:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=A0=87=E7=AD=BE=E4=BA=91=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E6=98=BE=E7=A4=BA=E9=85=8D=E7=BD=AE=E9=A1=B9=E6=9C=AA?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/widget/tagcloud.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/widget/tagcloud.html b/templates/widget/tagcloud.html
index 42c26c8..7c97c0f 100644
--- a/templates/widget/tagcloud.html
+++ b/templates/widget/tagcloud.html
@@ -8,7 +8,7 @@
 
     <div class="card-title">
         <i class="ri-cloud-line card-title-label"></i><span>标签云</span>
-        <a th:if="${tags.hasNext}" class="card-more" th:href="@{/tags}">更多<i class="ri-arrow-right-double-line"></i></a>
+        <a th:if="${tags.hasNext && theme.config.sidebar.tagcloud_more}" class="card-more" th:href="@{/tags}">更多<i class="ri-arrow-right-double-line"></i></a>
     </div>
     <div th:if="${isEmpty}" class="card-empty">暂无标签</div>
     <div th:unless="${isEmpty}" class="card-content">
@@ -19,4 +19,4 @@
           th:with="size = ${#strings.length(tag.spec.displayName) + #strings.length(tag.spec.slug) + tag.postCount}"
           th:style="'font-size: ' + ${size < 14 ? 14 : size > 32 ? 32 : size} + 'px;' + ${(enableTagsColor && tag.spec.color != '#ffffff')? 'color: ' + tag.spec.color +';' : ''}"></a>
     </div>
-</div>
\ No newline at end of file
+</div>

From 84ab95cee3e373fbe77efedf0ae9178fb33fb65a Mon Sep 17 00:00:00 2001
From: mjking <1406993111@qq.com>
Date: Mon, 29 Jan 2024 17:44:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E4=BE=A7=E8=BE=B9=E6=A0=8F-?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=94=AF=E6=8C=81=E6=A0=91=E7=8A=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/widget/categories.html | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/templates/widget/categories.html b/templates/widget/categories.html
index aea9ef9..8cb5122 100644
--- a/templates/widget/categories.html
+++ b/templates/widget/categories.html
@@ -2,22 +2,27 @@
      th:fragment="widget (hide)"
      th:class="'card widget ' + ${hide}"
      th:with="num = ${#strings.isEmpty(theme.config.sidebar.categories_num)? 10 : T(java.lang.Integer).parseInt(theme.config.sidebar.categories_num)},
-     categories = ${categoryFinder.list(1,num)},
+     categories = ${categoryFinder.listAsTree()},
      isEmpty = ${#lists.isEmpty(categories)}">
     <div class="card-title">
         <i class="ri-apps-line card-title-label"></i><span>分类</span>
-        <a th:if="${categories.hasNext}" class="card-more" th:href="@{/categories}">更多<i
+        <a th:if="${#lists.size(categories) > num && theme.config.sidebar.categories_more}" class="card-more" th:href="@{/categories}">更多<i
                 class="ri-arrow-right-double-line"></i></a>
     </div>
     <div th:if="${isEmpty}" class="card-empty">暂无分类</div>
     <div th:unless="${isEmpty}" class="card-content">
         <ul class="menu-list">
-            <li th:each="category : ${categories}">
-                <a class="level is-marginless" th:href="${category.status.permalink}">
-                    <span class="level-item" th:text="${category.spec.displayName}"></span>
-                    <span class="level-item tag" th:text="${category.status.postCount}"></span>
-                </a>
-            </li>
+            <th:block th:fragment="categories (categories, noLimit)">
+                <li th:each="category,itemIndex : ${categories}" th:unless="${itemIndex.index >= num && noLimit == null}">
+                    <a class="level is-marginless" th:href="${category.status.permalink}">
+                        <span class="level-item" th:text="${category.spec.displayName}"></span>
+                        <span class="level-item tag" th:text="${category.status.postCount}"></span>
+                    </a>
+                    <ul th:if="${!#lists.isEmpty(category.children)}">
+                        <th:block th:replace="~{:: categories (${category.children}, true)}"/>
+                    </ul>
+                </li>
+            </th:block>
         </ul>
     </div>
-</div>
\ No newline at end of file
+</div>