Merge branch 'master' of https://mirror.ghproxy.com/https://github.com/mjsoftking/halo-theme-dream2.0

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}">
+            <th:block th:fragment="categories (categories, noLimit)">
-                <a class="level is-marginless" th:href="${category.status.permalink}">
+                <li th:each="category,itemIndex : ${categories}" th:unless="${itemIndex.index >= num && noLimit == null}">
-                    <span class="level-item" th:text="${category.spec.displayName}"></span>
+                    <a class="level is-marginless" th:href="${category.status.permalink}">
-                    <span class="level-item tag" th:text="${category.status.postCount}"></span>
+                        <span class="level-item" th:text="${category.spec.displayName}"></span>
-                </a>
+                        <span class="level-item tag" th:text="${category.status.postCount}"></span>
-            </li>
+                    </a>
+                    <ul th:if="${!#lists.isEmpty(category.children)}">
+                        <th:block th:replace="~{:: categories (${category.children}, true)}"/>
+                    </ul>
+                </li>
+            </th:block>
         </ul>
     </div>
-</div>
+</div>

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>
+</div>

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>
+</div>