ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

Browse Source
This commit is contained in:
leejinho 2020-02-06 12:51:44 +09:00
commit b7483d2f12
2 changed files with 64 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html
View File

@ -68,7 +68,7 @@
<i class="mid mid-24 mdi-account-multiple"></i>
</button>
</ng-template>
<div class="mat-tab-frame">
<div class="mat-tab-frame dialog-tab-grouplist">
<div>
<ucap-organization-tenant-search
[companyList]="companyList$ | async"
@ -81,7 +81,7 @@
</div>
<div
[style.display]="isShowSearch ? 'none' : 'block'"
class="list-panel"
class="group"
>
<ucap-group-expansion-panel
#groupExpansionPanel
@ -103,7 +103,7 @@
[checkDisabled]="!getCheckableUser(userInfo)"
(checkUser)="onCheckUser($event)"
(click)="onToggleUser(userInfo)"
class="list-item-frame"
class="group-list-item"
>
</ucap-profile-user-list-item>
</ucap-group-expansion-panel>
@ -154,7 +154,7 @@
<i class="mid mid-24 mdi-file-tree"></i>
</button>
</ng-template>
<div>
<div class="dialog-tab-orglist">
<app-layout-chat-left-sidenav-organization
[showTitle]="false"
[selectedUserList]="selectedUserList"
@ -164,7 +164,7 @@
(checkAllUser)="onCheckAllUser($event)"
(checkUser)="onCheckUser($event)"
(toggleUser)="onToggleUser($event)"
class="dialog-org"
class="oraganization"
>
</app-layout-chat-left-sidenav-organization>
</div>

97
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss
View File

@ -1,47 +1,67 @@
.mat-card-header {
.mat-card-header-text {
margin: 0;
}
.btn-dialog-close {
font-size: 20px;
display: flex;
margin-left: auto;
align-self: flex-start;
color: #444444;
.dialog-creat-chat {
& > .mat-card-header {
.btn-dialog-close {
font-size: 20px;
display: flex;
margin-left: auto;
align-self: flex-start;
color: #444444;
}
}
}
//조직도 레이아웃 변경
::ng-deep .dialog-org {
.ps__rail-y {
left: auto !important;
}
.oraganization-tab {
.dialog-tab-grouplist {
height: 380px;
width: 100%;
.group {
width: 100%;
height: 380px;
border-bottom: 1px solid #dddddd;
position: relative;
.oraganization-tab-tree {
display: inline-flex;
width: 50%;
height: 100% !important;
border-right: 1px solid #dddddd;
overflow: auto;
.tab-tree-frame {
width: 100%;
height: 100%;
height: calc(100% - 50px);
&-expansion {
.list-item {
height: 60px;
}
}
.select-list {
display: inline-flex;
flex-direction: column;
width: 50%;
height: 100% !important;
overflow: auto;
.search-list {
&-list-item {
width: 100%;
}
}
}
::ng-deep .dialog-tab-orglist {
width: 100%;
height: 380px;
border-bottom: 1px solid #dddddd;
position: relative;
.oraganization {
.ps__rail-y {
left: auto !important;
}
&-tab {
width: 100%;
height: 380px;
border-bottom: 1px solid #dddddd;
position: relative;
&-tree {
display: inline-flex;
width: 50%;
height: 100% !important;
border-right: 1px solid #dddddd;
overflow: auto;
height: calc(100% - 40px);
.tab-tree-frame {
width: 100%;
height: 100%;
}
}
.select-list {
display: inline-flex;
flex-direction: column;
width: 50%;
height: 100% !important;
overflow: auto;
.search-list {
overflow: auto;
height: calc(100% - 40px);
}
}
}
}
@ -82,7 +102,7 @@
}
}
::ng-deep .mat-dialog-container {
/*::ng-deep .mat-dialog-container {
.mat-tab-body-wrapper {
height: 380px;
width: 100%;
@ -123,3 +143,4 @@
width: 100%;
height: 100%;
}
*/