Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(gantt): add expand icon column(#INFR-6568) #312

Merged
merged 4 commits into from
Feb 28, 2023
Merged

feat(gantt): add expand icon column(#INFR-6568) #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dace616
feat(gantt): support fixed expand icon assign column(#INFR-6568)
xinglu01 Feb 22, 2023
840d9b1
test(gantt): add fixed expand icon test(#INFR-6568)
xinglu01 Feb 22, 2023
a2dbf76
test(gantt): add fixed expand icon test(#INFR-6568)
xinglu01 Feb 22, 2023
9c42741
feat(gantt): optimize code to expand icon column(#INFR-6568)
xinglu01 Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions example/src/app/gantt/gantt.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@
(linkDragEnded)="linkDragEnded($event)"
>
<ngx-gantt-table>
<ngx-gantt-column name="标题" width="180px">
<ng-template #cell let-item="item"> {{ item.title }} </ng-template>
</ngx-gantt-column>
<ngx-gantt-column name="开始时间" width="140px">
<ng-template #cell let-item="item">
{{ item.start * 1000 | date: 'yyyy-MM-dd' }}
{{ item.start * 1000 | date : 'yyyy-MM-dd' }}
</ng-template>
</ngx-gantt-column>
<ngx-gantt-column name="标题" width="180px" [showExpandIcon]="true">
<ng-template #cell let-item="item"> {{ item.title }} </ng-template>
</ngx-gantt-column>
<ngx-gantt-column name="截止时间" width="140px">
<ng-template #cell let-item="item">
{{ item.end * 1000 | date: 'yyyy-MM-dd' }}
{{ item.end * 1000 | date : 'yyyy-MM-dd' }}
</ng-template>
</ngx-gantt-column>
</ngx-gantt-table>
Expand Down
4 changes: 2 additions & 2 deletions packages/gantt/src/components/table/gantt-table.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
[ngTemplateOutlet]="rowBeforeTemplate"
[ngTemplateOutletContext]="{ $implicit: item.origin, item: item.origin }"
></ng-template>
<div class="gantt-table-column" *ngFor="let column of columnList; let first = first" [style.width]="column.columnWidth">
<div *ngIf="first" class="gantt-expand-icon" [style.marginLeft.px]="level * 20">
<div class="gantt-table-column" *ngFor="let column of columnList" [style.width]="column.columnWidth">
<div *ngIf="expandIconColumn === column?.name" class="gantt-expand-icon" [style.marginLeft.px]="level * 20">
<ng-container *ngIf="level < gantt.maxLevel - 1 && item.expandable">
<gantt-icon
*ngIf="!item.loading"
Expand Down
6 changes: 6 additions & 0 deletions packages/gantt/src/components/table/gantt-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,22 @@ export class GanttTableComponent implements OnChanges {

public dragStartLeft: number;

public expandIconColumn: string;

@Input() groups: GanttGroupInternal[];

@Input() items: GanttItemInternal[];

@Input()
set columns(columns: QueryList<NgxGanttTableColumnComponent>) {
this.expandIconColumn = columns.toArray()[0]?.name;
columns.forEach((column) => {
if (!column.columnWidth) {
column.columnWidth = coerceCssPixelValue(defaultColumnWidth);
}
if (column.showExpandIcon) {
this.expandIconColumn = column?.name;
}
});
this.columnList = columns;
}
Expand Down
15 changes: 14 additions & 1 deletion packages/gantt/src/components/table/test/table.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ import { GanttMainComponent } from 'ngx-gantt/components/main/gantt-main.compone
template: `
<ngx-gantt #gantt [items]="items" [groups]="groups" [selectable]="selectable" [multiple]="multiple">
<ngx-gantt-table>
<ngx-gantt-column [width]="200" name="标题">
<ngx-gantt-column name="开始时间" width="140px">
<ng-template #cell let-item="item">
{{ item.start * 1000 | date : 'yyyy-MM-dd' }}
</ng-template>
</ngx-gantt-column>
<ngx-gantt-column [width]="200" name="标题" [showExpandIcon]="showExpandIcon">
<ng-template #cell let-item="item">
{{ item.title }}
</ng-template>
Expand All @@ -34,6 +39,8 @@ export class TestGanttTableComponent {

multiple = true;

showExpandIcon = true;

constructor() {}
}

Expand Down Expand Up @@ -202,4 +209,10 @@ describe('GanttTable', () => {
itemNode.click();
expect(selectionModel.selected.length).toEqual(0);
});

it('should fixed expand icon column', () => {
const ganttTable: DebugElement = fixture.debugElement.query(By.directive(GanttTableComponent));
const column = ganttTable.queryAll(By.css('.gantt-table-item'))[0].queryAll(By.css('.gantt-table-column'))[1];
expect(column.nativeElement.querySelector('.gantt-expand-icon').classList.contains('gantt-expand-icon')).toBeTrue();
});
});
2 changes: 2 additions & 0 deletions packages/gantt/src/table/gantt-column.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ export class NgxGanttTableColumnComponent {

@Input() name: string;

@Input() showExpandIcon: boolean;

@ContentChild('cell', { static: true }) templateRef: TemplateRef<any>;

@ContentChild('header', { static: true }) headerTemplateRef: TemplateRef<any>;
Expand Down
14 changes: 12 additions & 2 deletions packages/gantt/src/test/mocks/data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,19 @@ export function getMockGroupItems() {
id: 'item-child-0101',
title: 'VERSION Children 0101',
start: new GanttDate('2020-05-21 12:34:35').getUnixTime(),
group_id: '00001',
group_id: 'item-0101',
color: '#FF0000',
linkable: false
linkable: false,
children: [
{
id: 'item-child-010101',
title: 'VERSION Children 010101',
start: new GanttDate('2020-05-21 12:34:35').getUnixTime(),
group_id: 'item-child-0101',
color: '#FF0000',
linkable: false
}
]
}
]
},
Expand Down