From 7fc770524ca8e6f83a005635553b2c85ea730291 Mon Sep 17 00:00:00 2001 From: "jlj05024111@163.com" Date: Tue, 12 Aug 2025 21:11:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=97=A5?= =?UTF-8?q?=E5=8E=86=E9=A1=B9=E9=80=89=E4=B8=AD=E6=BF=80=E6=B4=BB=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + .../components/calendar-user/calendar-user.scss | 17 +++++++++++++++++ .../components/calendar-user/calendar-user.tsx | 1 + 3 files changed, 19 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0ffb64ca..ac8e04f09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ ### Changed +- 更新日历项选中样式 - 更新drtab流布局导航栏样式 - 适配多数据部件刷新模式，每次刷新后更新甘特图选中节点的样式 diff --git a/src/control/calendar/components/calendar-user/calendar-user.scss b/src/control/calendar/components/calendar-user/calendar-user.scss index cc68951fe..4e3b10e1c 100644 --- a/src/control/calendar/components/calendar-user/calendar-user.scss +++ b/src/control/calendar/components/calendar-user/calendar-user.scss @@ -13,17 +13,34 @@ $calendar-user: ( @include e('cell'){ min-height: getCssVar(calendar-user, cell-min-height); + padding: 0 getCssVar(spacing, base); border-bottom: 1px solid getCssVar(color,tertiary); border-left: 1px solid getCssVar(color,tertiary); &:last-child{ border-right: 1px solid getCssVar(color,tertiary); } + .#{bem(control-calendar-item)}{ + height: auto; + @include when('active'){ + color:getCssVar(color,primary,text); + background-color: getCssVar(color,primary) + } + } } @include e('black'){ width: 100%; height: 100%; } + @include e('custom-user-popover'){ + .#{bem(control-calendar-item)}{ + height: auto; + @include when('active'){ + color:getCssVar(color,primary,text); + background-color: getCssVar(color,primary) + } + } + } @include b('calendar-user-more'){ flex-shrink: 0; diff --git a/src/control/calendar/components/calendar-user/calendar-user.tsx b/src/control/calendar/components/calendar-user/calendar-user.tsx index 40dfca076..cea9db264 100644 --- a/src/control/calendar/components/calendar-user/calendar-user.tsx +++ b/src/control/calendar/components/calendar-user/calendar-user.tsx @@ -73,6 +73,7 @@ export const CalendarUser = defineComponent({ return [ slots.event?.({ data: items[0] }), { if (el && items[0].id === popoverValue.value) { -- Gitee From a827ad0283a2bd29df24719cc875fe5c7d9fc641 Mon Sep 17 00:00:00 2001 From: "jlj05024111@163.com" Date: Tue, 12 Aug 2025 21:12:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddrtab=20=E6=B5=81?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=A0=B7=E5=BC=8F=E5=BC=82=E5=B8=B8=E4=BB=A5?= =?UTF-8?q?=E5=8F=8Asrfnav=E5=AE=9A=E4=BD=8D=E8=AF=86=E5=88=AB=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/control/drtab/flow-drtab.scss | 3 +++ src/control/drtab/flow-drtab.tsx | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac8e04f09..67c4b156d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ ## Fixed +- 修复drtab 流布局样式异常以及srfnav定位识别异常的问题 - 修复日历导航栏快速搜索和工具栏行为异常 - 修复列表默认展开异常 - 修复选择视图选中数据回显异常 diff --git a/src/control/drtab/flow-drtab.scss b/src/control/drtab/flow-drtab.scss index dfd9903d7..beb05b778 100644 --- a/src/control/drtab/flow-drtab.scss +++ b/src/control/drtab/flow-drtab.scss @@ -93,7 +93,10 @@ width: 100%; height: 32px; padding: 0 getCssVar(spacing, base); + overflow: hidden; line-height: 32px; + text-overflow: ellipsis; + white-space: nowrap; cursor: pointer; &:hover { diff --git a/src/control/drtab/flow-drtab.tsx b/src/control/drtab/flow-drtab.tsx index cb78f3ace..7aa21f5b4 100644 --- a/src/control/drtab/flow-drtab.tsx +++ b/src/control/drtab/flow-drtab.tsx @@ -211,6 +211,11 @@ export const FlowDrtab = defineComponent({ if (el) { observer.observe(el); } + if (completedViews.value === allVisibleViews.value && props.activeTab) { + nextTick(() => { + scrollToTarget(); + }); + } }; watch( -- Gitee