ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger

Browse Source
This commit is contained in:
병준 박 2019-11-06 13:48:20 +09:00
commit bc38d47c14
2 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.html
View File

@ -48,8 +48,8 @@
</form> </form>
</div> </div>
</div> </div>
</div>
<div *ngIf="!isSearch" class="app-layout-chat-left-sidenav-chat-list"> <div *ngIf="!isSearch" class="app-layout-chat-left-sidenav-chat-list">
<perfect-scrollbar fxFlex="1 1 auto"> <perfect-scrollbar fxFlex="1 1 auto">
<ucap-room-list-item <ucap-room-list-item
*ngFor="let room of roomList" *ngFor="let room of roomList"
@ -61,6 +61,7 @@
(contextmenu)="onContextMenuChat($event, room)" (contextmenu)="onContextMenuChat($event, room)"
> >
</ucap-room-list-item> </ucap-room-list-item>
</perfect-scrollbar>
<!-- <cdk-virtual-scroll-viewport <!-- <cdk-virtual-scroll-viewport
itemSize="20" itemSize="20"
class="app-layout-chat-left-sidenav-chat-list-viewport" class="app-layout-chat-left-sidenav-chat-list-viewport"
@ -76,9 +77,9 @@
> >
</ucap-room-list-item> </ucap-room-list-item>
</cdk-virtual-scroll-viewport> --> </cdk-virtual-scroll-viewport> -->
</perfect-scrollbar> </div>
</div> <div *ngIf="!!isSearch" class="app-layout-chat-left-sidenav-chat-list search">
<div *ngIf="!!isSearch" class="app-layout-chat-left-sidenav-chat-list search"> <perfect-scrollbar fxFlex="1 1 auto">
<ucap-room-list-item <ucap-room-list-item
*ngFor="let room of searchRoomList" *ngFor="let room of searchRoomList"
[loginRes]="loginRes" [loginRes]="loginRes"
@ -89,6 +90,7 @@
(contextmenu)="onContextMenuChat($event, room)" (contextmenu)="onContextMenuChat($event, room)"
> >
</ucap-room-list-item> </ucap-room-list-item>
</perfect-scrollbar>
<!-- <cdk-virtual-scroll-viewport <!-- <cdk-virtual-scroll-viewport
itemSize="20" itemSize="20"
class="app-layout-chat-left-sidenav-chat-list-viewport" class="app-layout-chat-left-sidenav-chat-list-viewport"
@ -104,20 +106,20 @@
> >
</ucap-room-list-item> </ucap-room-list-item>
</cdk-virtual-scroll-viewport> --> </cdk-virtual-scroll-viewport> -->
</div> </div>
<div <div
style="visibility: hidden; position: fixed" style="visibility: hidden; position: fixed"
[style.left]="chatContextMenuPosition.x" [style.left]="chatContextMenuPosition.x"
[style.top]="chatContextMenuPosition.y" [style.top]="chatContextMenuPosition.y"
#chatContextMenuTrigger="matMenuTrigger" #chatContextMenuTrigger="matMenuTrigger"
[matMenuTriggerFor]="chatContextMenu" [matMenuTriggerFor]="chatContextMenu"
></div> ></div>
<mat-menu <mat-menu
#chatContextMenu="matMenu" #chatContextMenu="matMenu"
[hasBackdrop]="false" [hasBackdrop]="false"
(ucapClickOutside)="chatContextMenuTrigger.closeMenu()" (ucapClickOutside)="chatContextMenuTrigger.closeMenu()"
> >
<ng-template matMenuContent let-roomInfo="roomInfo"> <ng-template matMenuContent let-roomInfo="roomInfo">
<button mat-menu-item (click)="onSelectedRoom(roomInfo)"> <button mat-menu-item (click)="onSelectedRoom(roomInfo)">
대화방 열기 대화방 열기
@ -129,5 +131,4 @@
대화방 나가기 대화방 나가기
</button> </button>
</ng-template> </ng-template>
</mat-menu> </mat-menu>
</div>

2
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.scss
View File

@ -70,7 +70,7 @@
} }
.app-layout-chat-left-sidenav-chat-list { .app-layout-chat-left-sidenav-chat-list {
height: calc(100% - 60px); height: calc(100% - 120px);
} }
.app-layout-chat-left-sidenav-chat-list-viewport { .app-layout-chat-left-sidenav-chat-list-viewport {