조직도 레이아웃 수정.

1. expansion panel indicator 수정.
2. class 변경.
This commit is contained in:
leejinho 2020-03-13 10:56:28 +09:00
parent 17a56ed5f9
commit f1a0f241ff
4 changed files with 45 additions and 26 deletions

View File

@ -177,7 +177,7 @@
<div fxFlex="auto" fxLayout="column"> <div fxFlex="auto" fxLayout="column">
<mat-accordion class="organization-accordion"> <mat-accordion class="organization-accordion">
<mat-expansion-panel> <mat-expansion-panel hideToggle>
<mat-expansion-panel-header> <mat-expansion-panel-header>
<mat-panel-title class="select-user-title"> <mat-panel-title class="select-user-title">
{{ 'organization.selectedUser' | translate }} {{ 'organization.selectedUser' | translate }}
@ -186,18 +186,34 @@
{{ 'common.units.persons' | translate }} {{ 'common.units.persons' | translate }}
</span> </span>
</mat-panel-title> </mat-panel-title>
<mat-panel-description> </mat-panel-description> <mat-panel-description>
<svg
xmlns="http://www.w3.org/2000/svg"
height="24"
viewBox="0 0 24 24"
width="24"
class="indicator"
>
<path d="M7.41 15.41L12 10.83l4.59 4.58L18 14l-6-6-6 6z" />
<path d="M0 0h24v24H0z" fill="none" />
</svg>
</mat-panel-description>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<div class="list-chip"> <div class="list-chip">
<mat-chip-list aria-label="User selection"> <mat-chip-list aria-label="User selection">
<mat-chip <perfect-scrollbar
*ngFor="let userInfo of selectedUserList" [config]="{ suppressScrollX: true }"
(removed)="onClickDeleteUser(userInfo)" class="selected-user-list-chip"
> >
{{ userInfo.name }} <mat-chip
<mat-icon matChipRemove>clear</mat-icon> *ngFor="let userInfo of selectedUserList"
</mat-chip> (removed)="onClickDeleteUser(userInfo)"
>
{{ userInfo.name }}
<mat-icon matChipRemove>clear</mat-icon>
</mat-chip>
</perfect-scrollbar>
</mat-chip-list> </mat-chip-list>
</div> </div>
<div class="btn-box"> <div class="btn-box">

View File

@ -163,17 +163,23 @@
font-weight: 600; font-weight: 600;
} }
::ng-depp .organization-accordion { ::ng-deep .organization-accordion {
.mat-expansion-panel { .mat-expansion-panel {
.mat-expansion-panel-header { .mat-expansion-panel-header {
.mat-expansion-indicator { .indicator {
transform: rotate(180deg) !important; position: absolute;
right: 10px;
transform: rotate(0deg) !important;
} }
&.mat-expanded { &.mat-expanded {
.mat-expansion-indicator { .indicator {
transform: rotate(0deg) !important; transform: rotate(180deg) !important;
} }
} }
} }
} }
} }
.selected-user-list-chip {
max-height: 120px;
}

View File

@ -7,7 +7,7 @@
> >
<ng-container matColumnDef="profileImage"> <ng-container matColumnDef="profileImage">
<th mat-header-cell *matHeaderCellDef class="profileImage"> <th mat-header-cell *matHeaderCellDef class="profileImage">
<span class="ui-column-resizer none"></span> <span class="ui-column-divider"></span>
<span> <span>
{{ 'search.fieldProfile' | translate }} {{ 'search.fieldProfile' | translate }}
</span> </span>
@ -42,7 +42,7 @@
<ng-container matColumnDef="profileInfo"> <ng-container matColumnDef="profileInfo">
<th mat-header-cell *matHeaderCellDef class="profileInfo" minWidth="150"> <th mat-header-cell *matHeaderCellDef class="profileInfo" minWidth="150">
<span <span
class="ui-column-resizer" class="ui-column-divider resizable"
(mousedown)="resizeTable($event)" (mousedown)="resizeTable($event)"
></span> ></span>
<span mat-sort-header="name"> <span mat-sort-header="name">
@ -84,7 +84,7 @@
<ng-container matColumnDef="company_hpNumber"> <ng-container matColumnDef="company_hpNumber">
<th mat-header-cell *matHeaderCellDef minWidth="75"> <th mat-header-cell *matHeaderCellDef minWidth="75">
<span <span
class="ui-column-resizer" class="ui-column-divider resizable"
(mousedown)="resizeTable($event)" (mousedown)="resizeTable($event)"
></span> ></span>
<div mat-sort-header="company"> <div mat-sort-header="company">
@ -106,7 +106,7 @@
<ng-container matColumnDef="workplace_lineNumber"> <ng-container matColumnDef="workplace_lineNumber">
<th mat-header-cell *matHeaderCellDef minWidth="75"> <th mat-header-cell *matHeaderCellDef minWidth="75">
<span <span
class="ui-column-resizer" class="ui-column-divider resizable"
(mousedown)="resizeTable($event)" (mousedown)="resizeTable($event)"
></span> ></span>
<div mat-sort-header="workplace"> <div mat-sort-header="workplace">
@ -118,7 +118,7 @@
</th> </th>
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">
<span <span
class="ui-column-resizer" class="ui-column-divider resizable"
(mousedown)="resizeTable($event)" (mousedown)="resizeTable($event)"
></span> ></span>
<div class="workplace"> <div class="workplace">
@ -131,10 +131,7 @@
</ng-container> </ng-container>
<ng-container matColumnDef="responsibilities_email"> <ng-container matColumnDef="responsibilities_email">
<th mat-header-cell *matHeaderCellDef minWidth="90"> <th mat-header-cell *matHeaderCellDef minWidth="90">
<span <span class="ui-column-divider"></span>
class="ui-column-resizer"
(mousedown)="resizeTable($event)"
></span>
<div mat-sort-header="responsibilities"> <div mat-sort-header="responsibilities">
{{ 'search.fieldResponsibilities' | translate }} {{ 'search.fieldResponsibilities' | translate }}
</div> </div>

View File

@ -37,7 +37,7 @@ th.mat-header-cell {
position: relative; position: relative;
padding: 0 10px; padding: 0 10px;
span.ui-column-resizer { span.ui-column-divider {
display: block; display: block;
position: absolute; position: absolute;
top: 10px; top: 10px;
@ -46,12 +46,12 @@ th.mat-header-cell {
width: 2px; width: 2px;
height: 40px; height: 40px;
padding: 0; padding: 0;
cursor: col-resize; cursor: initial;
border: none; border: none;
background-color: #d4d4d4; background-color: #d4d4d4;
&.none { &.resizable {
cursor: initial; cursor: col-resize;
} }
} }
span { span {