fix: timeline ui 重构

feat: extract timeline tag item component

backend/src/main/java/com/openisle/mapper/UserMapper.java

@@ -24,8 +24,8 @@ public class UserMapper {
   private final PostReadService postReadService;
   private final LevelService levelService;
   private final MedalService medalService;
-  private final TagMapper tagMapper;
   private final CategoryMapper categoryMapper;
+  private final TagMapper tagMapper;
 
   @Value("${app.snippet-length}")
   private int snippetLength;
@@ -93,11 +93,8 @@ public class UserMapper {
     dto.setCreatedAt(post.getCreatedAt());
     dto.setCategory(categoryMapper.toDto(post.getCategory()));
     dto.setTags(post.getTags().stream().map(tagMapper::toDto).collect(Collectors.toList()));
-    if (post.getLastReplyAt() == null) {
-      commentService.updatePostCommentStats(post);
-    }
-    dto.setCommentCount(post.getCommentCount());
     dto.setViews(post.getViews());
+    dto.setCommentCount(post.getCommentCount());
     return dto;
   }
 

backend/src/test/java/com/openisle/controller/UserControllerTest.java

@@ -8,6 +8,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import com.openisle.dto.CommentInfoDto;
 import com.openisle.dto.PostMetaDto;
 import com.openisle.dto.UserDto;
+import com.openisle.mapper.CategoryMapper;
 import com.openisle.mapper.TagMapper;
 import com.openisle.mapper.UserMapper;
 import com.openisle.model.User;
@@ -64,6 +65,9 @@ class UserControllerTest {
   @MockBean
   private TagMapper tagMapper;
 
+  @MockBean
+  private CategoryMapper categoryMapper;
+
   @Test
   void getCurrentUser() throws Exception {
     User u = new User();

frontend_nuxt/components/BaseTimeline.vue

@@ -95,7 +95,7 @@ export default {
 }
 
 .timeline-item:last-child::before {
-  display: none;
+  bottom: 0px;
 }
 
 .timeline-content {

frontend_nuxt/components/ProfileTimelineCommentGroup.vue

@@ -1,168 +0,0 @@
-<template>
-  <div class="timeline-container">
-    <div class="timeline-header">
-      <div class="timeline-title">{{ headerText }}</div>
-      <div class="timeline-date">{{ headerDate }}</div>
-    </div>
-    <div class="comment-content">
-      <div v-for="entry in entries" :key="entry.comment.id" class="comment-content-item">
-        <div class="comment-content-item-main">
-          <comment-one class="comment-content-item-icon" />
-          <template v-if="!entry.comment.parentComment">
-            <span class="comment-prefix">
-              在
-              <NuxtLink :to="entry.postLink" class="timeline-link">
-                {{ entry.comment.post.title }}
-              </NuxtLink>
-              下评论了
-            </span>
-            <NuxtLink :to="entry.commentLink" class="timeline-comment-link">
-              {{ stripContent(entry.comment.content) }}
-            </NuxtLink>
-          </template>
-          <template v-else>
-            <span class="comment-prefix">
-              在
-              <NuxtLink :to="entry.postLink" class="timeline-link">
-                {{ entry.comment.post.title }}
-              </NuxtLink>
-              下对
-              <NuxtLink :to="entry.parentLink" class="timeline-link">
-                {{ stripContent(entry.comment.parentComment.content) }}
-              </NuxtLink>
-              回复了
-            </span>
-            <NuxtLink :to="entry.commentLink" class="timeline-comment-link">
-              {{ stripContent(entry.comment.content) }}
-            </NuxtLink>
-          </template>
-        </div>
-        <div class="timeline-date">{{ formatDate(entry.createdAt) }}</div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { computed } from 'vue'
-import { stripMarkdownLength } from '~/utils/markdown'
-import TimeManager from '~/utils/time'
-
-const props = defineProps({
-  item: {
-    type: Object,
-    required: true,
-  },
-})
-
-const entries = computed(() =>
-  (props.item.entries || []).map((entry) => ({
-    ...entry,
-    postLink: `/posts/${entry.comment.post.id}`,
-    commentLink: `/posts/${entry.comment.post.id}#comment-${entry.comment.id}`,
-    parentLink: entry.comment.parentComment
-      ? `/posts/${entry.comment.post.id}#comment-${entry.comment.parentComment.id}`
-      : undefined,
-  })),
-)
-
-const commentCount = computed(
-  () => entries.value.filter((entry) => !entry.comment.parentComment).length,
-)
-
-const replyCount = computed(
-  () => entries.value.filter((entry) => entry.comment.parentComment).length,
-)
-
-const headerText = computed(() => {
-  if (commentCount.value && replyCount.value) {
-    return `发布了${commentCount.value}条评论和${replyCount.value}条回复`
-  }
-  if (commentCount.value) {
-    return `发布了${commentCount.value}条评论`
-  }
-  if (replyCount.value) {
-    return `发布了${replyCount.value}条回复`
-  }
-  return '发布了评论'
-})
-
-const headerDate = computed(() => TimeManager.format(props.item.createdAt))
-
-const formatDate = (date) => TimeManager.format(date)
-
-const stripContent = (content) => stripMarkdownLength(content || '', 200)
-</script>
-
-<style scoped>
-.timeline-container {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-
-.timeline-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.timeline-title {
-  font-weight: 600;
-  color: var(--primary-color);
-}
-
-.timeline-date {
-  color: var(--text-color-secondary);
-  font-size: 14px;
-}
-
-.comment-content {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-
-.comment-content-item {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-}
-
-.comment-content-item-main {
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-}
-
-.comment-content-item-icon {
-  color: var(--primary-color);
-  font-size: 18px;
-}
-
-.comment-prefix {
-  color: var(--text-color-secondary);
-  font-size: 14px;
-}
-
-.timeline-comment-link {
-  display: inline-flex;
-  gap: 6px;
-  align-items: center;
-  color: var(--text-color);
-  font-size: 15px;
-  line-height: 1.6;
-}
-
-.timeline-comment-link:hover {
-  color: var(--primary-color);
-}
-
-.timeline-link {
-  color: var(--primary-color);
-}
-
-.timeline-link:hover {
-  color: var(--primary-color-hover);
-}
-</style>

frontend_nuxt/components/ProfileTimelinePostItem.vue

@@ -1,79 +0,0 @@
-<template>
-  <div class="timeline-container">
-    <div class="timeline-header">
-      <div class="timeline-title">发布了文章</div>
-      <div class="timeline-date">{{ formattedDate }}</div>
-    </div>
-    <div class="article-container">
-      <NuxtLink :to="postLink" class="timeline-article-link">
-        {{ props.item.post.title }}
-      </NuxtLink>
-      <div class="timeline-snippet">
-        {{ postSnippet }}
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { computed } from 'vue'
-import { stripMarkdown } from '~/utils/markdown'
-import TimeManager from '~/utils/time'
-
-const props = defineProps({
-  item: {
-    type: Object,
-    required: true,
-  },
-})
-
-const formattedDate = computed(() => TimeManager.format(props.item.createdAt))
-const postLink = computed(() => `/posts/${props.item.post.id}`)
-const postSnippet = computed(() => stripMarkdown(props.item.post?.snippet ?? ''))
-</script>
-
-<style scoped>
-.timeline-container {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-
-.timeline-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.timeline-title {
-  font-weight: 600;
-  color: var(--primary-color);
-}
-
-.timeline-date {
-  color: var(--text-color-secondary);
-  font-size: 14px;
-}
-
-.article-container {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-}
-
-.timeline-article-link {
-  font-size: 18px;
-  font-weight: 600;
-  color: var(--text-color);
-}
-
-.timeline-article-link:hover {
-  color: var(--primary-color);
-}
-
-.timeline-snippet {
-  color: var(--text-color-secondary);
-  font-size: 14px;
-  line-height: 1.6;
-}
-</style>

frontend_nuxt/components/TimelineCommentGroup.vue

@@ -0,0 +1,167 @@
+<template>
+  <div class="timeline-container">
+    <div class="timeline-header">
+      <div class="timeline-title">{{ headerText }}</div>
+      <div class="timeline-date">{{ formattedDate }}</div>
+    </div>
+    <div class="comment-content" v-if="entries.length > 0">
+      <div class="comment-content-item" v-for="entry in entries" :key="entry.comment.id">
+        <div class="comment-content-item-main">
+          <comment-one class="comment-content-item-icon" />
+          <div class="comment-content-item-text">
+            <NuxtLink
+              :to="`/posts/${entry.comment.post.id}#comment-${entry.comment.id}`"
+              class="timeline-comment-link"
+            >
+              {{ stripContent(entry.comment.content) }}
+            </NuxtLink>
+          </div>
+        </div>
+        <div class="timeline-date">{{ formatEntryDate(entry.createdAt) }}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import { stripMarkdownLength } from '~/utils/markdown'
+import TimeManager from '~/utils/time'
+
+const props = defineProps({
+  item: { type: Object, required: true },
+})
+
+const entries = computed(() => {
+  if (Array.isArray(props.item.entries)) {
+    return props.item.entries
+  }
+  if (props.item.comment) {
+    return [
+      {
+        type: props.item.type,
+        comment: props.item.comment,
+        createdAt: props.item.createdAt,
+      },
+    ]
+  }
+  return []
+})
+
+const formattedDate = computed(() => TimeManager.formatWithDay(props.item.createdAt))
+
+const hasReplies = computed(() => entries.value.some((entry) => !!entry.comment.parentComment))
+const hasComments = computed(() => entries.value.some((entry) => !entry.comment.parentComment))
+
+const headerText = computed(() => {
+  const count = entries.value.length
+  if (count === 0) return ''
+  if (hasComments.value && hasReplies.value) {
+    return `发布了${count}条评论/回复`
+  }
+  if (hasReplies.value) {
+    return `发布了${count}条回复`
+  }
+  return `发布了${count}条评论`
+})
+
+const formatEntryDate = (date) => TimeManager.format(date)
+const stripContent = (content) => stripMarkdownLength(content ?? '', 200)
+const parentSnippet = (entry) =>
+  stripMarkdownLength(entry.comment.parentComment?.content ?? '', 200)
+</script>
+
+<style scoped>
+.timeline-container {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  padding-top: 5px;
+  padding-bottom: 20px;
+}
+
+.timeline-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.timeline-title {
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.timeline-date {
+  font-size: 12px;
+  color: var(--timeline-date-color, #888);
+  white-space: nowrap;
+}
+
+.comment-content {
+  display: flex;
+  flex-direction: column;
+  gap: 3px;
+}
+
+.comment-content-item {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  gap: 6px;
+}
+
+.comment-content-item:last-child {
+  border-bottom: none;
+  padding-bottom: 0;
+}
+
+.comment-content-item-main {
+  display: flex;
+  gap: 8px;
+  align-items: flex-start;
+}
+
+.comment-content-item-icon {
+  flex-shrink: 0;
+  width: 18px;
+  height: 18px;
+  margin-top: 2px;
+}
+
+.comment-content-item-text {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.comment-content-item-prefix {
+  font-size: 14px;
+  color: var(--text-color);
+}
+
+.timeline-comment-link {
+  font-size: 14px;
+  color: var(--link-color);
+  text-decoration: underline;
+}
+
+.timeline-comment-link:hover {
+  color: var(--primary-color);
+}
+
+.timeline-link {
+  color: var(--link-color);
+  text-decoration: none;
+}
+
+.timeline-link:hover {
+  text-decoration: underline;
+}
+
+@media (max-width: 768px) {
+  .comment-content-item-prefix,
+  .timeline-comment-link {
+    font-size: 13px;
+  }
+}
+</style>

frontend_nuxt/components/TimelinePostItem.vue

@@ -0,0 +1,147 @@
+<template>
+  <div class="timeline-container">
+    <div class="timeline-header">
+      <div class="timeline-title">发布了文章</div>
+      <div class="timeline-date">{{ formattedDate }}</div>
+    </div>
+    <div class="article-container">
+      <NuxtLink :to="postLink" class="timeline-article-link">
+        {{ item.post?.title }}
+      </NuxtLink>
+      <div class="timeline-snippet">
+        {{ strippedSnippet }}
+      </div>
+      <div class="article-meta" v-if="hasMeta">
+        <ArticleCategory v-if="item.post?.category" :category="item.post.category" />
+        <ArticleTags :tags="item.post?.tags" />
+        <div class="article-comment-count" v-if="item.post?.commentCount !== undefined">
+          <comment-one class="article-comment-count-icon" />
+          <span>{{ item.post?.commentCount }}</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import { stripMarkdown } from '~/utils/markdown'
+import TimeManager from '~/utils/time'
+
+const props = defineProps({
+  item: { type: Object, required: true },
+})
+
+const postLink = computed(() => {
+  const id = props.item.post?.id
+  return id ? `/posts/${id}` : '#'
+})
+
+const formattedDate = computed(() => TimeManager.format(props.item.createdAt))
+const strippedSnippet = computed(() => stripMarkdown(props.item.post?.snippet ?? ''))
+const hasMeta = computed(() => {
+  const tags = props.item.post?.tags ?? []
+  const hasTags = Array.isArray(tags) && tags.length > 0
+  const hasCategory = !!props.item.post?.category
+  const hasCommentCount =
+    props.item.post?.commentCount !== undefined && props.item.post?.commentCount !== null
+  return hasTags || hasCategory || hasCommentCount
+})
+</script>
+
+<style scoped>
+.timeline-container {
+  display: flex;
+  flex-direction: column;
+  padding-top: 5px;
+  gap: 12px;
+  border-radius: 10px;
+  background: var(--timeline-card-background, transparent);
+}
+
+.timeline-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.timeline-title {
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.timeline-date {
+  font-size: 12px;
+  color: var(--timeline-date-color, #888);
+}
+
+.article-container {
+  display: flex;
+  flex-direction: column;
+  border: 1px solid var(--normal-border-color);
+  border-radius: 10px;
+  padding: 10px;
+  gap: 6px;
+}
+
+.timeline-article-link {
+  font-size: 18px;
+  font-weight: 600;
+  color: var(--link-color);
+  text-decoration: none;
+}
+
+.timeline-article-link:hover {
+  text-decoration: underline;
+}
+
+.timeline-snippet {
+  color: var(--timeline-snippet-color, #666);
+  font-size: 14px;
+  line-height: 1.6;
+}
+
+.article-meta {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  align-items: center;
+}
+
+.article-tags {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 6px;
+}
+
+.article-tag {
+  background-color: var(--article-info-background-color);
+  border-radius: 6px;
+  padding: 2px 6px;
+  font-size: 12px;
+  color: var(--text-color);
+}
+
+.article-comment-count {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  font-size: 12px;
+  color: var(--text-color);
+}
+
+.article-comment-count-icon {
+  width: 16px;
+  height: 16px;
+}
+
+@media (max-width: 768px) {
+  .timeline-article-link {
+    font-size: 16px;
+  }
+
+  .timeline-snippet {
+    font-size: 13px;
+  }
+}
+</style>

frontend_nuxt/components/TimelineTagItem.vue

@@ -0,0 +1,111 @@
+<template>
+  <div class="timeline-tag-item">
+    <div class="tags-container">
+      <div class="tags-container-item">
+        <div class="timeline-tag-title">创建了标签</div>
+        <ArticleTags v-if="tag" :tags="[tag]" />
+        <span class="timeline-tag-count" v-if="tag?.count"> x{{ tag.count }}</span>
+      </div>
+      <div v-if="timelineDate" class="timeline-date">{{ timelineDate }}</div>
+    </div>
+    <div v-if="hasDescription" class="timeline-snippet">
+      {{ tag?.description }}
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import TimeManager from '~/utils/time'
+
+const props = defineProps({
+  item: { type: Object, required: true },
+})
+
+const emit = defineEmits(['tag-click'])
+
+const tag = computed(() => props.item?.tag ?? null)
+const hasDescription = computed(() => {
+  const description = tag.value?.description
+  return !!description
+})
+
+const timelineDate = computed(() => {
+  const date = props.item?.createdAt ?? tag.value?.createdAt
+  return date ? TimeManager.format(date) : ''
+})
+
+const summaryDate = computed(() => {
+  const date = tag.value?.createdAt ?? props.item?.createdAt
+  return date ? TimeManager.format(date) : ''
+})
+
+const isClickable = computed(() => props.mode === 'summary' && !!tag.value)
+
+const handleTagClick = () => {
+  if (!isClickable.value) return
+  emit('tag-click', tag.value)
+}
+</script>
+
+<style scoped>
+.timeline-tag-item {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+}
+
+.tags-container {
+  display: flex;
+  flex-direction: row;
+  gap: 10px;
+  padding-top: 5px;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.tags-container-item {
+  display: flex;
+  flex-direction: row;
+  gap: 5px;
+  align-items: center;
+}
+
+.timeline-tag-title {
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.timeline-tag-count {
+  font-size: 12px;
+}
+
+.timeline-date {
+  font-size: 12px;
+  color: gray;
+  margin-top: 5px;
+  white-space: nowrap;
+}
+
+.timeline-snippet {
+  font-size: 14px;
+  color: #666;
+  margin-top: 5px;
+}
+
+.timeline-link {
+  font-weight: bold;
+  color: var(--primary-color);
+  text-decoration: none;
+  word-break: break-word;
+  cursor: default;
+}
+
+.timeline-link.clickable {
+  cursor: pointer;
+}
+
+.timeline-link.clickable:hover {
+  text-decoration: underline;
+}
+</style>

frontend_nuxt/pages/users/[id].vue

@@ -112,19 +112,18 @@
                         {{ item.comment.post.title }}
                       </NuxtLink>
                       <template v-if="item.comment.parentComment">
-                        下对
                         <NuxtLink
                           :to="`/posts/${item.comment.post.id}#comment-${item.comment.parentComment.id}`"
-                          class="timeline-link"
+                          class="timeline-comment-link"
                         >
                           {{ stripMarkdownLength(item.comment.parentComment.content, 200) }}
                         </NuxtLink>
-                        回复了
+                        <next class="reply-icon" /> 回复了
                       </template>
                       <template v-else> 下评论了 </template>
                       <NuxtLink
                         :to="`/posts/${item.comment.post.id}#comment-${item.comment.id}`"
-                        class="timeline-link"
+                        class="timeline-comment-link"
                       >
                         {{ stripMarkdownLength(item.comment.content, 200) }}
                       </NuxtLink>
@@ -143,15 +142,7 @@
                 <div class="summary-content" v-if="hotPosts.length > 0">
                   <BaseTimeline :items="hotPosts">
                     <template #item="{ item }">
-                      <NuxtLink :to="`/posts/${item.post.id}`" class="timeline-link">
-                        {{ item.post.title }}
-                      </NuxtLink>
-                      <div class="timeline-snippet">
-                        {{ stripMarkdown(item.post.snippet) }}
-                      </div>
-                      <div class="timeline-date">
-                        {{ formatDate(item.post.createdAt) }}
-                      </div>
+                      <TimelinePostItem :item="item" />
                     </template>
                   </BaseTimeline>
                 </div>
@@ -164,15 +155,7 @@
                 <div class="summary-content" v-if="hotTags.length > 0">
                   <BaseTimeline :items="hotTags">
                     <template #item="{ item }">
-                      <span class="timeline-link" @click="gotoTag(item.tag)">
-                        {{ item.tag.name }}<span v-if="item.tag.count"> x{{ item.tag.count }}</span>
-                      </span>
-                      <div class="timeline-snippet" v-if="item.tag.description">
-                        {{ item.tag.description }}
-                      </div>
-                      <div class="timeline-date">
-                        {{ formatDate(item.tag.createdAt) }}
-                      </div>
+                      <TimelineTagItem :item="item" />
                     </template>
                   </BaseTimeline>
                 </div>
@@ -212,18 +195,17 @@
             <div class="timeline-list">
               <BaseTimeline :items="filteredTimelineItems">
                 <template #item="{ item }">
-                  <ProfileTimelinePostItem v-if="item.type === 'post'" :item="item" />
-                  <ProfileTimelineCommentGroup v-else-if="item.type === 'comment'" :item="item" />
-                  <ProfileTimelineCommentGroup v-else-if="item.type === 'reply'" :item="item" />
+                  <template v-if="item.type === 'post'">
+                    <TimelinePostItem :item="item" />
+                  </template>
+                  <template v-else-if="item.type === 'comment'">
+                    <TimelineCommentGroup :item="item" />
+                  </template>
+                  <template v-else-if="item.type === 'reply'">
+                    <TimelineCommentGroup :item="item" />
+                  </template>
                   <template v-else-if="item.type === 'tag'">
-                    创建了标签
-                    <span class="timeline-link" @click="gotoTag(item.tag)">
-                      {{ item.tag.name }}<span v-if="item.tag.count"> x{{ item.tag.count }}</span>
-                    </span>
-                    <div class="timeline-snippet" v-if="item.tag.description">
-                      {{ item.tag.description }}
-                    </div>
-                    <div class="timeline-date">{{ formatDate(item.createdAt) }}</div>
+                    <TimelineTagItem :item="item" />
                   </template>
                 </template>
               </BaseTimeline>
@@ -287,8 +269,9 @@ import BasePlaceholder from '~/components/BasePlaceholder.vue'
 import BaseTimeline from '~/components/BaseTimeline.vue'
 import BaseTabs from '~/components/BaseTabs.vue'
 import LevelProgress from '~/components/LevelProgress.vue'
-import ProfileTimelineCommentGroup from '~/components/ProfileTimelineCommentGroup.vue'
-import ProfileTimelinePostItem from '~/components/ProfileTimelinePostItem.vue'
+import TimelineCommentGroup from '~/components/TimelineCommentGroup.vue'
+import TimelinePostItem from '~/components/TimelinePostItem.vue'
+import TimelineTagItem from '~/components/TimelineTagItem.vue'
 import UserList from '~/components/UserList.vue'
 import { toast } from '~/main'
 import { authState, getToken } from '~/utils/auth'
@@ -378,7 +361,12 @@ const fetchSummary = async () => {
   const postsRes = await fetch(`${API_BASE_URL}/api/users/${username}/hot-posts`)
   if (postsRes.ok) {
     const data = await postsRes.json()
-    hotPosts.value = data.map((p) => ({ icon: 'file-text', post: p }))
+    hotPosts.value = data.map((p) => ({
+      icon: 'file-text',
+      type: 'post',
+      post: p,
+      createdAt: p.createdAt,
+    }))
   }
 
   const repliesRes = await fetch(`${API_BASE_URL}/api/users/${username}/hot-replies`)
@@ -390,25 +378,65 @@ const fetchSummary = async () => {
   const tagsRes = await fetch(`${API_BASE_URL}/api/users/${username}/hot-tags`)
   if (tagsRes.ok) {
     const data = await tagsRes.json()
-    hotTags.value = data.map((t) => ({ icon: 'tag-one', tag: t }))
+    hotTags.value = data.map((t) => ({
+      icon: 'tag-one',
+      type: 'tag',
+      tag: t,
+      createdAt: t.createdAt,
+    }))
   }
 }
 
-const isSameDay = (a, b) => {
-  const dateA = new Date(a)
-  const dateB = new Date(b)
-  return (
-    dateA.getFullYear() === dateB.getFullYear() &&
-    dateA.getMonth() === dateB.getMonth() &&
-    dateA.getDate() === dateB.getDate()
-  )
+const isDiscussionItem = (item) => item && (item.type === 'comment' || item.type === 'reply')
+
+const toDateKey = (value) => {
+  const date = new Date(value)
+  if (Number.isNaN(date.getTime())) return ''
+  const month = `${date.getMonth() + 1}`.padStart(2, '0')
+  const day = `${date.getDate()}`.padStart(2, '0')
+  return `${date.getFullYear()}-${month}-${day}`
 }
 
-const createCommentEntry = (item) => ({
-  type: item.type,
-  comment: item.comment,
-  createdAt: item.createdAt,
-})
+const combineDiscussionItems = (items) => {
+  const result = []
+  items.forEach((item) => {
+    if (!isDiscussionItem(item)) {
+      result.push(item)
+      return
+    }
+
+    const dateKey = toDateKey(item.createdAt)
+    const last = result[result.length - 1]
+    if (last && isDiscussionItem(last) && last.dateKey === dateKey) {
+      last.entries.push({
+        type: item.type,
+        comment: item.comment,
+        createdAt: item.createdAt,
+      })
+      if (item.type === 'comment' && last.type === 'reply') {
+        last.type = 'comment'
+      }
+      if (new Date(item.createdAt) > new Date(last.createdAt)) {
+        last.createdAt = item.createdAt
+      }
+    } else {
+      result.push({
+        type: item.type,
+        icon: item.icon,
+        createdAt: item.createdAt,
+        dateKey,
+        entries: [
+          {
+            type: item.type,
+            comment: item.comment,
+            createdAt: item.createdAt,
+          },
+        ],
+      })
+    }
+  })
+  return result
+}
 
 const fetchTimeline = async () => {
   const [postsRes, repliesRes, tagsRes] = await Promise.all([
@@ -440,32 +468,7 @@ const fetchTimeline = async () => {
     })),
   ]
   mapped.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt))
-
-  const grouped = []
-  for (const item of mapped) {
-    if (item.type === 'comment') {
-      const last = grouped[grouped.length - 1]
-      if (last && last.type === 'comment' && isSameDay(last.createdAt, item.createdAt)) {
-        last.entries.push(createCommentEntry(item))
-        if (new Date(item.createdAt) > new Date(last.createdAt)) {
-          last.createdAt = item.createdAt
-        }
-      } else {
-        grouped.push({
-          ...item,
-          entries: [createCommentEntry(item)],
-        })
-      }
-    } else if (item.type === 'reply') {
-      grouped.push({
-        ...item,
-        entries: [createCommentEntry(item)],
-      })
-    } else {
-      grouped.push(item)
-    }
-  }
-  timelineItems.value = grouped
+  timelineItems.value = combineDiscussionItems(mapped)
 }
 
 const fetchFollowUsers = async () => {
@@ -666,6 +669,11 @@ watch(selectedTab, async (val) => {
   color: #666;
 }
 
+.reply-icon {
+  color: var(--primary-color);
+  margin-left: 5px;
+}
+
 .profile-page-header-user-info-buttons {
   display: flex;
   flex-direction: row;
@@ -918,8 +926,8 @@ watch(selectedTab, async (val) => {
 
 .timeline-link {
   font-weight: bold;
-  color: var(--primary-color);
   text-decoration: none;
+  color: var(--text-color);
   word-break: break-word;
 }
 
@@ -956,9 +964,25 @@ watch(selectedTab, async (val) => {
   justify-content: space-between;
 }
 
-.timeline-title {
-  font-size: 18px;
-  font-weight: bold;
+.tags-container {
+  display: flex;
+  flex-direction: row;
+  gap: 10px;
+  padding-top: 5px;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.tags-container-item {
+  display: flex;
+  flex-direction: row;
+  gap: 5px;
+  align-items: center;
+}
+
+.timeline-tag-title {
+  font-size: 16px;
+  font-weight: 600;
 }
 
 .comment-content {
@@ -994,6 +1018,7 @@ watch(selectedTab, async (val) => {
   color: var(--text-color);
   word-break: break-word;
   text-decoration: underline;
+  margin-left: 5px;
 }
 
 .timeline-comment-link:hover {

frontend_nuxt/utils/time.js

@@ -40,4 +40,33 @@ export default class TimeManager {
 
     return `${date.getFullYear()}.${month}.${day} ${timePart}`
   }
+
+  // 仅显示日期（不含时间）
+  static formatWithDay(input) {
+    const date = new Date(input)
+    if (Number.isNaN(date.getTime())) return ''
+
+    const now = new Date()
+
+    const startOfToday = new Date(now.getFullYear(), now.getMonth(), now.getDate())
+    const startOfDate = new Date(date.getFullYear(), date.getMonth(), date.getDate())
+    const diffDays = Math.floor((startOfToday - startOfDate) / 86400000)
+
+    if (diffDays === 0) return '今天'
+    if (diffDays === 1) return '昨天'
+    if (diffDays === 2) return '前天'
+
+    const month = date.getMonth() + 1
+    const day = date.getDate()
+
+    if (date.getFullYear() === now.getFullYear()) {
+      return `${month}.${day}`
+    }
+
+    if (date.getFullYear() === now.getFullYear() - 1) {
+      return `去年 ${month}.${day}`
+    }
+
+    return `${date.getFullYear()}.${month}.${day}`
+  }
 }