bugfix :: 통합검색 > 검색 초기화 후 닫기 버튼 없앰 (X 버튼과 중복기능), 인원 선택 후 대화 진입시 접어두기 기능
This commit is contained in:
parent
77efd35742
commit
0e9a64b0e7
|
@ -8,13 +8,22 @@
|
||||||
>{{ 'search.label' | translate }}</mat-card-title
|
>{{ 'search.label' | translate }}</mat-card-title
|
||||||
>
|
>
|
||||||
<div class="btn-top-frme" fxFlex="0 0 auto">
|
<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>
|
<i class="mdi mdi-refresh"></i>
|
||||||
</button>
|
</button> -->
|
||||||
<button class="icon-button btn-dialog-fold" matTooltip="{{ 'search.fold' | translate }}" (click)="onClickHide()">
|
<button
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" style="fill:#444444">
|
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
|
<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>
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
<button class="icon-button btn-dialog-close" (click)="onCancel()">
|
<button class="icon-button btn-dialog-close" (click)="onCancel()">
|
||||||
|
@ -192,14 +201,25 @@
|
||||||
<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 }}
|
||||||
<span *ngIf="selectedUserList.length > 0" class="text-accent-color">
|
<span
|
||||||
|
*ngIf="selectedUserList.length > 0"
|
||||||
|
class="text-accent-color"
|
||||||
|
>
|
||||||
({{ selectedUserList.length }})
|
({{ selectedUserList.length }})
|
||||||
{{ 'common.units.persons' | translate }}
|
{{ 'common.units.persons' | translate }}
|
||||||
</span>
|
</span>
|
||||||
</mat-panel-title>
|
</mat-panel-title>
|
||||||
<mat-panel-description fxFlex="0 0 auto" class="btn-dropdown">
|
<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">
|
<svg
|
||||||
<path d="M7.41 15.41L12 10.83l4.59 4.58L18 14l-6-6-6 6z" />
|
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" />
|
<path d="M0 0h24v24H0z" fill="none" />
|
||||||
</svg>
|
</svg>
|
||||||
</mat-panel-description>
|
</mat-panel-description>
|
||||||
|
|
|
@ -341,6 +341,8 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
|
||||||
menuIndex: MainMenu.Chat
|
menuIndex: MainMenu.Chat
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
|
this.onClickHide();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
onClickConference() {
|
onClickConference() {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user