Fix #870: Correct grid grouping rowspan for grouped rows

kartik-v · Jan 2, 2019 · 36b39d2 · 36b39d2
1 parent 3735c99
commit 36b39d2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/CHANGE.md b/CHANGE.md
@@ -1,6 +1,12 @@
 Change Log: `yii2-grid`
 =======================
 
+## Version 3.3.0
+
+**Date:** _under development_
+
+- (enh #870): Correct grid grouping rowspan for grouped rows.
+
 ## Version 3.2.9
 
 **Date:** 07-Dec-2018

diff --git a/src/assets/js/kv-grid-group.js b/src/assets/js/kv-grid-group.js
@@ -187,6 +187,9 @@ var kvGridGroup;
  return source;
  };
  addRowSpan = function ($el, n) {
+ if ($el[0].hasAttribute('data-grouped-row')) {
+ return;
+ }
  n = n || 1;
  var rowspan = $el.attr('rowspan') || 1;
  rowspan = parseInt(rowspan) + n;
@@ -230,7 +233,9 @@ var kvGridGroup;
  proceed = false;
  }
  });
- $td.attr('rowspan', rowspan);
+ if (!$td[0].hasAttribute('data-grouped-row')) {
+ $td.attr('rowspan', rowspan);
+ }
  });
  });
  $tbody.find(' > tr.kv-group-footer').each(function () {
@@ -396,7 +401,9 @@ var kvGridGroup;
  cellKeyCurr = i > 0 ? getCellKey($cell) : $cell.text().trim();
  if (cellKeyCurr === cellKeyPrev) {
  rowspan++;
- $gCell.attr('rowspan', rowspan);
+ if (!$gCell[0].hasAttribute('data-grouped-row')) {
+ $gCell.attr('rowspan', rowspan);
+ }
  $cell.addClass('kv-temp-cells').hide();
  } else {
  gCol = j;

diff --git a/src/assets/js/kv-grid-group.min.js b/src/assets/js/kv-grid-group.min.js