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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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