fix: fix two scrollbar error

worktile · Jul 4, 2023 · b73c3e3 · b73c3e3
1 parent 2413774
commit b73c3e3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/example/src/app/gantt-virtual-scroll/gantt.component.html b/example/src/app/gantt-virtual-scroll/gantt.component.html
@@ -6,7 +6,7 @@
 </div>
 <thy-layout>
   <thy-content>
-    <ngx-gantt #gantt [items]="items" virtualScrollEnabled="true">
+    <ngx-gantt #gantt [items]="items" [virtualScrollEnabled]="true">
       <ngx-gantt-table>
         <ngx-gantt-column name="标题" width="180px">
           <ng-template #cell let-item="item"> {{ item.title }} </ng-template>

diff --git a/example/src/app/gantt/gantt.component.html b/example/src/app/gantt/gantt.component.html
@@ -37,7 +37,7 @@
       [showToolbar]="isShowToolbarChecked"
       [toolbarOptions]="toolbarOptions"
       [loading]="loading"
-      virtualScrollEnabled="false"
+      [virtualScrollEnabled]="false"
       (barClick)="barClick($event)"
       (viewChange)="viewChange($event)"
       (lineClick)="lineClick($event)"

diff --git a/packages/gantt/src/gantt.component.scss b/packages/gantt/src/gantt.component.scss
@@ -60,7 +60,6 @@
     right: 0;
     // 兼容火狐浏览器
     overflow: auto;
-    overflow: overlay;
     background-color: variables.$gantt-container-background-color;
 
     .gantt-main-groups,
@@ -100,7 +99,6 @@
     z-index: 2;
     // 兼容火狐浏览器
     overflow: auto;
-    overflow: overlay;
     .cdk-virtual-scroll-content-wrapper {
       width: 100%;
       min-width: unset;
@@ -110,6 +108,7 @@
         .gantt-main-container {
           height: 100%;
           top: 0;
+          overflow-y: hidden;
         }
       }
     }
@@ -121,6 +120,11 @@
       .cdk-virtual-scroll-spacer {
         display: none;
       }
+      .gantt-container {
+        .gantt-main-container {
+          overflow-y: auto;
+        }
+      }
     }
   }
 }

diff --git a/packages/gantt/src/gantt.component.ts b/packages/gantt/src/gantt.component.ts
@@ -33,7 +33,6 @@ import { GanttDate } from './utils/date';
 import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling';
 import { Dictionary, keyBy, recursiveItems, uniqBy } from './utils/helpers';
 import { GanttPrintService } from './gantt-print.service';
-import { InputBoolean } from 'ngx-tethys/core';
 @Component({
     selector: 'ngx-gantt',
     templateUrl: './gantt.component.html',
@@ -74,7 +73,7 @@ export class NgxGanttComponent extends GanttUpper implements OnInit, OnChanges,
         }
     }
 
-    @Input() @InputBoolean() virtualScrollEnabled = true;
+    @Input() virtualScrollEnabled = true;
 
     @Input() loadingDelay: number = 0;