inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AAE-7819] Fix for custom header (#7585)

Browse Source
This commit is contained in:
Bartosz Sekuła
2022-04-20 16:44:37 +02:00
committed by GitHub
parent 694d71a103
commit d26204cd9b
5 changed files with 62 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/core/datatable/components/datatable/datatable.component.html
View File

@@ -48,7 +48,6 @@
adf-drop-zone dropTarget="header" [dropColumn]="col">
<div
*ngIf="!col.header"
[attr.data-automation-id]="'auto_header_content_id_' + col.key"
class="adf-datatable-cell-header-content"
[class.adf-datatable-cell-header-content--hovered]="hoveredHeaderColumnIndex === columnIndex && !isDraggingHeaderColumn"
@@ -59,11 +58,17 @@
[attr.data-automation-id]="'adf-datatable-cell-header-drag-icon-placeholder-'+col.key"
></span>
<span *ngIf="col.title" class="adf-datatable-cell-value">{{col.title | translate}}</span>
<ng-container *ngIf="!col.header">
<span *ngIf="col.title" class="adf-datatable-cell-value">{{col.title | translate}}</span>
<span *ngIf="col.title && col.sortable && isDraggingHeaderColumn" class="adf-sr-only" aria-live="polite">
{{ getSortLiveAnnouncement(col) | translate: { string: col.title | translate } }}
</span>
<span *ngIf="col.title && col.sortable && isDraggingHeaderColumn" class="adf-sr-only" aria-live="polite">
{{ getSortLiveAnnouncement(col) | translate: { string: col.title | translate } }}
</span>
</ng-container>
<div *ngIf="col.header" class="adf-datatable-cell-value">
<ng-template [ngTemplateOutlet]="col.header" [ngTemplateOutletContext]="{$implicit: col}"></ng-template>
</div>
<ng-template *ngIf="allowFiltering" [ngTemplateOutlet]="headerFilterTemplate" [ngTemplateOutletContext]="{$implicit: col}"></ng-template>
@@ -73,8 +78,6 @@
</span>
</div>
<ng-template *ngIf="col.header" [ngTemplateOutlet]="col.header" [ngTemplateOutletContext]="{$implicit: col}"></ng-template>
<div
*ngIf="col.draggable"
cdkDragHandle