From 3bd0eecb42d06f06f50cc4736ecc31cc07cc1886 Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Thu, 4 Jun 2026 17:10:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(editor):=20=E4=BF=AE=E5=A4=8D=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 packages/editor/src/layouts/history-list/GroupRow.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/editor/src/layouts/history-list/GroupRow.vue b/packages/editor/src/layouts/history-list/GroupRow.vue
index 80decd10..ffcfaacd 100644
--- a/packages/editor/src/layouts/history-list/GroupRow.vue
+++ b/packages/editor/src/layouts/history-list/GroupRow.vue
@@ -14,13 +14,13 @@
       <span class="m-editor-history-list-item-desc">{{ desc }}</span>
 
       <span
-        v-if="sourceLabel(source)"
+        v-if="!merged && sourceLabel(source)"
         class="m-editor-history-list-item-source"
         :title="`操作途径：${sourceLabel(source)}`"
         >{{ sourceLabel(source) }}</span
       >
 
-      <span v-if="time" class="m-editor-history-list-item-time" :title="timeTitle || time">{{ time }}</span>
+      <span v-if="!merged && time" class="m-editor-history-list-item-time" :title="timeTitle || time">{{ time }}</span>
 
       <span v-if="merged" class="m-editor-history-list-item-merge">合并 {{ stepCount }} 步</span>