From ec253ed2f385590059bc4a6fc8dfb08a15a429c6 Mon Sep 17 00:00:00 2001
From: stonewu <me@stonewu.com>
Date: Thu, 10 Aug 2023 17:11:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=80=E8=BF=91=E8=AF=84?=
 =?UTF-8?q?=E8=AE=BA=E9=81=8D=E5=8E=86=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/assets/js/utils.js                  | 10 +++++-----
 templates/modules/widgets/aside/comments.html | 11 +----------
 templates/modules/widgets/console.html        | 11 ++++++++++-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/templates/assets/js/utils.js b/templates/assets/js/utils.js
index 8657b343..a05378c7 100644
--- a/templates/assets/js/utils.js
+++ b/templates/assets/js/utils.js
@@ -3,7 +3,7 @@ var btf = {
 
 
     // 修改时间显示"最近"
-    diffDate: function (d, more = false) {
+    diffDateExact: function (d, more = false) {
         const dateNow = new Date();
         const datePost = new Date(d);
         const dateDiff = dateNow.getTime() - datePost.getTime();
@@ -265,11 +265,11 @@ var btf = {
             } else if (dayCount >= 1) {
                 result = parseInt(dayCount) + '' + GLOBAL_CONFIG.date_suffix.day
             } else if (hourCount >= 1) {
-                result = '最近'
-                // result = parseInt(hourCount) + ' ' + GLOBAL_CONFIG.date_suffix.hour
+                // result = '最近'
+                result = parseInt(hourCount) + ' ' + GLOBAL_CONFIG.date_suffix.hour
             } else if (minuteCount >= 1) {
-                result = '最近'
-                // result = parseInt(minuteCount) + ' ' + GLOBAL_CONFIG.date_suffix.min
+                // result = '最近'
+                result = parseInt(minuteCount) + ' ' + GLOBAL_CONFIG.date_suffix.min
             } else {
                 result = GLOBAL_CONFIG.date_suffix.just
             }
diff --git a/templates/modules/widgets/aside/comments.html b/templates/modules/widgets/aside/comments.html
index 1991a957..fcf97fca 100644
--- a/templates/modules/widgets/aside/comments.html
+++ b/templates/modules/widgets/aside/comments.html
@@ -5,7 +5,7 @@
     <div class="item-headline"><i class="iconfont icon-comment-dots"></i><span>最新评论</span></div>
     <div class="aside-list" id="newcomm">
         <th:block th:if="${#strings.equals(theme.config.comments.use, 'commentWidget') }">
-            <div class="aside-list-item"  th:each="comment : ${commentFinder.list(null, 1, 10)}" th:with="post = ${postFinder.getByName(comment.spec.subjectRef.name)}" >
+            <div class="aside-list-item"  th:each="comment,iterStat : ${commentFinder.list(null, 1, 10)}" th:with="post = ${postFinder.getByName(comment.spec.subjectRef.name)}"  th:if="${iterStat.index < 5}">
                 <a class="thumbnail" th:href="${post.status.permalink + '#comment-' + comment.metadata.name}" data-pjax-state="">
                     <img loading="lazy" alt="头像" th:src="${#strings.isEmpty(comment.owner.avatar)?'https://cravatar.cn/avatar/?d=mp':comment.owner.avatar}" data-ll-status="loading" class="entered loading">
                 </a>
@@ -20,15 +20,6 @@
                     </div>
                 </div>
             </div>
-            <script data-pjax>
-                window.addEventListener('load', () => {
-                    $(".aside-list time").each(function () {
-                        var timeVal = $(this).attr("datetime");
-                        $(this).text(btf.diffDate(timeVal,true));
-                        console.log(1);
-                    })
-                });
-            </script>
         </th:block>
 
         <script th:if="${theme.config.comments.twikooEnable && #strings.equals(theme.config.comments.use, 'Twikoo') && not #strings.isEmpty(theme.config.comments.twikoos.envId)}">
diff --git a/templates/modules/widgets/console.html b/templates/modules/widgets/console.html
index 9d6faae7..3ef5cb5b 100644
--- a/templates/modules/widgets/console.html
+++ b/templates/modules/widgets/console.html
@@ -16,7 +16,7 @@
         </div>
         <div class="aside-list">
           <th:block th:if="${#strings.equals(theme.config.comments.use, 'commentWidget') }">
-            <div class="aside-list-item"  th:each="comment : ${commentFinder.list(null, 1, 10)}" th:with="post = ${postFinder.getByName(comment.spec.subjectRef.name)}">
+            <div class="aside-list-item"  th:each="comment,iterStat : ${commentFinder.list(null, 1, 10)}" th:with="post = ${postFinder.getByName(comment.spec.subjectRef.name)}" th:if="${iterStat.index < 4}">
               <a th:href="${post.status.permalink + '#comment-' + comment.metadata.name}" class="thumbnail"  data-pjax-state="">
                 <img th:src="${#strings.isEmpty(comment.owner.avatar)?'https://cravatar.cn/avatar/?d=mp':comment.owner.avatar}"
                       th:alt="${comment.owner.displayName}" data-ll-status="loaded" class="entered loaded">
@@ -27,6 +27,15 @@
                 <time th:datetime="${#dates.format(comment.metadata.creationTimestamp, 'yyyy-MM-dd HH:mm:ss')}"></time>
               </div>
             </div>
+            <script data-pjax>
+              window.addEventListener('load', () => {
+                $(".aside-list time").each(function () {
+                  var timeVal = $(this).attr("datetime");
+                  $(this).text(btf.diffDateExact(timeVal,true));
+                  console.log(1);
+                })
+              });
+            </script>
           </th:block>
           <span th:if="${#strings.equals(theme.config.comments.use, 'Twikoo') }">正在加载中...</span></div>
       </div>