diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html index 92259984..86e42ad3 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html @@ -145,6 +145,7 @@ > (); @ViewChildren('tabs') tabs: QueryList>; + currentTabLable: string; badgeChatUnReadCount: number; badgeChatUnReadCountSubscription: Subscription; @@ -81,6 +82,7 @@ export class LeftSideComponent implements OnInit, OnDestroy { }); this.setFabInitial(MainMenu.Group); + this.currentTabLable = MainMenu.Group; } ngOnDestroy(): void { @@ -158,6 +160,7 @@ export class LeftSideComponent implements OnInit, OnDestroy { onSelectedTabChange(event: MatTabChangeEvent) { this.setFabInitial(event.tab.ariaLabel); + this.currentTabLable = event.tab.ariaLabel; this.tabs.forEach(tab => { if (`tabs-${event.index}` === tab.nativeElement.id) { diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html index fa09e77a..131fa1fe 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html @@ -44,8 +44,13 @@
-
- +
+ - Loading...
(); + @ViewChild('cvsvDeptUser', { static: false }) + cvsvDeptUser: CdkVirtualScrollViewport; + companyList$: Observable; companyCode: string; departmentInfoList$: Observable; - selectedDepartmentUserInfoList$: Observable; selectedDepartmentUserInfoList: UserInfoSS[] = []; selectedDepartmentUserInfoListSubscription: Subscription; selectedDepartmentStatus$: Observable; @@ -96,6 +107,9 @@ export class OrganizationComponent implements OnInit, OnDestroy { isShowSearch = false; searchUserInfos: UserInfoSS[] = []; + /** 부서원 리스트에 virture scroll의 size 가 체킹되지 않아 강제 수행. 1번만. */ + isInitList = false; + constructor( private store: Store, private sessionStorageService: SessionStorageService, @@ -173,6 +187,19 @@ export class OrganizationComponent implements OnInit, OnDestroy { .subscribe(); } + ngAfterViewChecked(): void { + if ( + !!this.cvsvDeptUser && + !!this.selectedDepartmentUserInfoList && + this.selectedDepartmentUserInfoList.length > 0 && + !this.isInitList && + this.isVisible + ) { + this.isInitList = true; + this.cvsvDeptUser.checkViewportSize(); + } + } + ngOnDestroy(): void { if (!!this.selectedDepartmentUserInfoListSubscription) { this.selectedDepartmentUserInfoListSubscription.unsubscribe(); diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html index a310910a..4d0fa70d 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html @@ -125,6 +125,7 @@ [showTitle]="false" [selectedUserList]="selectedUserList" [isUserSelect]="true" + [isVisible]="currentTabIndex === 1" (checkAllUser)="onCheckAllUser($event)" (checkUser)="onCheckUser($event)" (toggleUser)="onToggleUser($event)" diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts index 164b976b..ac6813b1 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts @@ -110,6 +110,8 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy { ); } + currentTabIndex: number; + UserSelectDialogType = UserSelectDialogType; loginRes: LoginResponse; @@ -237,6 +239,8 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy { if (this.data.type === UserSelectDialogType.EditChatMember) { this.selectedUserList = this.data.curRoomUser; } + + this.currentTabIndex = 0; } ngOnDestroy(): void { @@ -284,6 +288,8 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy { } onSelectedTabChange(tabChangeEvent: MatTabChangeEvent): void { + this.currentTabIndex = tabChangeEvent.index; + if (tabChangeEvent.index === 2) { this.selectedUserList = []; this.isShowSelectedUserList = false; diff --git a/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.scss b/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.scss index f74e9c21..4273023d 100644 --- a/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.scss +++ b/projects/ucap-webmessenger-ui/src/lib/components/float-action-button.component.scss @@ -1,7 +1,7 @@ .fab-container { position: absolute; bottom: 15px; - right: 15px; + right: 40px; z-index: 100; display: flex; flex-direction: column-reverse;