diff --git a/CHANGELOG.md b/CHANGELOG.md index c0ffb64ca7577346acf96e62107ef27ba89c7e06..67c4b156d3d2bad655d07f23b3485cace47b959b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,11 +15,13 @@ ### Changed +- 更新日历项选中样式 - 更新drtab流布局导航栏样式 - 适配多数据部件刷新模式,每次刷新后更新甘特图选中节点的样式 ## Fixed +- 修复drtab 流布局样式异常以及srfnav定位识别异常的问题 - 修复日历导航栏快速搜索和工具栏行为异常 - 修复列表默认展开异常 - 修复选择视图选中数据回显异常 diff --git a/src/control/calendar/components/calendar-user/calendar-user.scss b/src/control/calendar/components/calendar-user/calendar-user.scss index cc68951fe40605d95f3264a0b21b78da5f61d8c9..4e3b10e1cb0f00f9067cc7813bca8585dd4ee7bf 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 40dfca076c3927d47810990cba0c08b608227283..cea9db264145d9be9f5274b050a18881acc34ba7 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) { diff --git a/src/control/drtab/flow-drtab.scss b/src/control/drtab/flow-drtab.scss index dfd9903d781aa549153f470067753c6f7629f2c3..beb05b778960792df6e87563b5a666dfc4400dbc 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 cb78f3ace64beda313f6ebf742de5d8360ca42f5..7aa21f5b495097c69bdc3dbf90b5b7554a17bda7 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(