bug fixed
This commit is contained in:
parent
9805c80367
commit
50f1d83a92
|
@ -77,6 +77,7 @@
|
||||||
<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 fxFlexFill>
|
||||||
<div class="mat-tab-frame dialog-tab-grouplist">
|
<div class="mat-tab-frame dialog-tab-grouplist">
|
||||||
<div>
|
<div>
|
||||||
<ucap-organization-tenant-search
|
<ucap-organization-tenant-search
|
||||||
|
@ -152,6 +153,10 @@
|
||||||
</ucap-profile-user-list-item>
|
</ucap-profile-user-list-item>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<ng-template
|
||||||
|
[ngTemplateOutlet]="selectedUserListTemplate"
|
||||||
|
></ng-template>
|
||||||
|
</div>
|
||||||
</mat-tab>
|
</mat-tab>
|
||||||
<mat-tab>
|
<mat-tab>
|
||||||
<ng-template mat-tab-label>
|
<ng-template mat-tab-label>
|
||||||
|
@ -159,6 +164,7 @@
|
||||||
<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 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"
|
[showTitle]="false"
|
||||||
|
@ -173,6 +179,10 @@
|
||||||
>
|
>
|
||||||
</app-layout-chat-left-sidenav-organization>
|
</app-layout-chat-left-sidenav-organization>
|
||||||
</div>
|
</div>
|
||||||
|
<ng-template
|
||||||
|
[ngTemplateOutlet]="selectedUserListTemplate"
|
||||||
|
></ng-template>
|
||||||
|
</div>
|
||||||
</mat-tab>
|
</mat-tab>
|
||||||
<mat-tab *ngIf="data.type === UserSelectDialogType.MessageForward">
|
<mat-tab *ngIf="data.type === UserSelectDialogType.MessageForward">
|
||||||
<ng-template mat-tab-label>
|
<ng-template mat-tab-label>
|
||||||
|
@ -183,6 +193,7 @@
|
||||||
><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 fxFlexFill style="max-height: 508px;">
|
||||||
<div class="mat-tab-frame dialog-tab-chatlist">
|
<div class="mat-tab-frame dialog-tab-chatlist">
|
||||||
<ucap-room-list-item
|
<ucap-room-list-item
|
||||||
*ngFor="let room of roomList"
|
*ngFor="let room of roomList"
|
||||||
|
@ -199,27 +210,9 @@
|
||||||
>
|
>
|
||||||
</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>
|
|
||||||
<span *ngIf="isShowSelectedUserList"
|
|
||||||
>{{ selectedUserList.length }}
|
|
||||||
{{ 'common.units.persons' | translate }}</span
|
|
||||||
>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</mat-card-content>
|
</mat-card-content>
|
||||||
|
@ -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