when using columnCalcs in true mode, ensure calc rows are regenerated…

… after groupRows cleared
vdm-io · Oct 16, 2022 · eec3b6f · eec3b6f
1 parent fb5f05f
commit eec3b6f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/dist/js/tabulator_esm.js b/dist/js/tabulator_esm.js
@@ -3830,6 +3830,16 @@ class ColumnCalcs extends Module{
 		}
 	}
 
+	reinitializeCalcs(){
+		if(this.topCalcs.length){
+			this.initializeTopRow();
+		}
+
+		if(this.botCalcs.length){
+			this.initializeBottomRow();
+		}
+	}
+
 	initializeTopRow(){
 		if(!this.topInitialized){
 			this.table.columnManager.getContentsElement().insertBefore(this.topElement, this.table.columnManager.headersElement.nextSibling);
@@ -12001,6 +12011,10 @@ class GroupRows extends Module{
 		}
 
 		this.configureGroupSetup();
+
+		if(!groups && this.table.modExists("columnCalcs") && this.table.options.columnCalcs === true){
+			this.table.modules.columnCalcs.reinitializeCalcs();
+		}
 
 		this.refreshData();
 

diff --git a/dist/js/tabulator_esm.js.map b/dist/js/tabulator_esm.js.map
diff --git a/src/js/modules/ColumnCalcs/ColumnCalcs.js b/src/js/modules/ColumnCalcs/ColumnCalcs.js
@@ -250,6 +250,16 @@ class ColumnCalcs extends Module{
 		}
 	}
 
+	reinitializeCalcs(){
+		if(this.topCalcs.length){
+			this.initializeTopRow();
+		}
+
+		if(this.botCalcs.length){
+			this.initializeBottomRow();
+		}
+	}
+
 	initializeTopRow(){
 		if(!this.topInitialized){
 			this.table.columnManager.getContentsElement().insertBefore(this.topElement, this.table.columnManager.headersElement.nextSibling);

diff --git a/src/js/modules/GroupRows/GroupRows.js b/src/js/modules/GroupRows/GroupRows.js
@@ -233,6 +233,10 @@ class GroupRows extends Module{
 		}
 
 		this.configureGroupSetup();
+
+		if(!groups && this.table.modExists("columnCalcs") && this.table.options.columnCalcs === true){
+			this.table.modules.columnCalcs.reinitializeCalcs();
+		}
 
 		this.refreshData();