File tree Expand file tree Collapse file tree 5 files changed +49
-8
lines changed
projects/igniteui-angular/src/lib/grids Expand file tree Collapse file tree 5 files changed +49
-8
lines changed Original file line number Diff line number Diff line change @@ -3915,6 +3915,14 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
39153915 return this . isRowSelectable && this . hasVisibleColumns && ! this . hideRowSelectors ;
39163916 }
39173917
3918+ /**
3919+ * @hidden
3920+ * @internal
3921+ */
3922+ get showAddButton ( ) {
3923+ return this . rowEditable && this . dataView . length === 0 && this . columns . length > 0 ;
3924+ }
3925+
39183926 /**
39193927 * @hidden
39203928 * @internal
Original file line number Diff line number Diff line change 253253< ng-template #emptyFilteredGrid >
254254 < span class ="igx-grid__tbody-message ">
255255 < span > {{emptyFilteredGridMessage}}</ span >
256- < span *ngIf ='rowEditable && dataView.length === 0 '>
257- < ng-container *ngTemplateOutlet ='addRowEmptyTemplate '> </ ng-container >
256+ < span *ngIf ='showAddButton '>
257+ < ng-container *ngTemplateOutlet ='addRowEmptyTemplate || defaultAddRowEmptyTemplate '> </ ng-container >
258258 </ span >
259259 </ span >
260260</ ng-template >
261261
262262< ng-template #defaultEmptyGrid >
263263 < span class ="igx-grid__tbody-message ">
264264 < span > {{emptyGridMessage}}</ span >
265- < span *ngIf ='rowEditable && dataView.length === 0 '>
265+ < span *ngIf ='showAddButton '>
266266 < ng-container *ngTemplateOutlet ='addRowEmptyGridTemplate || defaultAddRowEmptyTemplate '> </ ng-container >
267267 </ span >
268268 </ span >
Original file line number Diff line number Diff line change 209209</ ng-template >
210210
211211< ng-template #emptyFilteredGrid >
212- < span class ="igx-grid__tbody-message "> {{emptyFilteredGridMessage}}</ span >
212+ < span class ="igx-grid__tbody-message ">
213+ < span > {{emptyFilteredGridMessage}}</ span >
214+ < span *ngIf ='showAddButton '>
215+ < ng-container *ngTemplateOutlet ='addRowEmptyTemplate || defaultAddRowEmptyTemplate '> </ ng-container >
216+ </ span >
217+ </ span >
213218</ ng-template >
214219
215220< ng-template #defaultEmptyGrid >
216- < span class ="igx-grid__tbody-message "> {{emptyGridMessage}}</ span >
221+ < span class ="igx-grid__tbody-message ">
222+ < span > {{emptyGridMessage}}</ span >
223+ < span *ngIf ='showAddButton '>
224+ < ng-container *ngTemplateOutlet ='addRowEmptyGridTemplate || defaultAddRowEmptyTemplate '> </ ng-container >
225+ </ span >
226+ </ span >
227+ </ ng-template >
228+
229+ < ng-template #defaultAddRowEmptyTemplate >
230+ < button igxButton ="raised " igxRipple (click) ='beginAddRowByIndex(null, -1) '>
231+ {{resourceStrings.igx_grid_add_row_label}}
232+ </ button >
217233</ ng-template >
218234
219235< ng-template #defaultLoadingGrid >
Original file line number Diff line number Diff line change 183183</ ng-template >
184184
185185< ng-template #emptyFilteredGrid >
186- < span class ="igx-grid__tbody-message "> {{emptyFilteredGridMessage}}</ span >
186+ < span class ="igx-grid__tbody-message ">
187+ < span > {{emptyFilteredGridMessage}}</ span >
188+ < span *ngIf ='showAddButton '>
189+ < ng-container *ngTemplateOutlet ='addRowEmptyTemplate || defaultAddRowEmptyTemplate '> </ ng-container >
190+ </ span >
191+ </ span >
187192</ ng-template >
188193
189194< ng-template #defaultEmptyGrid >
190- < span class ="igx-grid__tbody-message "> {{emptyGridMessage}}</ span >
195+ < span class ="igx-grid__tbody-message ">
196+ < span > {{emptyGridMessage}}</ span >
197+ < span *ngIf ='showAddButton '>
198+ < ng-container *ngTemplateOutlet ='addRowEmptyGridTemplate || defaultAddRowEmptyTemplate '> </ ng-container >
199+ </ span >
200+ </ span >
201+ </ ng-template >
202+
203+ < ng-template #defaultAddRowEmptyTemplate >
204+ < button igxButton ="raised " igxRipple (click) ='beginAddRowByIndex(null, -1) '>
205+ {{resourceStrings.igx_grid_add_row_label}}
206+ </ button >
191207</ ng-template >
192208
193209< ng-template #defaultLoadingGrid >
Original file line number Diff line number Diff line change @@ -628,7 +628,8 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy
628628
629629 public getEmptyRecordObjectFor ( rec ) {
630630 const row = { ...rec } ;
631- row . data = { ... rec . data } ;
631+ const data = rec || { } ;
632+ row . data = { ... data } ;
632633 Object . keys ( row . data ) . forEach ( key => {
633634 // persist foreign key if one is set.
634635 if ( this . foreignKey && key === this . foreignKey ) {
You can’t perform that action at this time.
0 commit comments