From c665106fc9c5d1002e97186885162602b38a6e97 Mon Sep 17 00:00:00 2001
From: "jlj05024111@163.com" <jlj05024111@163.com>
Date: Wed, 29 Oct 2025 20:34:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=E6=97=B6=E5=85=89=E8=BD=B4=E6=94=AF=E6=8C=81=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E5=8F=82=E6=95=B0timelinecaptionformat,?=
 =?UTF-8?q?=E7=94=A8=E4=BA=8E=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=97=B6=E5=85=89?=
 =?UTF-8?q?=E8=BD=B4=E6=97=B6=E9=97=B4=E6=88=B3=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                      | 1 +
 src/control/calendar/calendar.tsx | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 259bff464..e8fb39a74 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 ### Changed
 
+- 更新日历时光轴支持配置控件参数timelinecaptionformat,用于格式化时光轴时间戳标题
 - 优化树计数器
 - 优化菜单部件计数器，将其迁移到控制器中处理
 
diff --git a/src/control/calendar/calendar.tsx b/src/control/calendar/calendar.tsx
index 7b24584fc..5f70a80c3 100644
--- a/src/control/calendar/calendar.tsx
+++ b/src/control/calendar/calendar.tsx
@@ -919,12 +919,15 @@ export const CalendarControl = defineComponent({
                       return item.itemType === calendarItems.itemType;
                     },
                   );
+                  const temptime = item.beginTime
+                    ? dayjs(item.beginTime).format(this.c.timelineCaptionFormat)
+                    : item.beginTime;
                   return (
                     <el-timeline-item
                       key={item.id}
                       placement='top'
                       color={item.bkColor}
-                      timestamp={item.beginTime}
+                      timestamp={temptime}
                     >
                       {model?.layoutPanel
                         ? renderPanelItem(item, model.layoutPanel)
-- 
Gitee