This commit is contained in:
leejinho 2020-03-13 14:44:51 +09:00
parent f1a0f241ff
commit d0a1c0f3ee
5 changed files with 50 additions and 20 deletions

View File

@ -6,26 +6,23 @@
</div> </div>
<div class="organization-info"> <div class="organization-info">
<h3 class="organization-name"> <h3 class="organization-name">
<ng-container *ngIf="!isSearch">
<ng-container <ng-container
*ngIf=" *ngIf="!!(selectedDepartmentProcessing$ | async); else searchEnd"
!!(selectedDepartmentProcessing$ | async);
else useSelectedDepartmentName
"
> >
{{ 'common.messages.searching' | translate }} ... {{ 'common.messages.searching' | translate }} ...
</ng-container> </ng-container>
<ng-template #useSelectedDepartmentName> <ng-template #searchEnd>
<ng-container *ngIf="!isSearch">
{{ selectedDepartment$ | async | ucapTranslate: 'name' }} {{ selectedDepartment$ | async | ucapTranslate: 'name' }}
</ng-template>
</ng-container> </ng-container>
<ng-container *ngIf="!!isSearch"> <ng-container *ngIf="!!isSearch">
{{ 'common.searchResult' | translate {{ 'common.searchResult' | translate
}}<span class="text-accent-color" }}<span class="text-accent-color person-count"
>({{ departmentUserInfoList.length }} >({{ departmentUserInfoList.length }}
{{ 'common.units.persons' | translate }})</span {{ 'common.units.persons' | translate }})</span
> >
</ng-container> </ng-container>
</ng-template>
</h3> </h3>
</div> </div>
<div class="organization-option selectbox input-lineless "> <div class="organization-option selectbox input-lineless ">

View File

@ -53,8 +53,14 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
flex: 0 0 30px; flex: 0 0 30px;
cursor: unset;
i { i {
} }
&:hover {
opacity: 1 !important;
}
} }
.organization-info { .organization-info {
display: flex; display: flex;
@ -62,6 +68,10 @@
flex-flow: row; flex-flow: row;
overflow: hidden; overflow: hidden;
align-items: center; align-items: center;
.person-count {
margin-left: 5px;
}
} }
.organization-name { .organization-name {
font-size: 0.94rem; font-size: 0.94rem;
@ -161,6 +171,10 @@
.select-user-title { .select-user-title {
font-size: 0.9em; font-size: 0.9em;
font-weight: 600; font-weight: 600;
span {
margin-left: 5px;
}
} }
::ng-deep .organization-accordion { ::ng-deep .organization-accordion {

View File

@ -125,6 +125,7 @@ export class OrganizationComponent implements OnInit, OnDestroy {
departmentUserInfoListSubscription: Subscription; departmentUserInfoListSubscription: Subscription;
searchDepartmentUserInfoListSubscription: Subscription; searchDepartmentUserInfoListSubscription: Subscription;
tmpUserList: UserInfoSS[] = []; // Backup data to use when canceling the search.
departmentUserInfoList: UserInfoSS[] = []; departmentUserInfoList: UserInfoSS[] = [];
originDepartmentUserInfoList: UserInfoSS[] = []; originDepartmentUserInfoList: UserInfoSS[] = [];
@ -182,6 +183,11 @@ export class OrganizationComponent implements OnInit, OnDestroy {
.pipe(select(AppStore.MessengerSelector.QuerySelector.isSearch)) .pipe(select(AppStore.MessengerSelector.QuerySelector.isSearch))
.subscribe(isSearch => { .subscribe(isSearch => {
this.isSearch = isSearch; this.isSearch = isSearch;
if (!isSearch && this.tmpUserList.length > 0) {
this.departmentUserInfoList = this.tmpUserList.slice();
this.tmpUserList = [];
}
}); });
this.selectedDepartmentProcessing$ = this.store.pipe( this.selectedDepartmentProcessing$ = this.store.pipe(
@ -218,6 +224,12 @@ export class OrganizationComponent implements OnInit, OnDestroy {
) )
.subscribe(list => { .subscribe(list => {
if (!!this.isSearch) { if (!!this.isSearch) {
if (
this.departmentUserInfoList.length > 0 &&
this.tmpUserList.length === 0
) {
this.tmpUserList = this.departmentUserInfoList.slice();
}
this.departmentUserInfoList = list; this.departmentUserInfoList = list;
this.originDepartmentUserInfoList = list; this.originDepartmentUserInfoList = list;

View File

@ -1,4 +1,7 @@
<perfect-scrollbar class="scrollbar"> <perfect-scrollbar
class="scrollbar"
*ngIf="!!sortedData && 0 < sortedData.length"
>
<table <table
mat-table mat-table
matSort matSort

View File

@ -207,3 +207,7 @@ td.mat-cell {
} }
} }
} }
::ng-deep .ps__rail-y {
z-index: 101;
}