fix(dataset): fix #15 columns list doesn't reset on columns change

akveo · Sep 2, 2016 · 2ebac0f · 2ebac0f
1 parent 8d6b870
commit 2ebac0f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/ng2-smart-table/lib/grid.ts b/src/ng2-smart-table/lib/grid.ts
@@ -28,6 +28,10 @@ export class Grid {
   setSettings(settings: Object): void {
     this.settings = settings;
     this.dataSet = new DataSet([], this.getSetting('columns'));
+
+    if (this.source) {
+      this.source.refresh();  
+    }
   }
 
   getDataSet(): DataSet {

diff --git a/src/ng2-smart-table/ng2-smart-table.component.ts b/src/ng2-smart-table/ng2-smart-table.component.ts
@@ -167,6 +167,6 @@ export class Ng2SmartTableComponent implements OnChanges {
   }
 
   protected prepareSettings(): Object {
-    return deepExtend(this.defaultSettings, this.settings);
+    return deepExtend(this.settings, this.defaultSettings);
   }
 }