bugfix :: 필터오류 수정, 필터 drop 영역 타이틀 위로 안올라 가게 고정.
This commit is contained in:
parent
5afa223c17
commit
30843f2de9
|
@ -30,6 +30,7 @@
|
||||||
<mat-label>{{ 'search.fieldCompany' | translate }}</mat-label>
|
<mat-label>{{ 'search.fieldCompany' | translate }}</mat-label>
|
||||||
<mat-select
|
<mat-select
|
||||||
#filterCompany
|
#filterCompany
|
||||||
|
disableOptionCentering="true"
|
||||||
[formControl]="fcCompany"
|
[formControl]="fcCompany"
|
||||||
multiple
|
multiple
|
||||||
(openedChange)="onOpenedChange($event)"
|
(openedChange)="onOpenedChange($event)"
|
||||||
|
@ -57,6 +58,7 @@
|
||||||
<mat-label>{{ 'search.fieldGrade' | translate }}</mat-label>
|
<mat-label>{{ 'search.fieldGrade' | translate }}</mat-label>
|
||||||
<mat-select
|
<mat-select
|
||||||
#filterGrade
|
#filterGrade
|
||||||
|
disableOptionCentering="true"
|
||||||
[formControl]="fcGrade"
|
[formControl]="fcGrade"
|
||||||
multiple
|
multiple
|
||||||
(openedChange)="onOpenedChange($event)"
|
(openedChange)="onOpenedChange($event)"
|
||||||
|
@ -84,6 +86,7 @@
|
||||||
<mat-label>{{ 'search.fieldWorkPlace' | translate }}</mat-label>
|
<mat-label>{{ 'search.fieldWorkPlace' | translate }}</mat-label>
|
||||||
<mat-select
|
<mat-select
|
||||||
#filterWorkPlace
|
#filterWorkPlace
|
||||||
|
disableOptionCentering="true"
|
||||||
[formControl]="fcWorkPlace"
|
[formControl]="fcWorkPlace"
|
||||||
multiple
|
multiple
|
||||||
(openedChange)="onOpenedChange($event)"
|
(openedChange)="onOpenedChange($event)"
|
||||||
|
@ -111,6 +114,7 @@
|
||||||
<mat-label>{{ 'presence.label' | translate }}</mat-label>
|
<mat-label>{{ 'presence.label' | translate }}</mat-label>
|
||||||
<mat-select
|
<mat-select
|
||||||
#filterPresence
|
#filterPresence
|
||||||
|
disableOptionCentering="true"
|
||||||
[formControl]="fcPresence"
|
[formControl]="fcPresence"
|
||||||
multiple
|
multiple
|
||||||
(openedChange)="onOpenedChange($event)"
|
(openedChange)="onOpenedChange($event)"
|
||||||
|
|
|
@ -641,10 +641,10 @@ export class OrganizationComponent implements OnInit, OnDestroy {
|
||||||
|
|
||||||
let isMulti = false;
|
let isMulti = false;
|
||||||
if (!!companies && companies.length > 0) {
|
if (!!companies && companies.length > 0) {
|
||||||
isMulti = true;
|
const data = !isMulti
|
||||||
const data = !!isMulti
|
|
||||||
? this.originDepartmentUserInfoList
|
? this.originDepartmentUserInfoList
|
||||||
: this.departmentUserInfoList;
|
: this.departmentUserInfoList;
|
||||||
|
isMulti = true;
|
||||||
|
|
||||||
this.departmentUserInfoList = data.filter(userInfo => {
|
this.departmentUserInfoList = data.filter(userInfo => {
|
||||||
if (
|
if (
|
||||||
|
@ -658,10 +658,10 @@ export class OrganizationComponent implements OnInit, OnDestroy {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (!!grades && grades.length > 0) {
|
if (!!grades && grades.length > 0) {
|
||||||
isMulti = true;
|
const data = !isMulti
|
||||||
const data = !!isMulti
|
|
||||||
? this.originDepartmentUserInfoList
|
? this.originDepartmentUserInfoList
|
||||||
: this.departmentUserInfoList;
|
: this.departmentUserInfoList;
|
||||||
|
isMulti = true;
|
||||||
|
|
||||||
this.departmentUserInfoList = data.filter(userInfo => {
|
this.departmentUserInfoList = data.filter(userInfo => {
|
||||||
if (
|
if (
|
||||||
|
@ -685,10 +685,10 @@ export class OrganizationComponent implements OnInit, OnDestroy {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (!!workplaces && workplaces.length > 0) {
|
if (!!workplaces && workplaces.length > 0) {
|
||||||
isMulti = true;
|
const data = !isMulti
|
||||||
const data = !!isMulti
|
|
||||||
? this.originDepartmentUserInfoList
|
? this.originDepartmentUserInfoList
|
||||||
: this.departmentUserInfoList;
|
: this.departmentUserInfoList;
|
||||||
|
isMulti = true;
|
||||||
|
|
||||||
this.departmentUserInfoList = data.filter(userInfo => {
|
this.departmentUserInfoList = data.filter(userInfo => {
|
||||||
if (
|
if (
|
||||||
|
@ -702,10 +702,10 @@ export class OrganizationComponent implements OnInit, OnDestroy {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (!!presences && presences.length > 0) {
|
if (!!presences && presences.length > 0) {
|
||||||
isMulti = true;
|
const data = !isMulti
|
||||||
const data = !!isMulti
|
|
||||||
? this.originDepartmentUserInfoList
|
? this.originDepartmentUserInfoList
|
||||||
: this.departmentUserInfoList;
|
: this.departmentUserInfoList;
|
||||||
|
isMulti = true;
|
||||||
|
|
||||||
this.departmentUserInfoList = data.filter(userInfo => {
|
this.departmentUserInfoList = data.filter(userInfo => {
|
||||||
const userPresences = this.presenceSubject.value.filter(
|
const userPresences = this.presenceSubject.value.filter(
|
||||||
|
|
|
@ -50,6 +50,7 @@
|
||||||
<mat-label>{{ 'search.fieldCompany' | translate }}</mat-label>
|
<mat-label>{{ 'search.fieldCompany' | translate }}</mat-label>
|
||||||
<mat-select
|
<mat-select
|
||||||
#filterCompany
|
#filterCompany
|
||||||
|
disableOptionCentering="true"
|
||||||
[formControl]="fcCompany"
|
[formControl]="fcCompany"
|
||||||
multiple
|
multiple
|
||||||
(openedChange)="onOpenedChange($event)"
|
(openedChange)="onOpenedChange($event)"
|
||||||
|
@ -78,6 +79,7 @@
|
||||||
<mat-label>{{ 'search.fieldGrade' | translate }}</mat-label>
|
<mat-label>{{ 'search.fieldGrade' | translate }}</mat-label>
|
||||||
<mat-select
|
<mat-select
|
||||||
#filterGrade
|
#filterGrade
|
||||||
|
disableOptionCentering="true"
|
||||||
[formControl]="fcGrade"
|
[formControl]="fcGrade"
|
||||||
multiple
|
multiple
|
||||||
(openedChange)="onOpenedChange($event)"
|
(openedChange)="onOpenedChange($event)"
|
||||||
|
@ -106,6 +108,7 @@
|
||||||
<mat-label>{{ 'search.fieldWorkPlace' | translate }}</mat-label>
|
<mat-label>{{ 'search.fieldWorkPlace' | translate }}</mat-label>
|
||||||
<mat-select
|
<mat-select
|
||||||
#filterWorkPlace
|
#filterWorkPlace
|
||||||
|
disableOptionCentering="true"
|
||||||
[formControl]="fcWorkPlace"
|
[formControl]="fcWorkPlace"
|
||||||
multiple
|
multiple
|
||||||
(openedChange)="onOpenedChange($event)"
|
(openedChange)="onOpenedChange($event)"
|
||||||
|
@ -134,6 +137,7 @@
|
||||||
<mat-label>{{ 'presence.label' | translate }}</mat-label>
|
<mat-label>{{ 'presence.label' | translate }}</mat-label>
|
||||||
<mat-select
|
<mat-select
|
||||||
#filterPresence
|
#filterPresence
|
||||||
|
disableOptionCentering="true"
|
||||||
[formControl]="fcPresence"
|
[formControl]="fcPresence"
|
||||||
multiple
|
multiple
|
||||||
(openedChange)="onOpenedChange($event)"
|
(openedChange)="onOpenedChange($event)"
|
||||||
|
|
|
@ -643,10 +643,10 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
|
||||||
|
|
||||||
let isMulti = false;
|
let isMulti = false;
|
||||||
if (!!companies && companies.length > 0) {
|
if (!!companies && companies.length > 0) {
|
||||||
isMulti = true;
|
const data = !isMulti
|
||||||
const data = !!isMulti
|
|
||||||
? this.originDepartmentUserInfoList
|
? this.originDepartmentUserInfoList
|
||||||
: this.departmentUserInfoList;
|
: this.departmentUserInfoList;
|
||||||
|
isMulti = true;
|
||||||
|
|
||||||
this.departmentUserInfoList = data.filter(userInfo => {
|
this.departmentUserInfoList = data.filter(userInfo => {
|
||||||
if (
|
if (
|
||||||
|
@ -660,10 +660,10 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (!!grades && grades.length > 0) {
|
if (!!grades && grades.length > 0) {
|
||||||
isMulti = true;
|
const data = !isMulti
|
||||||
const data = !!isMulti
|
|
||||||
? this.originDepartmentUserInfoList
|
? this.originDepartmentUserInfoList
|
||||||
: this.departmentUserInfoList;
|
: this.departmentUserInfoList;
|
||||||
|
isMulti = true;
|
||||||
|
|
||||||
this.departmentUserInfoList = data.filter(userInfo => {
|
this.departmentUserInfoList = data.filter(userInfo => {
|
||||||
if (
|
if (
|
||||||
|
@ -687,10 +687,10 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (!!workplaces && workplaces.length > 0) {
|
if (!!workplaces && workplaces.length > 0) {
|
||||||
isMulti = true;
|
const data = !isMulti
|
||||||
const data = !!isMulti
|
|
||||||
? this.originDepartmentUserInfoList
|
? this.originDepartmentUserInfoList
|
||||||
: this.departmentUserInfoList;
|
: this.departmentUserInfoList;
|
||||||
|
isMulti = true;
|
||||||
|
|
||||||
this.departmentUserInfoList = data.filter(userInfo => {
|
this.departmentUserInfoList = data.filter(userInfo => {
|
||||||
if (
|
if (
|
||||||
|
@ -704,10 +704,10 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (!!presences && presences.length > 0) {
|
if (!!presences && presences.length > 0) {
|
||||||
isMulti = true;
|
const data = !isMulti
|
||||||
const data = !!isMulti
|
|
||||||
? this.originDepartmentUserInfoList
|
? this.originDepartmentUserInfoList
|
||||||
: this.departmentUserInfoList;
|
: this.departmentUserInfoList;
|
||||||
|
isMulti = true;
|
||||||
|
|
||||||
this.departmentUserInfoList = data.filter(userInfo => {
|
this.departmentUserInfoList = data.filter(userInfo => {
|
||||||
const userPresences = this.presenceSubject.value.filter(
|
const userPresences = this.presenceSubject.value.filter(
|
||||||
|
|
Loading…
Reference in New Issue
Block a user