Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(gantt): 优化甘特图底部横向滚动条展示在窗口可视区域 #TINFR-558 #482

Merged
merged 1 commit into from
Sep 9, 2024
Merged

feat(gantt): 优化甘特图底部横向滚动条展示在窗口可视区域 #TINFR-558 #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/gantt/src/gantt.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
class="gantt-scrollbar"
[style.height.px]="ganttRoot.horizontalScrollbarHeight + 1"
[style.right.px]="ganttRoot.verticalScrollbarWidth"
[ngClass]="{ 'gantt-scrollbar-bg': table?.tableFooterTemplate }"
>
<div
[style.width.px]="tableHeader.tableWidth"
Expand Down
29 changes: 27 additions & 2 deletions packages/gantt/src/gantt.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,19 @@
right: 0;
z-index: 3;
display: flex;

&.gantt-scrollbar-bg {
background-color: variables.$gantt-container-background-color;

.gantt-table-scrollbar {
&.with-scrollbar {
border-right: 1px solid variables.$gantt-border-color;
z-index: 3;
box-shadow: variables.$gantt-scrollbar-shadow;
}
}
}

.gantt-table-scrollbar {
&.with-scrollbar {
overflow-x: scroll;
Expand Down Expand Up @@ -134,6 +147,16 @@
}
}

&.gantt-scroll-container {
.gantt-container {
.gantt-main-container {
&::-webkit-scrollbar {
position: static;
}
}
}
}

&.gantt-normal-viewport {
.cdk-virtual-scroll-content-wrapper {
height: 100%;
Expand Down Expand Up @@ -167,15 +190,17 @@
left: 0;
right: 0;
bottom: 0;
z-index: 2;
z-index: 3;
background-color: white;
border-top: 1px solid variables.$gantt-border-color;
border-bottom: 1px solid variables.$gantt-border-color;

.gantt-table-footer {
height: variables.$gantt-footer-height;
border-right: 1px solid variables.$gantt-border-color;
box-shadow: variables.$gantt-side-shadow;
box-shadow: variables.$gantt-footer-shadow;
}

.gantt-container-footer {
height: variables.$gantt-footer-height;
overflow-x: auto;
Expand Down
4 changes: 4 additions & 0 deletions packages/gantt/src/styles/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ $gantt-loader-loading-color: $gantt-primary-color !default;

// footer
$gantt-footer-height: 44px !default;
$gantt-footer-shadow: 16px 0 14px -10px rgba(0, 0, 0, 0.15) !default;

// @deprecated, please use global config `GANTT_GLOBAL_CONFIG` set custom height
$gantt-item-height: none;
$gantt-group-height: none;

// scrollbar
$gantt-scrollbar-shadow: 10px 0px 10px -3px rgba(0, 0, 0, 0.15) !default;