Updates to release v3.1.3 fixes #565

CHANGE.md

@@ -12,6 +12,7 @@ Change Log: `yii2-grid`
 5. (enh #562): Enhance `EditableColumnAction` to support model scenario as a parameter.
 6. (enh #564): Enhance page summary to render within table body and add new property`GridView::pageSummaryContainer`.
 7. Enhance PHP Documentation for all classes and methods in the extension.
+8. (enh #565): Better exported content parsing for header, footer, and page summary.
 
 ## Version 3.1.2
 

EditableColumnAction.php

@@ -131,7 +131,7 @@ class EditableColumnAction extends Action
     /**
      * @var string allows overriding the form name which is used to access posted data
      */
-    public $formName = '';
+    public $formName;
 
     /**
      * @inheritdoc

assets/js/kv-grid-export.js

@@ -88,6 +88,7 @@
         var self = this, gridOpts = options.gridOpts, genOpts = options.genOpts;
         self.$element = $(element);
         //noinspection JSUnresolvedVariable
+        self.gridId = gridOpts.gridId;
         self.$grid = $("#" + gridOpts.gridId);
         self.dialogLib = options.dialogLib;
         self.messages = gridOpts.messages;
@@ -223,7 +224,10 @@
         },
         clean: function (expType) {
             var self = this, $table = self.$table.clone(),
-                $tHead = self.$table.closest('.kv-grid-container').find('.kv-thead-float thead');
+                $tHead = self.$table.closest('.kv-grid-container').find('.kv-thead-float thead'),
+                safeRemove = function(selector) {
+                    $table.find(selector + '.' + self.gridId).remove();
+                };
             if ($tHead.length) {
                 $tHead = $tHead.clone();
                 $table.find('thead').before($tHead).remove();
@@ -237,16 +241,16 @@
             });
             $table.find('input').remove(); // remove any form inputs
             if (!self.showHeader) {
-                $table.find('thead').remove();
+                $table.children('thead').remove();
             }
             if (!self.showPageSummary) {
-                $table.find('tfoot.kv-page-summary').remove();
+                safeRemove('.kv-page-summary-container');
             }
             if (!self.showFooter) {
-                $table.find('tfoot.kv-table-footer').remove();
+                safeRemove('.kv-footer-container');
             }
             if (!self.showCaption) {
-                $table.find('kv-table-caption').remove();
+                safeRemove('.kv-caption-container');
             }
             $table.find('.skip-export').remove();
             $table.find('.skip-export-' + expType).remove();