1. 조직도 > 유저 선택 > 그룹에 추가 > 이후 전체 선택 부분 정상동작하지 않는 버그 수정.
2. 유저 선택 팝업 그룹 로직 변경에 따른 스타일 수정 부탁.
This commit is contained in:
parent
3fba7224ba
commit
8c8a7b0133
|
@ -358,7 +358,11 @@ export class OrganizationComponent implements OnInit, OnDestroy {
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
this.selectedUserList = [];
|
// 상위 컴포넌트의 selectedUserList clear.
|
||||||
|
this.checkAllUser.emit({
|
||||||
|
isChecked: false,
|
||||||
|
userInfos: this.selectedUserList
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,8 +35,17 @@
|
||||||
<mat-tab>
|
<mat-tab>
|
||||||
<ng-template mat-tab-label>
|
<ng-template mat-tab-label>
|
||||||
<!--<mat-icon>group</mat-icon>-->
|
<!--<mat-icon>group</mat-icon>-->
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor"
|
<svg
|
||||||
stroke-width="1.5" stroke-linecap="butt" stroke-linejoin="round">
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
width="20"
|
||||||
|
height="20"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-width="1.5"
|
||||||
|
stroke-linecap="butt"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
>
|
||||||
<path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path>
|
<path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path>
|
||||||
<circle cx="9" cy="7" r="4"></circle>
|
<circle cx="9" cy="7" r="4"></circle>
|
||||||
<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>
|
||||||
|
@ -54,7 +63,12 @@
|
||||||
(cancel)="onClickCancel()"
|
(cancel)="onClickCancel()"
|
||||||
></ucap-organization-tenant-search>
|
></ucap-organization-tenant-search>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="!isShowSearch" class="list-panel">
|
<div
|
||||||
|
[style.display]="isShowSearch ? 'none' : 'block'"
|
||||||
|
class="list-panel"
|
||||||
|
style="overflow: auto;"
|
||||||
|
>
|
||||||
|
<perfect-scrollbar>
|
||||||
<ucap-group-expansion-panel
|
<ucap-group-expansion-panel
|
||||||
#groupExpansionPanel
|
#groupExpansionPanel
|
||||||
[groupBuddyList]="groupBuddyList$ | async"
|
[groupBuddyList]="groupBuddyList$ | async"
|
||||||
|
@ -75,8 +89,12 @@
|
||||||
>
|
>
|
||||||
</ucap-profile-user-list-item>
|
</ucap-profile-user-list-item>
|
||||||
</ucap-group-expansion-panel>
|
</ucap-group-expansion-panel>
|
||||||
|
</perfect-scrollbar>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="isShowSearch" class="search-result">
|
<div
|
||||||
|
[style.display]="isShowSearch ? 'block' : 'none'"
|
||||||
|
class="search-result"
|
||||||
|
>
|
||||||
<div *ngIf="searchProcessing">
|
<div *ngIf="searchProcessing">
|
||||||
<mat-progress-bar mode="indeterminate"></mat-progress-bar>
|
<mat-progress-bar mode="indeterminate"></mat-progress-bar>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user