bug of perfect scrollbar is fixed

This commit is contained in:
병준 박 2019-11-19 11:30:43 +09:00
parent 289f52be70
commit 2f52cfe5ef
7 changed files with 65 additions and 48 deletions

View File

@ -25,7 +25,6 @@
class="search-result" class="search-result"
style="overflow: auto;" style="overflow: auto;"
> >
<perfect-scrollbar>
<ucap-group-expansion-panel <ucap-group-expansion-panel
#groupExpansionPanel #groupExpansionPanel
[groupBuddyList]="groupBuddyList$ | async" [groupBuddyList]="groupBuddyList$ | async"
@ -45,7 +44,6 @@
> >
</ucap-profile-user-list-item> </ucap-profile-user-list-item>
</ucap-group-expansion-panel> </ucap-group-expansion-panel>
</perfect-scrollbar>
</div> </div>
<div [style.display]="isShowSearch ? 'block' : 'none'" class="search-result"> <div [style.display]="isShowSearch ? 'block' : 'none'" class="search-result">
<div *ngIf="searchProcessing"> <div *ngIf="searchProcessing">

View File

@ -12,14 +12,12 @@
</div> </div>
<div class="oraganization-tab"> <div class="oraganization-tab">
<div class="oraganization-tab-tree"> <div class="oraganization-tab-tree">
<perfect-scrollbar>
<ucap-organization-tree <ucap-organization-tree
[oraganizationList]="departmentInfoList$ | async" [oraganizationList]="departmentInfoList$ | async"
[loginRes]="loginRes" [loginRes]="loginRes"
(selected)="onSelectedOrganization($event)" (selected)="onSelectedOrganization($event)"
class="tab-tree-frame" class="tab-tree-frame"
></ucap-organization-tree> ></ucap-organization-tree>
</perfect-scrollbar>
</div> </div>
<div class="select-list"> <div class="select-list">
<dl class="select-dept text-accent-color"> <dl class="select-dept text-accent-color">
@ -47,8 +45,7 @@
<mat-progress-bar mode="indeterminate"></mat-progress-bar> <mat-progress-bar mode="indeterminate"></mat-progress-bar>
</div> </div>
<div *ngIf="!isShowSearch" class="search-list"> <div *ngIf="!isShowSearch" class="search-list">
<perfect-scrollbar> <cdk-virtual-scroll-viewport itemSize="20" perfectScrollbar fxFlexFill>
<cdk-virtual-scroll-viewport itemSize="20" fxFlexFill>
<ucap-profile-user-list-item <ucap-profile-user-list-item
*cdkVirtualFor="let userInfo of selectedDepartmentUserInfoList" *cdkVirtualFor="let userInfo of selectedDepartmentUserInfoList"
[userInfo]="userInfo" [userInfo]="userInfo"
@ -61,7 +58,6 @@
Loading... Loading...
</ucap-profile-user-list-item> </ucap-profile-user-list-item>
</cdk-virtual-scroll-viewport> </cdk-virtual-scroll-viewport>
</perfect-scrollbar>
<!-- <ucap-profile-user-list-item <!-- <ucap-profile-user-list-item
*ngFor="let userInfo of selectedDepartmentUserInfoList$ | async" *ngFor="let userInfo of selectedDepartmentUserInfoList$ | async"
[userInfo]="userInfo" [userInfo]="userInfo"
@ -74,7 +70,11 @@
</ucap-profile-user-list-item> --> </ucap-profile-user-list-item> -->
</div> </div>
<div *ngIf="isShowSearch" class="search-result"> <div *ngIf="isShowSearch" class="search-result">
<cdk-virtual-scroll-viewport itemSize="20" style="height: 100%;"> <cdk-virtual-scroll-viewport
itemSize="20"
perfectScrollbar
style="height: 100%;"
>
<ucap-profile-user-list-item <ucap-profile-user-list-item
*cdkVirtualFor="let userInfo of searchUserInfos" *cdkVirtualFor="let userInfo of searchUserInfos"
[userInfo]="userInfo" [userInfo]="userInfo"

View File

@ -1,3 +1,5 @@
@import '~perfect-scrollbar/css/perfect-scrollbar.css';
@import '~@ucap-webmessenger-scss/ui/ucap-ui'; @import '~@ucap-webmessenger-scss/ui/ucap-ui';
@import 'assets/scss/ucap'; @import 'assets/scss/ucap';

View File

@ -1,4 +1,9 @@
<cdk-virtual-scroll-viewport #cvsvGroup itemSize="80" fxFlexFill> <cdk-virtual-scroll-viewport
#cvsvGroup
itemSize="80"
perfectScrollbar
fxFlexFill
>
<ng-container <ng-container
*cdkVirtualFor="let node of dataSource.expandedData$" *cdkVirtualFor="let node of dataSource.expandedData$"
></ng-container> ></ng-container>

View File

@ -12,6 +12,7 @@ import { MatExpansionModule } from '@angular/material/expansion';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatTreeModule } from '@angular/material/tree'; import { MatTreeModule } from '@angular/material/tree';
import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
import { ExpansionPanelComponent } from './components/expansion-panel.component'; import { ExpansionPanelComponent } from './components/expansion-panel.component';
import { ExpansionPanelItemDirective } from './directives/expansion-panel-item.directive'; import { ExpansionPanelItemDirective } from './directives/expansion-panel-item.directive';
@ -34,7 +35,9 @@ const SERVICES = [];
MatIconModule, MatIconModule,
MatTreeModule, MatTreeModule,
MatCheckboxModule, MatCheckboxModule,
MatRippleModule MatRippleModule,
PerfectScrollbarModule
], ],
exports: [...COMPONENTS, ...DIRECTIVES], exports: [...COMPONENTS, ...DIRECTIVES],
declarations: [...COMPONENTS, ...DIRECTIVES], declarations: [...COMPONENTS, ...DIRECTIVES],

View File

@ -1,4 +1,9 @@
<cdk-virtual-scroll-viewport #cvsvOrganization itemSize="40" fxFlexFill> <cdk-virtual-scroll-viewport
#cvsvOrganization
itemSize="40"
perfectScrollbar
fxFlexFill
>
<ng-container <ng-container
*cdkVirtualFor="let node of dataSource.expandedData$" *cdkVirtualFor="let node of dataSource.expandedData$"
></ng-container> ></ng-container>

View File

@ -14,6 +14,8 @@ import { MatInputModule } from '@angular/material/input';
import { MatSelectModule } from '@angular/material/select'; import { MatSelectModule } from '@angular/material/select';
import { MatTreeModule } from '@angular/material/tree'; import { MatTreeModule } from '@angular/material/tree';
import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
import { TenantSearchComponent } from './components/tenant-search.component'; import { TenantSearchComponent } from './components/tenant-search.component';
import { TreeComponent } from './components/tree.component'; import { TreeComponent } from './components/tree.component';
@ -33,7 +35,9 @@ const SERVICES = [];
MatIconModule, MatIconModule,
MatInputModule, MatInputModule,
MatSelectModule, MatSelectModule,
MatTreeModule MatTreeModule,
PerfectScrollbarModule
], ],
exports: [...COMPONENTS], exports: [...COMPONENTS],
declarations: [...COMPONENTS] declarations: [...COMPONENTS]