From 484ca43ddad79e309f15adc1566371d3584dadfe Mon Sep 17 00:00:00 2001 From: Jack Scott Date: Tue, 10 Oct 2017 12:46:48 +0100 Subject: [PATCH 1/4] Update ng-table.component.ts --- components/table/ng-table.component.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/components/table/ng-table.component.ts b/components/table/ng-table.component.ts index a93885d..cbcff10 100644 --- a/components/table/ng-table.component.ts +++ b/components/table/ng-table.component.ts @@ -56,6 +56,7 @@ export class NgTableComponent { @Input() public set columns(values:Array) { + const names = values.map(v => v.name); values.forEach((value:any) => { if (value.filtering) { this.showFilterRow = true; @@ -63,6 +64,12 @@ export class NgTableComponent { if (value.className && value.className instanceof Array) { value.className = value.className.join(' '); } + if (this._columns.length) { + var difference = this._columns.filter(x => names.indexOf(x.name) === -1); + difference.forEach(function (d) { + this._columns.splice(this._columns.indexOf(d), 1); + }); + } let column = this._columns.find((col:any) => col.name === value.name); if (column) { Object.assign(column, value); From d323570b00052b96458930d4028f68d05f1c3384 Mon Sep 17 00:00:00 2001 From: Jack Scott Date: Tue, 10 Oct 2017 12:55:25 +0100 Subject: [PATCH 2/4] Update ng-table.component.ts --- components/table/ng-table.component.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/table/ng-table.component.ts b/components/table/ng-table.component.ts index cbcff10..0ad2c4a 100644 --- a/components/table/ng-table.component.ts +++ b/components/table/ng-table.component.ts @@ -65,11 +65,11 @@ export class NgTableComponent { value.className = value.className.join(' '); } if (this._columns.length) { - var difference = this._columns.filter(x => names.indexOf(x.name) === -1); - difference.forEach(function (d) { - this._columns.splice(this._columns.indexOf(d), 1); - }); - } + const difference = this._columns.filter(x => names.indexOf(x.name) === -1); + difference.forEach(function (d) { + this._columns.splice(this._columns.indexOf(d), 1); + }); + } let column = this._columns.find((col:any) => col.name === value.name); if (column) { Object.assign(column, value); From 336c5ecd5be8f87487c3ad27fca8fd0b2a3db251 Mon Sep 17 00:00:00 2001 From: Jack Scott Date: Tue, 10 Oct 2017 13:39:04 +0100 Subject: [PATCH 3/4] Update ng-table.component.ts --- components/table/ng-table.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/table/ng-table.component.ts b/components/table/ng-table.component.ts index 0ad2c4a..e91c444 100644 --- a/components/table/ng-table.component.ts +++ b/components/table/ng-table.component.ts @@ -56,7 +56,7 @@ export class NgTableComponent { @Input() public set columns(values:Array) { - const names = values.map(v => v.name); + const names = values.map(v: any => v.name); values.forEach((value:any) => { if (value.filtering) { this.showFilterRow = true; @@ -65,8 +65,8 @@ export class NgTableComponent { value.className = value.className.join(' '); } if (this._columns.length) { - const difference = this._columns.filter(x => names.indexOf(x.name) === -1); - difference.forEach(function (d) { + const difference = this._columns.filter(x: any => names.indexOf(x.name) === -1); + difference.forEach(function (d: any) { this._columns.splice(this._columns.indexOf(d), 1); }); } From 691d7a9639c6d4668b7c972c259e689ca47ca9b7 Mon Sep 17 00:00:00 2001 From: Jack Scott Date: Tue, 10 Oct 2017 13:44:20 +0100 Subject: [PATCH 4/4] Update ng-table.component.ts --- components/table/ng-table.component.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/components/table/ng-table.component.ts b/components/table/ng-table.component.ts index e91c444..8aec29c 100644 --- a/components/table/ng-table.component.ts +++ b/components/table/ng-table.component.ts @@ -56,7 +56,7 @@ export class NgTableComponent { @Input() public set columns(values:Array) { - const names = values.map(v: any => v.name); + const names = values.map((v: any) => v.name); values.forEach((value:any) => { if (value.filtering) { this.showFilterRow = true; @@ -65,10 +65,8 @@ export class NgTableComponent { value.className = value.className.join(' '); } if (this._columns.length) { - const difference = this._columns.filter(x: any => names.indexOf(x.name) === -1); - difference.forEach(function (d: any) { - this._columns.splice(this._columns.indexOf(d), 1); - }); + const difference = this._columns.filter((x: any) => names.indexOf(x.name) === -1); + difference.forEach((d: any) => this._columns.splice(this._columns.indexOf(d), 1)); } let column = this._columns.find((col:any) => col.name === value.name); if (column) {