From b43afc3ebb73b47b2382566ac3a8773a8d2516a0 Mon Sep 17 00:00:00 2001 From: khk Date: Thu, 21 Nov 2019 16:43:47 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=95=A8=EB=B2=94,=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=ED=95=A8-=20=ED=8D=BC=ED=8E=99=ED=8A=B8=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A1=A4=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/left-side.component.scss | 14 ++- .../left-sidenav/chat.component.scss | 1 + .../left-sidenav/group.component.scss | 15 +-- .../components/right-drawer.component.scss | 7 ++ .../right-drawer/album-box.component.html | 4 +- .../right-drawer/album-box.component.scss | 23 ++-- .../right-drawer/file-box.component.html | 102 +++++++++--------- .../right-drawer/file-box.component.scss | 9 +- .../right-drawer/message-box.component.scss | 49 ++++++++- 9 files changed, 141 insertions(+), 83 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss index 081401ec..43203001 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss @@ -33,6 +33,7 @@ width: 70px; flex-direction: row; } + ::ng-deep .organization-side { flex-direction: column; height: 100%; @@ -44,6 +45,7 @@ flex-flow: column; height: 280px; padding-top: 10px; + border-bottom: none; .mat-tab-label { width: 100%; height: 80px; @@ -92,11 +94,15 @@ .mat-tab-label-content { .icon-item { transform: scale(1); - /*svg { - stroke: #ef4c73; - fill: #ef4c73; - }*/ } } } } + +::ng-deep .ps { + .ps-content { + position: relative; + width: 100%; + height: 100%; + } +} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.scss index dd3c4550..01da071c 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.scss @@ -14,6 +14,7 @@ } .list-search { + position: relative; display: flex; flex-direction: row; height: 60px; diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.scss index 6ee241ce..c0f9275a 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.scss @@ -16,13 +16,6 @@ } } } -::ng-deep .ps { - .ps-content { - position: relative; - width: 100%; - height: 100%; - } -} .search-result { height: calc(100% - 130px); @@ -52,7 +45,7 @@ } } -.list-item-frame{ - width:100%; - height:100%; -} \ No newline at end of file +.list-item-frame { + width: 100%; + height: 100%; +} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss index 05af8861..f2f5be6d 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss @@ -9,4 +9,11 @@ span{ margin-left:auto; } +} +::ng-deep .mat-tab-labels { + display: flex; + width: 100%; + border-bottom: 2px solid #dddddd; + flex: 1 1 auto; + justify-content: space-around; } \ No newline at end of file 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 765096d6..1c60254d 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 @@ -
+
@@ -81,7 +81,7 @@
- +
- - - - - - - - - - - - - - - -
- - - - - - - Name - -
- {{ element.info.name }} -
-
- - {{ element.info.sendDate | dateToStringFormat: 'YYYY.MM.DD' }} ~ - 2020.01.23 -
- 		sendDate - - {{ element.info.size | ucapBytes }} -
+ + + + + + + + + + + + + + + + +
+ + + + + + + Name + +
+ {{ element.info.name }} +
+
+ + {{ element.info.sendDate | dateToStringFormat: 'YYYY.MM.DD' }} ~ + 2020.01.23 +
+ 		sendDate + + {{ element.info.size | ucapBytes }} +
+
Date: Thu, 21 Nov 2019 17:43:20 +0900 Subject: [PATCH 2/3] =?UTF-8?q?1.=20=EB=8C=80=ED=99=94=EB=B0=A9=20>=20?= =?UTF-8?q?=EB=8C=80=ED=99=94=EC=83=81=EB=8C=80=EC=B6=94=EA=B0=80=20::=20?= =?UTF-8?q?=EA=B8=B0=EC=A1=B4=EC=9D=B8=EC=9B=90=EC=9D=B4=20=EC=A7=80?= =?UTF-8?q?=EC=9B=8C=EC=A0=B8=EB=8F=84=20=EB=8D=B0=EC=9D=B4=ED=84=B0?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=97=86=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.=20>>>=20=EC=B6=94=ED=9B=84=20=EA=B8=B0?= =?UTF-8?q?=EC=A1=B4=EC=9D=B8=EC=9B=90=EC=9D=84=20=EB=BA=84=20=EC=88=98=20?= =?UTF-8?q?=EC=97=86=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=ED=95=B4?= =?UTF-8?q?=EC=95=BC=20=ED=95=A8.=202.=20=EC=9C=A0=EC=A0=80=EC=84=A0?= =?UTF-8?q?=ED=83=9D=20=ED=8C=9D=EC=97=85=20>=20=EA=B7=B8=EB=A3=B9=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=EC=8B=9C=20=EA=B7=B8=EB=A3=B9=EC=9B=90=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=20=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20>>>=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EA=BC=AC?= =?UTF-8?q?=EC=9D=B4=EB=8A=94=20=EB=AC=B8=EC=A0=9C=EA=B0=80=20=EC=9E=88?= =?UTF-8?q?=EC=96=B4=20=EC=B6=94=ED=9B=84=20=ED=95=B4=EA=B2=B0=ED=95=B4?= =?UTF-8?q?=EC=95=BC=ED=95=A8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/messages.component.ts | 10 +++-- .../right-drawer/room-user-list.component.ts | 32 ++++++++------- .../chat/create-chat.dialog.component.html | 16 +------- .../chat/create-chat.dialog.component.ts | 1 + .../components/expansion-panel.component.html | 27 +++++++++---- .../components/expansion-panel.component.scss | 5 +++ .../components/expansion-panel.component.ts | 40 +++++++++++-------- 7 files changed, 75 insertions(+), 56 deletions(-) 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 f26cb875..1a068024 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 @@ -886,13 +886,17 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { }); if (!!result && !!result.choice && result.choice) { - const userSeqs: number[] = []; + const userSeqs: number[] = this.userInfoList.map( + userInfo => userInfo.seq + ); if ( !!result.selectedUserList && result.selectedUserList.length > 0 ) { - result.selectedUserList.map(user => { - userSeqs.push(user.seq); + result.selectedUserList.forEach(user => { + if (userSeqs.indexOf(user.seq) < 0) { + userSeqs.push(user.seq); + } }); } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/room-user-list.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/room-user-list.component.ts index 560935c2..af0f218b 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/room-user-list.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/room-user-list.component.ts @@ -3,7 +3,7 @@ import { OnInit, OnDestroy, Output, - EventEmitter, + EventEmitter } from '@angular/core'; import { Subscription } from 'rxjs'; import { Store, select } from '@ngrx/store'; @@ -21,13 +21,13 @@ import { DialogService } from '@ucap-webmessenger/ui'; import { SelectGroupDialogComponent, SelectGroupDialogResult, - SelectGroupDialogData, + SelectGroupDialogData } from '../../dialogs/group/select-group.dialog.component'; import { GroupDetailData } from '@ucap-webmessenger/protocol-sync'; import { CreateChatDialogComponent, CreateChatDialogResult, - CreateChatDialogData, + CreateChatDialogData } from '../../dialogs/chat/create-chat.dialog.component'; import { UserSelectDialogType } from '@app/types'; import { LoginResponse } from '@ucap-webmessenger/protocol-authentication'; @@ -36,7 +36,7 @@ import { KEY_LOGIN_RES_INFO } from '@app/types/login-res-info.type'; @Component({ selector: 'app-layout-chat-right-drawer-room-user-list', templateUrl: './room-user-list.component.html', - styleUrls: ['./room-user-list.component.scss'], + styleUrls: ['./room-user-list.component.scss'] }) export class RoomUserListComponent implements OnInit, OnDestroy { @Output() @@ -105,15 +105,19 @@ export class RoomUserListComponent implements OnInit, OnDestroy { title: 'Edit Chat Member', curRoomUser: this.userInfoList.filter( user => user.seq !== this.loginRes.userSeq - ), - }, + ) + } }); if (!!result && !!result.choice && result.choice) { - const userSeqs: number[] = []; + const userSeqs: number[] = this.userInfoList.map( + userInfo => userInfo.seq + ); if (!!result.selectedUserList && result.selectedUserList.length > 0) { - result.selectedUserList.map(user => { - userSeqs.push(user.seq); + result.selectedUserList.forEach(user => { + if (userSeqs.indexOf(user.seq) < 0) { + userSeqs.push(user.seq); + } }); } @@ -125,8 +129,8 @@ export class RoomUserListComponent implements OnInit, OnDestroy { RoomStore.inviteOrOpen({ req: { divCd: 'Invite', - userSeqs, - }, + userSeqs + } }) ); } @@ -141,8 +145,8 @@ export class RoomUserListComponent implements OnInit, OnDestroy { >(SelectGroupDialogComponent, { width: '600px', data: { - title: 'Group Select', - }, + title: 'Group Select' + } }); if (!!result && !!result.choice && result.choice) { @@ -159,7 +163,7 @@ export class RoomUserListComponent implements OnInit, OnDestroy { this.store.dispatch( SyncStore.updateGroupMember({ oldGroup, - trgtUserSeq, + trgtUserSeq }) ); } 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 861ad647..a310910a 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 @@ -70,9 +70,9 @@ chat
- 부서원 전체 선택 */ onCheckAllUser(params: { isChecked: boolean; userInfos: (UserInfo | UserInfoSS | UserInfoF | UserInfoDN)[]; diff --git a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html index b5f465bd..7ab7cbe3 100644 --- a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html +++ b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html @@ -47,27 +47,38 @@ - 내 프로필 - 즐겨찾기 - ({{ node.countOfChildren }}명) + 내 프로필 + + + 즐겨찾기 + + ({{ node.countOfChildren }}명) {{ node.groupDetail.name }} - ({{ node.countOfChildren }}명) + ({{ node.countOfChildren }}명) + +