From c9070ecc960bf69af7576c07bc15d83a56e8cc8b Mon Sep 17 00:00:00 2001 From: leejinho Date: Fri, 15 Nov 2019 10:49:41 +0900 Subject: [PATCH 1/2] =?UTF-8?q?layout=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../left-sidenav/organization.component.html | 2 +- .../left-sidenav/organization.component.ts | 26 +++++++++-------- .../right-drawer/message-box.component.html | 28 +++++++++++++++++-- .../right-drawer/message-box.component.ts | 15 ++++++++++ .../chat/create-chat.dialog.component.html | 1 + 5 files changed, 57 insertions(+), 15 deletions(-) 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 f1e572f8..35c2d89d 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 @@ -1,4 +1,4 @@ -
+

조직도

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 b19fd827..7a6e4724 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 @@ -4,7 +4,7 @@ import { OnDestroy, Output, EventEmitter, - Input, + Input } from '@angular/core'; import { ucapAnimations, DialogService } from '@ucap-webmessenger/ui'; import { Observable, Subscription, of } from 'rxjs'; @@ -18,7 +18,7 @@ import { UserInfoDN, SSVC_TYPE_QUERY_DEPT_USER_DATA, SSVC_TYPE_QUERY_DEPT_USER_RES, - DeptUserData, + DeptUserData } from '@ucap-webmessenger/protocol-query'; import { UserInfo, GroupDetailData } from '@ucap-webmessenger/protocol-sync'; import { Store, select } from '@ngrx/store'; @@ -37,7 +37,7 @@ import { KEY_VER_INFO } from '@app/types/ver-info.type'; import { SelectGroupDialogComponent, SelectGroupDialogData, - SelectGroupDialogResult, + SelectGroupDialogResult } from '../../dialogs/group/select-group.dialog.component'; import { LoginResponse } from '@ucap-webmessenger/protocol-authentication'; import { Company } from '@ucap-webmessenger/api-external'; @@ -46,9 +46,11 @@ import { Company } from '@ucap-webmessenger/api-external'; selector: 'app-layout-chat-left-sidenav-organization', templateUrl: './organization.component.html', styleUrls: ['./organization.component.scss'], - animations: ucapAnimations, + animations: ucapAnimations }) export class OrganizationComponent implements OnInit, OnDestroy { + @Input() + showTitle = true; @Input() /** 사용자 선택용으로 사용시 true 로 유입 */ isUserSelect = false; @@ -150,7 +152,7 @@ export class OrganizationComponent implements OnInit, OnDestroy { search: '', searchRange: DeptSearchType.All, senderCompanyCode: this.loginInfo.companyCode, - senderEmployeeType: loginRes.userInfo.employeeType, + senderEmployeeType: loginRes.userInfo.employeeType }) ); return loginRes; @@ -188,7 +190,7 @@ export class OrganizationComponent implements OnInit, OnDestroy { searchRange: DeptSearchType.All, search: params.searchWord, senderCompanyCode: params.companyCode, - senderEmployeeType: this.loginRes.userInfo.employeeType, + senderEmployeeType: this.loginRes.userInfo.employeeType }) .pipe( map(res => { @@ -208,7 +210,7 @@ export class OrganizationComponent implements OnInit, OnDestroy { this.store.dispatch( StatusStore.bulkInfo({ divCd: 'orgSrch', - userSeqs: userSeqList, + userSeqs: userSeqList }) ); } @@ -246,7 +248,7 @@ export class OrganizationComponent implements OnInit, OnDestroy { search: '', searchRange: DeptSearchType.All, senderCompanyCode: this.loginInfo.companyCode, - senderEmployeeType: loginRes.userInfo.employeeType, + senderEmployeeType: loginRes.userInfo.employeeType }) ); }), @@ -308,7 +310,7 @@ export class OrganizationComponent implements OnInit, OnDestroy { isChecked: value, userInfos: this.isShowSearch ? this.searchUserInfos - : this.selectedDepartmentUserInfoList, + : this.selectedDepartmentUserInfoList }); } @@ -334,8 +336,8 @@ export class OrganizationComponent implements OnInit, OnDestroy { >(SelectGroupDialogComponent, { width: '600px', data: { - title: 'Group Select', - }, + title: 'Group Select' + } }); if (!!result && !!result.choice && result.choice) { @@ -352,7 +354,7 @@ export class OrganizationComponent implements OnInit, OnDestroy { this.store.dispatch( SyncStore.updateGroupMember({ oldGroup, - trgtUserSeq, + trgtUserSeq }) ); diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/message-box.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/message-box.component.html index 3ab24c19..c50aaa1c 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/message-box.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/message-box.component.html @@ -1,6 +1,30 @@
-
- search Area. +
+
+
+ + + + +
+
, + private formBuilder: FormBuilder, private sessionStorageService: SessionStorageService, private dialogService: DialogService, private messageApiService: MessageApiService @@ -73,6 +77,10 @@ export class MessageBoxComponent implements OnInit, OnDestroy { } ngOnInit() { + this.fgSearch = this.formBuilder.group({ + searchInput: null + }); + this.userInfoListSubscription = this.store .pipe( select(AppStore.MessengerSelector.RoomSelector.selectUserinfolist), @@ -130,6 +138,13 @@ export class MessageBoxComponent implements OnInit, OnDestroy { } } + onKeyDownEnter(event: KeyboardEvent, search: string) { + event.preventDefault(); + event.stopPropagation(); + } + + onClickSearchCancel() {} + getRetrieveMessage(type: MessageType, trgtPageIndex: number) { switch (type) { case MessageType.Receive: 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 efcd0f4a..6314130b 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 @@ -98,6 +98,7 @@
Date: Fri, 15 Nov 2019 11:43:24 +0900 Subject: [PATCH 2/2] =?UTF-8?q?bugfix=20::=20=EC=A1=B0=EC=A7=81=EB=8F=84?= =?UTF-8?q?=20=EB=B6=80=EC=84=9C=20=ED=81=B4=EB=A6=AD=EC=8B=9C=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EC=95=88=EB=90=98=EB=8D=98=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/lib/components/tree.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.ts b/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.ts index 37d54111..b41128d1 100644 --- a/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.ts +++ b/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.ts @@ -28,6 +28,7 @@ interface FlatNode { expandable: boolean; name: string; level: number; + deptInfo: DeptInfo; } @Component({ @@ -110,7 +111,8 @@ export class TreeComponent implements OnInit, AfterViewInit { return { expandable: !!node.children && node.children.length > 0, name: node.name, - level + level, + deptInfo: node.deptInfo }; }, node => node.level,