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> <i class="mid mid-24 mdi-account-multiple"></i>
</button> </button>
</ng-template> </ng-template>
<div class="mat-tab-frame"> <div class="mat-tab-frame dialog-tab-grouplist">
<div> <div>
<ucap-organization-tenant-search <ucap-organization-tenant-search
[companyList]="companyList$ | async" [companyList]="companyList$ | async"
@ -81,7 +81,7 @@
</div> </div>
<div <div
[style.display]="isShowSearch ? 'none' : 'block'" [style.display]="isShowSearch ? 'none' : 'block'"
class="list-panel" class="group"
> >
<ucap-group-expansion-panel <ucap-group-expansion-panel
#groupExpansionPanel #groupExpansionPanel
@ -103,7 +103,7 @@
[checkDisabled]="!getCheckableUser(userInfo)" [checkDisabled]="!getCheckableUser(userInfo)"
(checkUser)="onCheckUser($event)" (checkUser)="onCheckUser($event)"
(click)="onToggleUser(userInfo)" (click)="onToggleUser(userInfo)"
class="list-item-frame" class="group-list-item"
> >
</ucap-profile-user-list-item> </ucap-profile-user-list-item>
</ucap-group-expansion-panel> </ucap-group-expansion-panel>
@ -154,7 +154,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> <div class="dialog-tab-orglist">
<app-layout-chat-left-sidenav-organization <app-layout-chat-left-sidenav-organization
[showTitle]="false" [showTitle]="false"
[selectedUserList]="selectedUserList" [selectedUserList]="selectedUserList"
@ -164,7 +164,7 @@
(checkAllUser)="onCheckAllUser($event)" (checkAllUser)="onCheckAllUser($event)"
(checkUser)="onCheckUser($event)" (checkUser)="onCheckUser($event)"
(toggleUser)="onToggleUser($event)" (toggleUser)="onToggleUser($event)"
class="dialog-org" class="oraganization"
> >
</app-layout-chat-left-sidenav-organization> </app-layout-chat-left-sidenav-organization>
</div> </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 { .dialog-creat-chat {
.mat-card-header-text { & > .mat-card-header {
margin: 0; .btn-dialog-close {
} font-size: 20px;
.btn-dialog-close { display: flex;
font-size: 20px; margin-left: auto;
display: flex; align-self: flex-start;
margin-left: auto; color: #444444;
align-self: flex-start; }
color: #444444;
} }
} }
//조직도 레이아웃 변경 .dialog-tab-grouplist {
::ng-deep .dialog-org { height: 380px;
.ps__rail-y { width: 100%;
left: auto !important; .group {
}
.oraganization-tab {
width: 100%; width: 100%;
height: 380px; height: calc(100% - 50px);
border-bottom: 1px solid #dddddd; &-expansion {
position: relative; .list-item {
.oraganization-tab-tree { height: 60px;
display: inline-flex;
width: 50%;
height: 100% !important;
border-right: 1px solid #dddddd;
overflow: auto;
.tab-tree-frame {
width: 100%;
height: 100%;
} }
} }
.select-list { &-list-item {
display: inline-flex; width: 100%;
flex-direction: column; }
width: 50%; }
height: 100% !important; }
overflow: auto;
.search-list { ::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; 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 { .mat-tab-body-wrapper {
height: 380px; height: 380px;
width: 100%; width: 100%;
@ -123,3 +143,4 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
*/