From 06ff83c0c3e36008b060bf36d1e7e78cfd410e95 Mon Sep 17 00:00:00 2001 From: leejinho Date: Thu, 21 Nov 2019 14:02:11 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EB=8C=80=ED=99=94=EB=B0=A9=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=EB=B3=84=20context=20menu=20=EB=B6=84=EB=A6=AC?= =?UTF-8?q?=EC=B2=98=EB=A6=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/messages.component.html | 42 +++++++++++++++---- .../components/messages.component.ts | 20 +++++++++ 2 files changed, 55 insertions(+), 7 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html index adfa5a5e..737cf00f 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html @@ -86,25 +86,53 @@ - - - - - - - diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts index 26b198a7..bb6ecf4c 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts @@ -331,6 +331,26 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { } } + getShowContextMenu(menuType: string) { + if ( + menuType === 'OPEN_ROOM_USER' || + menuType === 'ADD_MEMBER' || + menuType === 'ADD_GROUP' || + menuType === 'EDIT_ROOM' + ) { + if ( + this.roomInfo.roomType === RoomType.Mytalk || + this.roomInfo.roomType === RoomType.Allim || + this.roomInfo.roomType === RoomType.Bot || + this.roomInfo.roomType === RoomType.Link + ) { + return false; + } + } + + return true; + } + readyToReply(): void { setTimeout(() => { this.focusReplyInput(); From e57a44fa5b4e8677c66b22c2f31ed785b10bd75a Mon Sep 17 00:00:00 2001 From: leejinho Date: Thu, 21 Nov 2019 14:05:55 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=95=A8=EB=B2=94=ED=95=A8=20preview=20def?= =?UTF-8?q?atul=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=B6=84=EA=B8=B0?= =?UTF-8?q?=EC=B2=98=EB=A6=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../right-drawer/album-box.component.html | 43 ++++++++++++++----- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html index b27d2402..1d964527 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html @@ -1,4 +1,4 @@ -
+
@@ -7,11 +7,20 @@
- - -
- + + +
+ @@ -19,9 +28,18 @@ Select File.
-
- +
+ @@ -50,8 +68,11 @@
    -
  • {{ selectedFile.info.name }}
    • -
  • size : {{ selectedFile.info.size | ucapBytes }}
    • +
  • {{ selectedFile.info.name }}
    • +
  • + size : + {{ selectedFile.info.size | ucapBytes }} +
  • date : {{ selectedFile.info.sendDate | dateToStringFormat: 'YYYY.MM.DD' }} From a58423271d411a45e1ab574cb38c2b9a640da99d Mon Sep 17 00:00:00 2001 From: leejinho Date: Thu, 21 Nov 2019 14:10:15 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=A1=B0=EC=A7=81=EB=8F=84=20>=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=ED=95=84=20=ED=8C=9D=EC=97=85=20=EC=98=A4=ED=8A=BC=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layouts/messenger/components/left-side.component.html | 1 + .../components/left-sidenav/organization.component.html | 2 ++ .../components/left-sidenav/organization.component.ts | 8 ++++++++ 3 files changed, 11 insertions(+) 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 f09d1009..e78adbd5 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 @@ -149,6 +149,7 @@ [selectedUserList]="selectedUserList" (checkAllUser)="onCheckAllUser($event)" (checkUser)="onCheckUser($event)" + (openProfile)="onClickOpenProfile($event)" (toggleUser)="onToggleUser($event)" class="organization-side" > 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 f72bad85..fa09e77a 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 @@ -54,6 +54,7 @@ [selectedUserList]="selectedUserList" [isChecked]="getCheckedUser(userInfo)" (checkUser)="onCheckUser($event)" + (openProfile)="onClickOpenProfile($event)" (click)="onToggleUser(userInfo)" > Loading... @@ -74,6 +75,7 @@ [selectedUserList]="selectedUserList" [isChecked]="getCheckedUser(userInfo)" (checkUser)="onCheckUser($event)" + (openProfile)="onClickOpenProfile($event)" (click)="onToggleUser(userInfo)" > diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts index 3371b83d..bac83e4a 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts @@ -72,6 +72,10 @@ export class OrganizationComponent implements OnInit, OnDestroy { isChecked: boolean; userInfos: (UserInfo | UserInfoSS | UserInfoF | UserInfoDN)[]; }>(); + @Output() + openProfile = new EventEmitter< + UserInfo | UserInfoSS | UserInfoF | UserInfoDN + >(); companyList$: Observable; companyCode: string; @@ -329,6 +333,10 @@ export class OrganizationComponent implements OnInit, OnDestroy { this.toggleUser.emit(userInfo); } + onClickOpenProfile(userInfo: UserInfo | UserInfoSS | UserInfoF | UserInfoDN) { + this.openProfile.emit(userInfo); + } + onClickShowSelectedUserList() { this.logger.debug('onClickShowSelectedUserList', this.selectedUserList); }