bug fixed
This commit is contained in:
richard-loafle
parent
9805c80367
commit
50f1d83a92
|
|
@ -77,80 +77,85 @@
|
||||||
<i class="mid mid-24 mdi-account-multiple"></i>
|
<i class="mid mid-24 mdi-account-multiple"></i>
|
||||||
</button>
|
</button>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<div class="mat-tab-frame dialog-tab-grouplist">
|
<div fxFlexFill>
|
||||||
<div>
|
<div class="mat-tab-frame dialog-tab-grouplist">
|
||||||
<ucap-organization-tenant-search
|
<div>
|
||||||
[companyList]="companyList$ | async"
|
<ucap-organization-tenant-search
|
||||||
[companyCode]="companyCode"
|
[companyList]="companyList$ | async"
|
||||||
(keyDownEnter)="
|
[companyCode]="companyCode"
|
||||||
onKeyDownEnterOrganizationTenantSearch($event)
|
(keyDownEnter)="
|
||||||
"
|
onKeyDownEnterOrganizationTenantSearch($event)
|
||||||
(cancel)="onClickCancel()"
|
"
|
||||||
></ucap-organization-tenant-search>
|
(cancel)="onClickCancel()"
|
||||||
</div>
|
></ucap-organization-tenant-search>
|
||||||
<div
|
</div>
|
||||||
[style.display]="isShowSearch ? 'none' : 'block'"
|
<div
|
||||||
class="group"
|
[style.display]="isShowSearch ? 'none' : 'block'"
|
||||||
>
|
class="group"
|
||||||
<ucap-group-expansion-panel
|
|
||||||
#groupExpansionPanel
|
|
||||||
[groupBuddyList]="groupBuddyList$ | async"
|
|
||||||
[selectedUserList]="selectedUserList"
|
|
||||||
[ignoreUserList]="data.curRoomUser"
|
|
||||||
[checkable]="true"
|
|
||||||
(checkGroup)="onCheckGroup($event)"
|
|
||||||
class="group-expansion"
|
|
||||||
>
|
>
|
||||||
|
<ucap-group-expansion-panel
|
||||||
|
#groupExpansionPanel
|
||||||
|
[groupBuddyList]="groupBuddyList$ | async"
|
||||||
|
[selectedUserList]="selectedUserList"
|
||||||
|
[ignoreUserList]="data.curRoomUser"
|
||||||
|
[checkable]="true"
|
||||||
|
(checkGroup)="onCheckGroup($event)"
|
||||||
|
class="group-expansion"
|
||||||
|
>
|
||||||
|
<ucap-profile-user-list-item
|
||||||
|
*ucapGroupExpansionPanelItem="let userInfo"
|
||||||
|
[userInfo]="userInfo"
|
||||||
|
[showPresence]="false"
|
||||||
|
[sessionVerinfo]="sessionVerinfo"
|
||||||
|
[selectedUserList]="selectedUserList"
|
||||||
|
[isChecked]="getCheckedUser(userInfo)"
|
||||||
|
[checkable]="true"
|
||||||
|
[checkDisabled]="!getCheckableUser(userInfo)"
|
||||||
|
(checkUser)="onCheckUser($event)"
|
||||||
|
(click)="onToggleUser(userInfo)"
|
||||||
|
class="group-list-item"
|
||||||
|
>
|
||||||
|
</ucap-profile-user-list-item>
|
||||||
|
</ucap-group-expansion-panel>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
[style.display]="isShowSearch ? 'block' : 'none'"
|
||||||
|
class="search-result"
|
||||||
|
>
|
||||||
|
<div style="position: relative;">
|
||||||
|
<div
|
||||||
|
*ngIf="searchProcessing"
|
||||||
|
style="position: absolute; width: 100%;"
|
||||||
|
>
|
||||||
|
<mat-progress-bar mode="indeterminate"></mat-progress-bar>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="result-num">
|
||||||
|
{{ 'common.searchResult' | translate }}
|
||||||
|
<span class="text-accent-color">
|
||||||
|
({{ searchUserInfos.length
|
||||||
|
}}{{ 'common.units.persons' | translate }})
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
<ucap-profile-user-list-item
|
<ucap-profile-user-list-item
|
||||||
*ucapGroupExpansionPanelItem="let userInfo"
|
*ngFor="let userInfo of searchUserInfos"
|
||||||
[userInfo]="userInfo"
|
[userInfo]="userInfo"
|
||||||
[showPresence]="false"
|
[showPresence]="false"
|
||||||
[sessionVerinfo]="sessionVerinfo"
|
[sessionVerinfo]="sessionVerinfo"
|
||||||
[selectedUserList]="selectedUserList"
|
[selectedUserList]="selectedUserList"
|
||||||
[isChecked]="getCheckedUser(userInfo)"
|
[isChecked]="getCheckedUser(userInfo)"
|
||||||
[checkable]="true"
|
[checkable]="userInfo.seq !== loginRes.userSeq"
|
||||||
[checkDisabled]="!getCheckableUser(userInfo)"
|
[checkDisabled]="!getCheckableUser(userInfo)"
|
||||||
(checkUser)="onCheckUser($event)"
|
(checkUser)="onCheckUser($event)"
|
||||||
(click)="onToggleUser(userInfo)"
|
(click)="onToggleUser(userInfo)"
|
||||||
class="group-list-item"
|
|
||||||
>
|
>
|
||||||
</ucap-profile-user-list-item>
|
</ucap-profile-user-list-item>
|
||||||
</ucap-group-expansion-panel>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
[style.display]="isShowSearch ? 'block' : 'none'"
|
|
||||||
class="search-result"
|
|
||||||
>
|
|
||||||
<div style="position: relative;">
|
|
||||||
<div
|
|
||||||
*ngIf="searchProcessing"
|
|
||||||
style="position: absolute; width: 100%;"
|
|
||||||
>
|
|
||||||
<mat-progress-bar mode="indeterminate"></mat-progress-bar>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="result-num">
|
|
||||||
{{ 'common.searchResult' | translate }}
|
|
||||||
<span class="text-accent-color">
|
|
||||||
({{ searchUserInfos.length
|
|
||||||
}}{{ 'common.units.persons' | translate }})
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<ucap-profile-user-list-item
|
|
||||||
*ngFor="let userInfo of searchUserInfos"
|
|
||||||
[userInfo]="userInfo"
|
|
||||||
[showPresence]="false"
|
|
||||||
[sessionVerinfo]="sessionVerinfo"
|
|
||||||
[selectedUserList]="selectedUserList"
|
|
||||||
[isChecked]="getCheckedUser(userInfo)"
|
|
||||||
[checkable]="userInfo.seq !== loginRes.userSeq"
|
|
||||||
[checkDisabled]="!getCheckableUser(userInfo)"
|
|
||||||
(checkUser)="onCheckUser($event)"
|
|
||||||
(click)="onToggleUser(userInfo)"
|
|
||||||
>
|
|
||||||
</ucap-profile-user-list-item>
|
|
||||||
</div>
|
</div>
|
||||||
|
<ng-template
|
||||||
|
[ngTemplateOutlet]="selectedUserListTemplate"
|
||||||
|
></ng-template>
|
||||||
</div>
|
</div>
|
||||||
</mat-tab>
|
</mat-tab>
|
||||||
<mat-tab>
|
<mat-tab>
|
||||||
|
|
@ -159,19 +164,24 @@
|
||||||
<i class="mid mid-24 mdi-file-tree"></i>
|
<i class="mid mid-24 mdi-file-tree"></i>
|
||||||
</button>
|
</button>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<div class="mat-tab-frame dialog-tab-orglist">
|
<div fxFlexFill>
|
||||||
<app-layout-chat-left-sidenav-organization
|
<div class="mat-tab-frame dialog-tab-orglist">
|
||||||
[showTitle]="false"
|
<app-layout-chat-left-sidenav-organization
|
||||||
[selectedUserList]="selectedUserList"
|
[showTitle]="false"
|
||||||
[ignoreUserList]="data.curRoomUser"
|
[selectedUserList]="selectedUserList"
|
||||||
[isUserSelect]="true"
|
[ignoreUserList]="data.curRoomUser"
|
||||||
[isVisible]="currentTabIndex === 1"
|
[isUserSelect]="true"
|
||||||
(checkAllUser)="onCheckAllUser($event)"
|
[isVisible]="currentTabIndex === 1"
|
||||||
(checkUser)="onCheckUser($event)"
|
(checkAllUser)="onCheckAllUser($event)"
|
||||||
(toggleUser)="onToggleUser($event)"
|
(checkUser)="onCheckUser($event)"
|
||||||
class="oraganization"
|
(toggleUser)="onToggleUser($event)"
|
||||||
>
|
class="oraganization"
|
||||||
</app-layout-chat-left-sidenav-organization>
|
>
|
||||||
|
</app-layout-chat-left-sidenav-organization>
|
||||||
|
</div>
|
||||||
|
<ng-template
|
||||||
|
[ngTemplateOutlet]="selectedUserListTemplate"
|
||||||
|
></ng-template>
|
||||||
</div>
|
</div>
|
||||||
</mat-tab>
|
</mat-tab>
|
||||||
<mat-tab *ngIf="data.type === UserSelectDialogType.MessageForward">
|
<mat-tab *ngIf="data.type === UserSelectDialogType.MessageForward">
|
||||||
|
|
@ -183,44 +193,27 @@
|
||||||
><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 class="mat-tab-frame dialog-tab-chatlist">
|
<div fxFlexFill style="max-height: 508px;">
|
||||||
<ucap-room-list-item
|
<div class="mat-tab-frame dialog-tab-chatlist">
|
||||||
*ngFor="let room of roomList"
|
<ucap-room-list-item
|
||||||
[loginRes]="loginRes"
|
*ngFor="let room of roomList"
|
||||||
[roomInfo]="room"
|
[loginRes]="loginRes"
|
||||||
[roomUserInfo]="getRoomUserList(room)"
|
[roomInfo]="room"
|
||||||
[sessionVerinfo]="sessionVerinfo"
|
[roomUserInfo]="getRoomUserList(room)"
|
||||||
[checkable]="getCheckableRoom(room)"
|
[sessionVerinfo]="sessionVerinfo"
|
||||||
[isChecked]="getCheckedRoom(room)"
|
[checkable]="getCheckableRoom(room)"
|
||||||
[multiCheckable]="false"
|
[isChecked]="getCheckedRoom(room)"
|
||||||
(checkRoom)="onCheckRoom($event)"
|
[multiCheckable]="false"
|
||||||
(click)="onToggleRoom(room)"
|
(checkRoom)="onCheckRoom($event)"
|
||||||
class="chat"
|
(click)="onToggleRoom(room)"
|
||||||
>
|
class="chat"
|
||||||
</ucap-room-list-item>
|
>
|
||||||
|
</ucap-room-list-item>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</mat-tab>
|
</mat-tab>
|
||||||
</mat-tab-group>
|
</mat-tab-group>
|
||||||
|
|
||||||
<div *ngIf="isShowSelectedUserList" class="list-chip">
|
|
||||||
<mat-chip-list aria-label="User selection">
|
|
||||||
<mat-chip
|
|
||||||
*ngFor="let userInfo of selectedUserList"
|
|
||||||
[selected]="getChipsRemoveYn(userInfo)"
|
|
||||||
(removed)="onClickDeleteUser(userInfo)"
|
|
||||||
>
|
|
||||||
{{ userInfo.name }}
|
|
||||||
<mat-icon matChipRemove *ngIf="getChipsRemoveYn(userInfo)"
|
|
||||||
>clear</mat-icon
|
|
||||||
>
|
|
||||||
</mat-chip>
|
|
||||||
</mat-chip-list>
|
|
||||||
</div>
|
</div>
|
||||||
<span *ngIf="isShowSelectedUserList"
|
|
||||||
>{{ selectedUserList.length }}
|
|
||||||
{{ 'common.units.persons' | translate }}</span
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</mat-card-content>
|
</mat-card-content>
|
||||||
<mat-card-actions class="button-farm flex-row">
|
<mat-card-actions class="button-farm flex-row">
|
||||||
|
|
@ -241,3 +234,24 @@
|
||||||
</button>
|
</button>
|
||||||
</mat-card-actions>
|
</mat-card-actions>
|
||||||
</mat-card>
|
</mat-card>
|
||||||
|
|
||||||
|
<ng-template #selectedUserListTemplate>
|
||||||
|
<div class="list-chip">
|
||||||
|
<mat-chip-list aria-label="User selection">
|
||||||
|
<mat-chip
|
||||||
|
*ngFor="let userInfo of selectedUserList"
|
||||||
|
[selected]="getChipsRemoveYn(userInfo)"
|
||||||
|
(removed)="onClickDeleteUser(userInfo)"
|
||||||
|
>
|
||||||
|
{{ userInfo.name }}
|
||||||
|
<mat-icon matChipRemove *ngIf="getChipsRemoveYn(userInfo)"
|
||||||
|
>clear</mat-icon
|
||||||
|
>
|
||||||
|
</mat-chip>
|
||||||
|
</mat-chip-list>
|
||||||
|
</div>
|
||||||
|
<span>
|
||||||
|
{{ selectedUserList.length }}
|
||||||
|
{{ 'common.units.persons' | translate }}
|
||||||
|
</span>
|
||||||
|
</ng-template>
|
||||||
|
|
|
||||||
|
|
@ -185,7 +185,7 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy {
|
||||||
| UserInfoDN
|
| UserInfoDN
|
||||||
| RoomUserInfo
|
| RoomUserInfo
|
||||||
)[] = [];
|
)[] = [];
|
||||||
isShowSelectedUserList = true;
|
|
||||||
selectedRoom: RoomInfo;
|
selectedRoom: RoomInfo;
|
||||||
|
|
||||||
inputForm: FormGroup;
|
inputForm: FormGroup;
|
||||||
|
|
@ -399,10 +399,8 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy {
|
||||||
|
|
||||||
if (tabChangeEvent.index === 2) {
|
if (tabChangeEvent.index === 2) {
|
||||||
this.selectedUserList = [];
|
this.selectedUserList = [];
|
||||||
this.isShowSelectedUserList = false;
|
|
||||||
} else {
|
} else {
|
||||||
this.selectedRoom = null;
|
this.selectedRoom = null;
|
||||||
this.isShowSelectedUserList = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user