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

통합검색 - 수정중

Browse Source
This commit is contained in:
khk 2020-03-16 17:25:40 +09:00
parent d0a1c0f3ee
commit 556c7c5ad3
3 changed files with 167 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.html
View File

@ -19,7 +19,7 @@
(search)="onSearch($event)" (search)="onSearch($event)"
> >
</ucap-integrated-search-form> </ucap-integrated-search-form>
<div class="organization-option"> <div class="organization-option selectbox">
<mat-form-field> <mat-form-field>
<mat-label>{{ 'search.fieldCompany' | translate }}</mat-label> <mat-label>{{ 'search.fieldCompany' | translate }}</mat-label>
<mat-select <mat-select
@ -137,16 +137,16 @@
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
<div style="position: relative;"> <div class="content-area">
<div <div
*ngIf="searchingProcessing$ | async" *ngIf="searchingProcessing$ | async"
style="position: absolute; width: 100%; z-index: 101;" style="position: absolute; width: 100%; z-index: 101;"
> >
<mat-progress-bar mode="indeterminate"></mat-progress-bar> <mat-progress-bar mode="indeterminate"></mat-progress-bar>
</div> </div>
</div>
<div class="contents-table"> <div class="contents-table" fxFlex="1 1 100%" fxLayout="column">
<div fxFlex="0 0 auto" class="table-box"> <div class="table-box">
<ucap-organization-detail-table <ucap-organization-detail-table
[loginRes]="loginRes" [loginRes]="loginRes"
[presence$]="presenceSubject.asObservable()" [presence$]="presenceSubject.asObservable()"
@ -241,8 +241,9 @@
</mat-accordion> </mat-accordion>
</div> </div>
</div> </div>
<div class="footer-fix search-result-footer"> </div>
<ul> <div class="btn-box">
<ul class="">
<li> <li>
<button mat-flat-button (click)="onCancel()" class="mat-primary"> <button mat-flat-button (click)="onCancel()" class="mat-primary">
{{ 'search.clearAndColse' | translate }} {{ 'search.clearAndColse' | translate }}

56
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.scss
View File

@ -10,3 +10,59 @@
color: #444444; color: #444444;
} }
} }
ucap-integrated-search-form {
position: relative;
display: inline-flex;
.search-container {
width: 20%;
}
}
.organization-option {
position: relative;
display: inline-flex;
width: 70%;
}
.content-area {
display: flex;
height: calc(100% - 140px);
}
.contents-table {
position: relative;
flex-direction: column;
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: 1 1 auto;
bottom: 0;
width: 100%;
flex-direction: column;
box-sizing: border-box;
}
}
.btn-box {
position: absolute;
width: 100%;
bottom: 0;
ul {
display: flex;
flex-flow: row;
li {
display: inline-flex;
margin-left: 4px;
}
}
}

13
projects/ucap-webmessenger-ui/src/assets/scss/partials/_search-frame.scss
View File

@ -118,3 +118,16 @@ $search-font-size: 14px;
} }
} }
} }
.search-area {
.selectbox {
display: inline-flex;
width: 70%;
padding-left: 20px;
line-height: 1.4em;
.mat-form-field {
font-size: 0.88rem;
color: #333333;
flex: 1 1 auto;
}
}
}