# 이슈처리 215, 216, 218
This commit is contained in:
parent
6199b398b1
commit
7e6099a777
|
@ -137,7 +137,7 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewChecked {
|
||||||
for (const ru of roomUserShort) {
|
for (const ru of roomUserShort) {
|
||||||
for (const u of ru.userInfos) {
|
for (const u of ru.userInfos) {
|
||||||
if (u.seq !== this.loginRes.userSeq) {
|
if (u.seq !== this.loginRes.userSeq) {
|
||||||
if (!!u.name && '' !== u.name.trim()) {
|
if (!!u.name && '' !== u.name.trim() && u.isJoinRoom) {
|
||||||
recommendedWordList.push(u.name);
|
recommendedWordList.push(u.name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -285,7 +285,9 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewChecked {
|
||||||
value => roomInfo.roomSeq === value.roomSeq
|
value => roomInfo.roomSeq === value.roomSeq
|
||||||
);
|
);
|
||||||
if (-1 < i) {
|
if (-1 < i) {
|
||||||
return this.roomUserShortList[i].userInfos;
|
return this.roomUserShortList[i].userInfos.filter(
|
||||||
|
user => user.isJoinRoom
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -608,6 +608,10 @@ export class OrganizationComponent
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
|
|
||||||
|
if (userInfo.seq === this.loginRes.userSeq) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
this.orgUserContextMenuPosition.x = event.clientX + 'px';
|
this.orgUserContextMenuPosition.x = event.clientX + 'px';
|
||||||
this.orgUserContextMenuPosition.y = event.clientY + 'px';
|
this.orgUserContextMenuPosition.y = event.clientY + 'px';
|
||||||
this.orgUserContextMenuTrigger.menu.focusFirstItem('mouse');
|
this.orgUserContextMenuTrigger.menu.focusFirstItem('mouse');
|
||||||
|
|
|
@ -59,7 +59,9 @@
|
||||||
<path d="M23 21v-2a4 4 0 0 0-3-3.87"></path>
|
<path d="M23 21v-2a4 4 0 0 0-3-3.87"></path>
|
||||||
<path d="M16 3.13a4 4 0 0 1 0 7.75"></path>
|
<path d="M16 3.13a4 4 0 0 1 0 7.75"></path>
|
||||||
</svg>-->
|
</svg>-->
|
||||||
<button class="icon-button"><i class="mid mid-24 mdi-account-multiple"></i></button>
|
<button class="icon-button">
|
||||||
|
<i class="mid mid-24 mdi-account-multiple"></i>
|
||||||
|
</button>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<div class="mat-tab-frame">
|
<div class="mat-tab-frame">
|
||||||
<div>
|
<div>
|
||||||
|
@ -88,6 +90,7 @@
|
||||||
<ucap-profile-user-list-item
|
<ucap-profile-user-list-item
|
||||||
*ucapGroupExpansionPanelItem="let userInfo"
|
*ucapGroupExpansionPanelItem="let userInfo"
|
||||||
[userInfo]="userInfo"
|
[userInfo]="userInfo"
|
||||||
|
[showPresence]="false"
|
||||||
[sessionVerinfo]="sessionVerinfo"
|
[sessionVerinfo]="sessionVerinfo"
|
||||||
[selectedUserList]="selectedUserList"
|
[selectedUserList]="selectedUserList"
|
||||||
[isChecked]="getCheckedUser(userInfo)"
|
[isChecked]="getCheckedUser(userInfo)"
|
||||||
|
@ -123,6 +126,7 @@
|
||||||
<ucap-profile-user-list-item
|
<ucap-profile-user-list-item
|
||||||
*ngFor="let userInfo of searchUserInfos"
|
*ngFor="let userInfo of searchUserInfos"
|
||||||
[userInfo]="userInfo"
|
[userInfo]="userInfo"
|
||||||
|
[showPresence]="false"
|
||||||
[sessionVerinfo]="sessionVerinfo"
|
[sessionVerinfo]="sessionVerinfo"
|
||||||
[selectedUserList]="selectedUserList"
|
[selectedUserList]="selectedUserList"
|
||||||
[isChecked]="getCheckedUser(userInfo)"
|
[isChecked]="getCheckedUser(userInfo)"
|
||||||
|
@ -141,7 +145,9 @@
|
||||||
matTooltip="{{ 'organization.chart' | translate }}"
|
matTooltip="{{ 'organization.chart' | translate }}"
|
||||||
matTooltipPosition="after"
|
matTooltipPosition="after"
|
||||||
>device_hub</mat-icon>-->
|
>device_hub</mat-icon>-->
|
||||||
<button class="icon-button"><i class="mid mid-24 mdi-file-tree"></i></button>
|
<button class="icon-button">
|
||||||
|
<i class="mid mid-24 mdi-file-tree"></i>
|
||||||
|
</button>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<div>
|
<div>
|
||||||
<app-layout-chat-left-sidenav-organization
|
<app-layout-chat-left-sidenav-organization
|
||||||
|
@ -165,8 +171,7 @@
|
||||||
matTooltipPosition="before"
|
matTooltipPosition="before"
|
||||||
class="icon-button"
|
class="icon-button"
|
||||||
><i class="mid mid-24 mdi-chat"></i>
|
><i class="mid mid-24 mdi-chat"></i>
|
||||||
</mat-icon
|
</mat-icon>
|
||||||
>
|
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<div>
|
<div>
|
||||||
<ucap-room-list-item
|
<ucap-room-list-item
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
<!--pcOn , pcOut pcOff , pcOther-->
|
<!--pcOn , pcOut pcOff , pcOther-->
|
||||||
<span
|
<span
|
||||||
class="presence"
|
class="presence"
|
||||||
|
*ngIf="showPresence"
|
||||||
[ngClass]="getPresence(PresenceType.PC)"
|
[ngClass]="getPresence(PresenceType.PC)"
|
||||||
[matTooltip]="getPresenceMsg()"
|
[matTooltip]="getPresenceMsg()"
|
||||||
matTooltipPosition="after"
|
matTooltipPosition="after"
|
||||||
|
|
|
@ -35,6 +35,8 @@ export class UserListItemComponent implements OnInit {
|
||||||
@Input()
|
@Input()
|
||||||
presence: StatusBulkInfo | StatusInfo;
|
presence: StatusBulkInfo | StatusInfo;
|
||||||
@Input()
|
@Input()
|
||||||
|
showPresence = true;
|
||||||
|
@Input()
|
||||||
checkable = false;
|
checkable = false;
|
||||||
@Input()
|
@Input()
|
||||||
checkDisabled = false;
|
checkDisabled = false;
|
||||||
|
@ -77,7 +79,6 @@ export class UserListItemComponent implements OnInit {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!!status) {
|
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case StatusCode.OnLine:
|
case StatusCode.OnLine:
|
||||||
rtnClass = type + 'On';
|
rtnClass = type + 'On';
|
||||||
|
@ -92,7 +93,6 @@ export class UserListItemComponent implements OnInit {
|
||||||
rtnClass = type + 'Off';
|
rtnClass = type + 'Off';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return rtnClass;
|
return rtnClass;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user