Fix(exporter): fix #3332 again, data out of order

Author: PaulL1

src/features/exporter/js/exporter.js

@@ -658,15 +658,15 @@
          */
         getColumnHeaders: function (grid, colTypes) {
           var headers = [];
-          var sourceColumns;
+          var columns;
 
           if ( colTypes === uiGridExporterConstants.ALL ){
-            sourceColumns = grid.columns;
+            columns = grid.columns;
           } else {
-            sourceColumns = grid.renderContainers.body.visibleColumnCache.filter( function( column ){ return column.visible; } );
+            columns = grid.renderContainers.body.visibleColumnCache.filter( function( column ){ return column.visible; } );
           }
 
-          sourceColumns.forEach( function( gridCol, index ) {
+          columns.forEach( function( gridCol, index ) {
             if ( gridCol.colDef.exporterSuppressExport !== true &&
                  grid.options.exporterSuppressColumns.indexOf( gridCol.name ) === -1 ){
               headers.push({
@@ -723,9 +723,9 @@
          */
         getData: function (grid, rowTypes, colTypes) {
           var data = [];
-          
           var rows;
-          
+          var columns;
+
           switch ( rowTypes ) {
             case uiGridExporterConstants.ALL:
               rows = grid.rows; 
@@ -741,12 +741,20 @@
               }
               break;
           }
-          
+
+          if ( colTypes === uiGridExporterConstants.ALL ){
+            columns = grid.columns;
+          } else {
+            columns = grid.renderContainers.body.visibleColumnCache.filter( function( column ){ return column.visible; } );
+          }
+
           rows.forEach( function( row, index ) {
 
             if (row.exporterEnableExporting !== false) {
               var extractedRow = [];
-              grid.columns.forEach( function( gridCol, index ) {
+
+
+              columns.forEach( function( gridCol, index ) {
               if ( (gridCol.visible || colTypes === uiGridExporterConstants.ALL ) && 
                    gridCol.colDef.exporterSuppressExport !== true &&
                    grid.options.exporterSuppressColumns.indexOf( gridCol.name ) === -1 ){
@@ -757,11 +765,11 @@
                   extractedRow.push(extractedField);
                 }
               });
-              
+
               data.push(extractedRow);
             }
           });
-          
+
           return data;
         },