jingrow/datatable
1
0
Fork 0
Code Pull Requests Activity

minor fixes

Browse Source
This commit is contained in:
Faris Ansari 2018-02-06 23:50:15 +05:30
parent 9ae7c3a8e6
commit 0d7fc93b37
4 changed files with 46 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
index.html
View File

File diff suppressed because one or more lines are too long

38
lib/frappe-datatable.js
View File

@ -2571,7 +2571,7 @@ var DataManager = function () {
content: '',
align: 'center',
editable: false,
resizable: true,
resizable: false,
focusable: false,
dropdown: false
};
@ -2582,15 +2582,12 @@ var DataManager = function () {
if (this.options.addCheckboxColumn && !this.hasColumnById('_checkbox')) {
var _val = {
id: '_checkbox',
content: 'Checkbox',
content: this.getCheckboxHTML(),
editable: false,
resizable: false,
sortable: false,
focusable: false,
dropdown: false,
format: function format(val) {
return '<input type="checkbox" />';
}
dropdown: false
};
columns = [_val].concat(columns);
@ -2618,7 +2615,7 @@ var DataManager = function () {
value: function prepareRows() {
var _this = this;
this.validateRows(this.data);
this.validateData(this.data);
this.rows = this.data.map(function (d, i) {
var index = _this._getNextRowCount();
@ -2627,13 +2624,12 @@ var DataManager = function () {
if (Array.isArray(d)) {
// row is an array
if (_this.options.addSerialNoColumn) {
row.push(index + 1 + '');
}
if (_this.options.addCheckboxColumn) {
row.push(_this.getCheckboxHTML());
}
if (_this.options.addSerialNoColumn) {
row.push(index + 1 + '');
}
row = row.concat(d);
} else {
// row is a dict
@ -2645,10 +2641,10 @@ var DataManager = function () {
for (var _iterator = _this.columns[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
var col = _step.value;
if (col.id === '_rowIndex') {
row.push(index + 1 + '');
} else if (col.id === '_checkbox') {
if (col.id === '_checkbox') {
row.push(_this.getCheckboxHTML());
} else if (col.id === '_rowIndex') {
row.push(index + 1 + '');
} else {
row.push(col.format(d[col.id]));
}
@ -2686,16 +2682,17 @@ var DataManager = function () {
});
}
}, {
key: 'validateRows',
value: function validateRows(rows) {
if (!Array.isArray(rows)) {
throw new DataError('`rows` must be an array');
key: 'validateData',
value: function validateData(data) {
if (Array.isArray(data) && (Array.isArray(data[0]) || _typeof(data[0]) === 'object')) {
return true;
}
throw new DataError('`data` must be an array of arrays or objects');
}
}, {
key: 'appendRows',
value: function appendRows(rows) {
this.validateRows(rows);
this.validateData(rows);
this.rows = this.rows.concat(this.prepareRows(rows));
}
@ -3057,6 +3054,9 @@ function _prepareColumns(columns) {
return columns.map(prepareCell).map(function (col) {
return Object.assign({}, baseColumn, col);
}).map(function (col) {
col.id = col.id || col.content;
return col;
});
}

2
lib/frappe-datatable.js.map
View File

File diff suppressed because one or more lines are too long

37
src/datamanager.js
View File

@ -44,7 +44,7 @@ export default class DataManager {
content: '',
align: 'center',
editable: false,
resizable: true,
resizable: false,
focusable: false,
dropdown: false
};
@ -55,13 +55,12 @@ export default class DataManager {
if (this.options.addCheckboxColumn && !this.hasColumnById('_checkbox')) {
const val = {
id: '_checkbox',
content: 'Checkbox',
content: this.getCheckboxHTML(),
editable: false,
resizable: false,
sortable: false,
focusable: false,
dropdown: false,
format: val => '<input type="checkbox" />'
dropdown: false
};
columns = [val].concat(columns);
@ -85,7 +84,7 @@ export default class DataManager {
}
prepareRows() {
this.validateRows(this.data);
this.validateData(this.data);
this.rows = this.data.map((d, i) => {
const index = this._getNextRowCount();
@ -94,22 +93,21 @@ export default class DataManager {
if (Array.isArray(d)) {
// row is an array
if (this.options.addSerialNoColumn) {
row.push((index + 1) + '');
}
if (this.options.addCheckboxColumn) {
row.push(this.getCheckboxHTML());
}
if (this.options.addSerialNoColumn) {
row.push((index + 1) + '');
}
row = row.concat(d);
} else {
// row is a dict
for (let col of this.columns) {
if (col.id === '_rowIndex') {
row.push((index + 1) + '');
} else if (col.id === '_checkbox') {
if (col.id === '_checkbox') {
row.push(this.getCheckboxHTML());
} else if (col.id === '_rowIndex') {
row.push((index + 1) + '');
} else {
row.push(col.format(d[col.id]));
}
@ -132,14 +130,15 @@ export default class DataManager {
});
}
validateRows(rows) {
if (!Array.isArray(rows)) {
throw new DataError('`rows` must be an array');
validateData(data) {
if (Array.isArray(data) && (Array.isArray(data[0]) || typeof data[0] === 'object')) {
return true;
}
throw new DataError('`data` must be an array of arrays or objects');
}
appendRows(rows) {
this.validateRows(rows);
this.validateData(rows);
this.rows = this.rows.concat(this.prepareRows(rows));
}
@ -443,7 +442,11 @@ function prepareColumns(columns, props = {}) {
return columns
.map(prepareCell)
.map(col => Object.assign({}, baseColumn, col));
.map(col => Object.assign({}, baseColumn, col))
.map(col => {
col.id = col.id || col.content;
return col;
});
}
function prepareCell(col, i) {