통합검색 2차 수정

This commit is contained in:
khk 2020-03-16 22:05:56 +09:00
parent 556c7c5ad3
commit 769c37ef01
4 changed files with 59 additions and 33 deletions

View File

@ -7,6 +7,7 @@
.mat-dialog-container { .mat-dialog-container {
position: relative; position: relative;
overflow: hidden;
} }
.mat-card-header { .mat-card-header {

View File

@ -12,7 +12,12 @@
</button> </button>
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<div fxLayout="column" fxFlex="1 1 auto" class="rightDrawer-notice"> <div
fxLayout="column"
fxFlex="1 1 auto"
class="rightDrawer-notice"
style="position: relative;"
>
<div class="search-area"> <div class="search-area">
<ucap-integrated-search-form <ucap-integrated-search-form
[searchWord]="!!currentSearchWord ? currentSearchWord : ''" [searchWord]="!!currentSearchWord ? currentSearchWord : ''"
@ -160,11 +165,16 @@
class="integrate-search-org detail-table" class="integrate-search-org detail-table"
></ucap-organization-detail-table> ></ucap-organization-detail-table>
</div> </div>
<div class="footer-fix search-result-footer">
<div
class="footer-fix search-result-footer"
fxFlex="auto"
fxLayout="column"
>
<mat-accordion> <mat-accordion>
<mat-expansion-panel> <mat-expansion-panel hideToggle>
<mat-expansion-panel-header> <mat-expansion-panel-header>
<mat-panel-title> <mat-panel-title class="select-user-title">
{{ 'organization.selectedUser' | translate }} {{ 'organization.selectedUser' | translate }}
<span *ngIf="selectedUserList.length > 0"> <span *ngIf="selectedUserList.length > 0">
({{ selectedUserList.length }}) ({{ selectedUserList.length }})

View File

@ -1,16 +1,24 @@
.mat-card-header { .confirm-card {
.mat-card-header-text { height: 100%;
margin: 0; .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;
}
} }
.btn-dialog-close { .mat-card-content {
font-size: 20px; flex-direction: row;
box-sizing: border-box;
display: flex; display: flex;
margin-left: auto; height: 100%;
align-self: flex-start;
color: #444444;
} }
} }
ucap-integrated-search-form { ucap-integrated-search-form {
position: relative; position: relative;
display: inline-flex; display: inline-flex;
@ -26,33 +34,38 @@ ucap-integrated-search-form {
.content-area { .content-area {
display: flex; display: flex;
height: calc(100% - 140px); height: calc(100% - 140px);
} flex-wrap: wrap;
.contents-table {
position: relative;
flex-direction: column; flex-direction: column;
flex: 0 0 auto;
box-sizing: border-box; box-sizing: border-box;
display: flex; .contents-table {
flex: 1 1 100%;
max-width: 100%;
height: 100%;
overflow: hidden;
.table-box {
position: relative; position: relative;
width: 100%;
height: calc(100% - 60px);
overflow: hidden;
display: flex;
}
.footer-fix {
display: flex;
flex: 1 1 auto;
bottom: 0;
width: 100%;
flex-direction: column; flex-direction: column;
box-sizing: border-box; box-sizing: border-box;
display: flex;
flex: 1 1 100%;
max-width: 100%;
height: 100%;
overflow: hidden;
.table-box {
position: relative;
width: 100%;
height: calc(100% - 60px);
overflow: hidden;
display: flex;
}
.footer-fix {
display: flex;
flex-wrap: wrap;
flex: 1 1 auto;
bottom: 0;
width: 100%;
flex-direction: column;
box-sizing: border-box;
}
} }
} }
.btn-box { .btn-box {
position: absolute; position: absolute;
width: 100%; width: 100%;

View File

@ -664,6 +664,8 @@ export class TopBarComponent implements OnInit, OnDestroy {
IntegratedSearchDialogData, IntegratedSearchDialogData,
IntegratedSearchDialogResult IntegratedSearchDialogResult
>(IntegratedSearchDialogComponent, { >(IntegratedSearchDialogComponent, {
height: '90vh',
width: '90vw',
data: { data: {
keyword keyword
}, },