From 4c0bdbbc50829019bba48bb9af16d4508fe89344 Mon Sep 17 00:00:00 2001
From: walkerkay <walkerkay@163.com>
Date: Tue, 5 Nov 2024 13:50:01 +0800
Subject: [PATCH] fix: fix ngx-gantt-table itemClick event not work #472

---
 example/src/app/gantt/gantt.component.html                 | 1 +
 example/src/app/gantt/gantt.component.ts                   | 5 +++++
 packages/gantt/src/class/event.ts                          | 5 ++++-
 .../components/table/body/gantt-table-body.component.html  | 2 +-
 packages/gantt/src/gantt.component.ts                      | 5 +++++
 packages/gantt/src/table/gantt-table.component.ts          | 7 +++++--
 6 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/example/src/app/gantt/gantt.component.html b/example/src/app/gantt/gantt.component.html
index 738b731d..3880e497 100644
--- a/example/src/app/gantt/gantt.component.html
+++ b/example/src/app/gantt/gantt.component.html
@@ -49,6 +49,7 @@
       <ngx-gantt-table
         [draggable]="true"
         [dropEnterPredicate]="dropEnterPredicate"
+        (itemClick)="itemClick($event)"
         (dragDropped)="onDragDropped($event)"
         (dragStarted)="onDragStarted($event)"
         (dragEnded)="onDragEnded($event)"
diff --git a/example/src/app/gantt/gantt.component.ts b/example/src/app/gantt/gantt.component.ts
index d3a6782c..0e6c5d96 100644
--- a/example/src/app/gantt/gantt.component.ts
+++ b/example/src/app/gantt/gantt.component.ts
@@ -12,6 +12,7 @@ import {
     GanttTableDragEndedEvent,
     GanttTableDragEnterPredicateContext,
     GanttTableDragStartedEvent,
+    GanttTableItemClickEvent,
     GanttToolbarOptions,
     GanttView,
     GanttViewType,
@@ -163,6 +164,10 @@ export class AppGanttExampleComponent implements OnInit, AfterViewInit {
         this.items = [...this.items];
     }
 
+    itemClick(event: GanttTableItemClickEvent) {
+        console.log(`点击了数据行 ${event.current.id}`);
+    }
+
     selectedChange(event: GanttSelectedEvent) {
         event.current && this.ganttComponent.scrollToDate(event.current?.start);
 
diff --git a/packages/gantt/src/class/event.ts b/packages/gantt/src/class/event.ts
index 208582e5..7bf833f7 100644
--- a/packages/gantt/src/class/event.ts
+++ b/packages/gantt/src/class/event.ts
@@ -33,9 +33,12 @@ export class GanttBarClickEvent<T = unknown> {
     item: GanttItem<T>;
 }
 
-export class GanttSelectedEvent<T = unknown> {
+export class GanttTableItemClickEvent<T = unknown> {
     event: Event;
     current?: GanttItem<T>;
+}
+
+export class GanttSelectedEvent<T = unknown> extends GanttTableItemClickEvent<T> {
     selectedValue: GanttItem<T> | GanttItem<T>[];
 }
 
diff --git a/packages/gantt/src/components/table/body/gantt-table-body.component.html b/packages/gantt/src/components/table/body/gantt-table-body.component.html
index bd3cf158..8216cb82 100644
--- a/packages/gantt/src/components/table/body/gantt-table-body.component.html
+++ b/packages/gantt/src/components/table/body/gantt-table-body.component.html
@@ -33,7 +33,7 @@
 
       <div
         *ngIf="!item.items"
-        (click)="itemClick.emit({ event: $event, selectedValue: item.origin })"
+        (click)="itemClick.emit({ event: $event, current: item.origin, selectedValue: item.origin })"
         cdkDrag
         [cdkDragData]="item"
         [cdkDragDisabled]="(draggable && item.itemDraggable === false) || !draggable"
diff --git a/packages/gantt/src/gantt.component.ts b/packages/gantt/src/gantt.component.ts
index 6d68ee14..26377c10 100644
--- a/packages/gantt/src/gantt.component.ts
+++ b/packages/gantt/src/gantt.component.ts
@@ -337,6 +337,11 @@ export class NgxGanttComponent extends GanttUpper implements OnInit, OnChanges,
     }
 
     selectItem(selectEvent: GanttSelectedEvent) {
+        this.table.itemClick.emit({
+            event: selectEvent.event,
+            current: selectEvent.current
+        });
+
         if (!this.selectable) {
             return;
         }
diff --git a/packages/gantt/src/table/gantt-table.component.ts b/packages/gantt/src/table/gantt-table.component.ts
index d15d5628..bdf71190 100644
--- a/packages/gantt/src/table/gantt-table.component.ts
+++ b/packages/gantt/src/table/gantt-table.component.ts
@@ -1,10 +1,11 @@
-import { Component, ContentChild, EventEmitter, Input, Output, TemplateRef } from '@angular/core';
+import { Component, ContentChild, EventEmitter, input, Input, Output, TemplateRef } from '@angular/core';
 import {
     GanttTableDragEnterPredicateContext,
     GanttTableDragDroppedEvent,
     GanttTableEvent,
     GanttTableDragStartedEvent,
-    GanttTableDragEndedEvent
+    GanttTableDragEndedEvent,
+    GanttTableItemClickEvent
 } from '../class';
 
 @Component({
@@ -25,6 +26,8 @@ export class NgxGanttTableComponent {
 
     @Output() columnChanges = new EventEmitter<GanttTableEvent>();
 
+    @Output() itemClick = new EventEmitter<GanttTableItemClickEvent>();
+
     @ContentChild('rowBeforeSlot', { static: true }) rowBeforeTemplate: TemplateRef<any>;
 
     @ContentChild('rowAfterSlot', { static: true }) rowAfterTemplate: TemplateRef<any>;