Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 🎸 Group/Nested Data Handling #66

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

feat: 🎸 Group/Nested Data Handling #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1f0af6
feat: 🎸 Group/Nested Data Handling
SaiFi0102 May 10, 2019
8981ee8
fix: 🐛 Improve list view padding for nested data
SaiFi0102 May 15, 2019
01736cf
fix: 🐛 Grouped data list view padding fix
SaiFi0102 May 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/body-renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@ export default class BodyRenderer {
if (cell.content === '') return cell;

if (this.options.hooks.columnTotal) {
const columnValues = this.visibleRows.map(row => row[i].content);
const columnValues = this.visibleRows.filter(d => !d.meta.excludeFromTotal).map(row => row[i].content);
const result = this.options.hooks.columnTotal.call(this.instance, columnValues, cell);
if (result != null) {
cell.content = result;
return cell;
}
}

cell.content = this.visibleRows.reduce((acc, prevRow) => {
cell.content = this.visibleRows.filter(d => !d.meta.excludeFromTotal).reduce((acc, prevRow) => {
const prevCell = prevRow[i];
if (typeof prevCell.content === 'number') {
if (acc == null) acc = 0;
Expand Down
126 changes: 93 additions & 33 deletions src/datamanager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export default class DataManager {
this.rowCount = 0;
this.columns = [];
this.rows = [];
this.flatData = [];

this.prepareColumns();
this.prepareRows();
Expand Down Expand Up @@ -144,51 +145,109 @@ export default class DataManager {
prepareRows() {
this.validateData(this.data);

this.rows = this.data.map((d, i) => {
const index = this._getNextRowCount();
this.rows = [];
for (let d of this.data) {
this.addRow(d);
}
}

let row = [];
let meta = {
rowIndex: index
};
addRow(d) {
if (Array.isArray(d)) {
this.addArrayRow(d);
} else if (d._isGroup) {
this.addGroupObject(d);
} else {
this.addObjectRow(d);
}
}

if (Array.isArray(d)) {
// row is an array
if (this.options.checkboxColumn) {
row.push(this.getCheckboxHTML());
}
if (this.options.serialNoColumn) {
row.push((index + 1) + '');
}
row = row.concat(d);
addArrayRow(d) {
const index = this._getNextRowCount();
let row = [];
let meta = {
rowIndex: index
};

while (row.length < this.columns.length) {
row.push('');
}
if (this.options.checkboxColumn) {
row.push(this.getCheckboxHTML());
}
if (this.options.serialNoColumn) {
row.push((index + 1) + '');
}
row = row.concat(d);

while (row.length < this.columns.length) {
row.push('');
}

this.rows.push(this.prepareRow(row, meta));
this.flatData.push(d);
}

addObjectRow(d) {
const index = this._getNextRowCount();
let row = [];
let meta = {
rowIndex: index
};

for (let col of this.columns) {
if (col.id === '_checkbox') {
row.push(this.getCheckboxHTML());
} else if (col.id === '_rowIndex') {
row.push((index + 1) + '');
} else {
// row is an object
for (let col of this.columns) {
if (col.id === '_checkbox') {
row.push(this.getCheckboxHTML());
} else if (col.id === '_rowIndex') {
row.push((index + 1) + '');
} else {
row.push(d[col.id]);
}
}
row.push(d[col.id]);
}
}

meta.indent = d.indent || 0;
meta.excludeFromTotal = d._excludeFromTotal;

this.rows.push(this.prepareRow(row, meta));
this.flatData.push(d);
}

addGroupObject(group) {
let view = group.totals ? 'tree' : 'list';
let parentIndent;

// totals row for tree view
if (view === 'tree' && group.totals) {
group.totals._excludeFromTotal = true;
group.totals._isGroupTotal = true;
group.totals.indent = group.indent || 0;
parentIndent = group.totals.indent;
this.addRow(group.totals);
}

// padding row for list view
if (view === 'list' && this.rows.length) {
this.addRow({});
}

meta.indent = d.indent || 0;
for (let i = 0; i < group.rows.length; ++i) {
let row = group.rows[i];

// if group has a total row, make sure its child rows are indented properly
if (parentIndent != null) {
row.indent = parentIndent + 1;
}

return this.prepareRow(row, meta);
});
this.addRow(row);

// padding row for list view
if (view === 'list' && row._isGroup) {
if (i + 1 < group.rows.length && !group.rows[i + 1]._isGroup) {
this.addRow({});
}
}
}
}

prepareTreeRows() {
this.rows.forEach((row, i) => {
if (isNumber(row.meta.indent)) {
// if (i === 36) debugger;
const nextRow = this.getRow(i + 1);
row.meta.isLeaf = !nextRow ||
notSet(nextRow.meta.indent) ||
Expand Down Expand Up @@ -245,6 +304,7 @@ export default class DataManager {
this.validateData(rows);

this.rows.push(...this.prepareRows(rows));
this.flatData.push(...rows);
}

sortRows(colIndex, sortOrder = 'none') {
Expand Down Expand Up @@ -592,7 +652,7 @@ export default class DataManager {
* @memberof DataManager
*/
getData(rowIndex) {
return this.data[rowIndex];
return this.flatData[rowIndex];
}

hasColumn(name) {
Expand Down