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

# 이슈처리 255, 258, 259, 260

Browse Source
This commit is contained in:
leejinho 2020-02-14 10:30:27 +09:00
parent ff9f06d648
commit 715850bfed
8 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
<div *ngIf="showTitle">
<div *ngIf="isMain">
<div class="current-head">
<h3>{{ 'organization.chart' | translate }}</h3>
</div>

8
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts
View File

@ -93,7 +93,7 @@ export class OrganizationComponent
orgUserContextMenuPosition = { x: '0px', y: '0px' };
@Input()
showTitle = true;
isMain = true;
@Input()
/** 사용자 선택용으로 사용시 true 로 유입 */
isUserSelect = false;
@ -651,7 +651,11 @@ export class OrganizationComponent
event.preventDefault();
event.stopPropagation();
if (!this.loginRes || userInfo.seq === this.loginRes.userSeq) {
if (
!this.isMain ||
!this.loginRes ||
userInfo.seq === this.loginRes.userSeq
) {
return;
}

2
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html
View File

@ -175,7 +175,7 @@
<div fxFlexFill>
<div class="mat-tab-frame dialog-tab-orglist">
<app-layout-chat-left-sidenav-organization
[showTitle]="false"
[isMain]="false"
[selectedUserList]="selectedUserList"
[ignoreUserList]="data.curRoomUser"
[isUserSelect]="true"

2
projects/ucap-webmessenger-app/src/app/store/messenger/event/effects.ts
View File

@ -865,7 +865,7 @@ export class Effects {
userSeq: loginResInfo.userSeq,
deviceType: environmentsInfo.deviceType,
token: loginResInfo.tokenString,
content: action.req.sentMessage,
content: action.req.sentMessage.replace(/"/g, '\\"'),
roomSeq: action.req.roomSeq
};

5
projects/ucap-webmessenger-app/src/app/store/messenger/room/effects.ts
View File

@ -273,7 +273,10 @@ export class Effects {
})
.pipe(
map((res: InviteResponse) => {
// return inviteSuccess(res);
// Sync
this.store.dispatch(inviteSuccess(res));
// RoomInfo
const loginInfo = this.sessionStorageService.get<LoginInfo>(
KEY_LOGIN_INFO
);

13
projects/ucap-webmessenger-app/src/app/store/messenger/sync/effects.ts
View File

@ -223,6 +223,11 @@ export class Effects {
case SSVC_TYPE_SYNC_ROOM_USER:
{
const roomUserData = res as RoomUserData;
if (
roomList.length > 0 &&
roomList.filter(r => r.roomSeq === roomUserData.roomSeq)
.length > 0
) {
if (!roomUserInfoMap[roomUserData.roomSeq]) {
roomUserInfoMap[roomUserData.roomSeq] = {
userInfoList: [],
@ -233,10 +238,17 @@ export class Effects {
roomUserData.roomSeq
].userInfoShortList.push(...roomUserData.userInfos);
}
}
break;
case SSVC_TYPE_SYNC_ROOM_USER2:
{
const roomUserDetailData = res as RoomUserDetailData;
if (
roomList.length > 0 &&
roomList.filter(
r => r.roomSeq === roomUserDetailData.roomSeq
).length > 0
) {
if (!roomUserInfoMap[roomUserDetailData.roomSeq]) {
roomUserInfoMap[roomUserDetailData.roomSeq] = {
userInfoList: [],
@ -247,6 +259,7 @@ export class Effects {
roomUserDetailData.roomSeq
].userInfoList.push(...roomUserDetailData.userInfos);
}
}
break;
case SSVC_TYPE_SYNC_ROOM_RES:
{

2
projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/mass.component.html
View File

@ -1,7 +1,7 @@
<div class="bubble-main">
<span
class="content"
[innerHTML]="content | linefeedtohtml | ucapSafeHtml | linky"
[innerHTML]="content | ucapSafeHtml | linefeedtohtml | linky"
></span>
<span>
{{ message.sendDate | ucapDate: 'YYYY.MM.DD a hh:mm' }}

2
projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/sticker.component.html
View File

@ -8,7 +8,7 @@
</li>
<li
*ngIf="contents"
[innerHTML]="contents | linefeedtohtml | ucapSafeHtml | linky"
[innerHTML]="contents | ucapSafeHtml | linefeedtohtml | linky"
></li>
</ul>
</div>