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

bugfix :: 통합검색 > 검색 초기화 후 닫기 버튼 없앰 (X 버튼과 중복기능), 인원 선택 후 대화 진입시 접어두기 기능

Browse Source
This commit is contained in:
leejinho 2020-03-31 11:59:22 +09:00
parent 77efd35742
commit 0e9a64b0e7
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,13 +8,22 @@
>{{ 'search.label' | translate }}</mat-card-title
>
<div class="btn-top-frme" fxFlex="0 0 auto">
<button class="icon-button btn-dialog-refresh" matTooltip="{{ 'search.clear' | translate }}" (click)="onCancel()">
<!-- <button class="icon-button btn-dialog-refresh" matTooltip="{{ 'search.clear' | translate }}" (click)="onCancel()">
<i class="mdi mdi-refresh"></i>
</button>
<button class="icon-button btn-dialog-fold" matTooltip="{{ 'search.fold' | translate }}" (click)="onClickHide()">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" style="fill:#444444">
</button> -->
<button
class="icon-button btn-dialog-fold"
matTooltip="{{ 'search.fold' | translate }}"
(click)="onClickHide()"
>
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
style="fill:#444444"
>
<path
d="M19,19H5V5h9.38V3H5A2,2,0,0,0,3,5V19a2,2,0,0,0,2,2H19a2,2,0,0,0,2-2V10.36H19Zm-4.24-2.76v-2H11.17L21,4.41,19.59,3,9.76,12.83V9.24h-2v7Z" />
d="M19,19H5V5h9.38V3H5A2,2,0,0,0,3,5V19a2,2,0,0,0,2,2H19a2,2,0,0,0,2-2V10.36H19Zm-4.24-2.76v-2H11.17L21,4.41,19.59,3,9.76,12.83V9.24h-2v7Z"
/>
</svg>
</button>
<button class="icon-button btn-dialog-close" (click)="onCancel()">
@ -192,14 +201,25 @@
<mat-expansion-panel-header>
<mat-panel-title class="select-user-title">
{{ 'organization.selectedUser' | translate }}
<span *ngIf="selectedUserList.length > 0" class="text-accent-color">
<span
*ngIf="selectedUserList.length > 0"
class="text-accent-color"
>
({{ selectedUserList.length }})
{{ 'common.units.persons' | translate }}
</span>
</mat-panel-title>
<mat-panel-description fxFlex="0 0 auto" class="btn-dropdown">
<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" />
<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>

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

@ -341,6 +341,8 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
menuIndex: MainMenu.Chat
})
);
this.onClickHide();
}
}
onClickConference() {