# 이슈처리

179 조직도 전체 선택 후 그룹추가 시 전체 선택 표시 남아있음
This commit is contained in:
leejinho 2020-01-23 13:07:13 +09:00
parent 83847aab28
commit 1d30d35684

View File

@ -6,7 +6,8 @@ import {
EventEmitter, EventEmitter,
Input, Input,
ViewChild, ViewChild,
AfterViewChecked AfterViewChecked,
ChangeDetectorRef
} from '@angular/core'; } from '@angular/core';
import { ucapAnimations, DialogService } from '@ucap-webmessenger/ui'; import { ucapAnimations, DialogService } from '@ucap-webmessenger/ui';
import { Observable, Subscription, of } from 'rxjs'; import { Observable, Subscription, of } from 'rxjs';
@ -158,6 +159,7 @@ export class OrganizationComponent
private queryProtocolService: QueryProtocolService, private queryProtocolService: QueryProtocolService,
private dialogService: DialogService, private dialogService: DialogService,
private translateService: TranslateService, private translateService: TranslateService,
private changeDetectorRef: ChangeDetectorRef,
private logger: NGXLogger private logger: NGXLogger
) { ) {
this.loginInfo = this.sessionStorageService.get<LoginInfo>(KEY_LOGIN_INFO); this.loginInfo = this.sessionStorageService.get<LoginInfo>(KEY_LOGIN_INFO);
@ -374,13 +376,15 @@ export class OrganizationComponent
if ( if (
!compareList || !compareList ||
compareList.length === 0 || compareList.length === 0 ||
compareList.filter( compareList
item => .filter(item => item.seq !== this.loginRes.userSeq)
!( .filter(
this.selectedUserList.filter(user => user.seq === item.seq).length > item =>
0 !(
) this.selectedUserList.filter(user => user.seq === item.seq)
).length > 0 .length > 0
)
).length > 0
) { ) {
return false; return false;
} else { } else {
@ -418,6 +422,8 @@ export class OrganizationComponent
: this.selectedDepartmentUserInfoList : this.selectedDepartmentUserInfoList
).filter(user => user.seq !== this.loginRes.userSeq) ).filter(user => user.seq !== this.loginRes.userSeq)
}); });
this.changeDetectorRef.detectChanges();
} }
/** 리스트가 checkable 할 경우 checkbox 의 change 이벤트를 상위 컴포넌트로 전달한다. */ /** 리스트가 checkable 할 경우 checkbox 의 change 이벤트를 상위 컴포넌트로 전달한다. */
@ -507,10 +513,22 @@ export class OrganizationComponent
const seq: number[] = []; const seq: number[] = [];
this.selectedUserList.map(user => seq.push(user.seq)); this.selectedUserList.map(user => seq.push(user.seq));
this.store.dispatch(ChatStore.openRoom({ userSeqList: seq })); this.store.dispatch(ChatStore.openRoom({ userSeqList: seq }));
// 상위 컴포넌트의 selectedUserList clear.
this.checkAllUser.emit({
isChecked: false,
userInfos: this.selectedUserList
});
} }
} }
onClickConference() { onClickConference() {
this.logger.debug('onClickConference', this.selectedUserList); this.logger.debug('onClickConference', this.selectedUserList);
// 상위 컴포넌트의 selectedUserList clear.
this.checkAllUser.emit({
isChecked: false,
userInfos: this.selectedUserList
});
} }
onContextMenuOrgUser( onContextMenuOrgUser(