jingrow/datatable
1
0
Fork 0
Code Pull Requests Activity

fix checkall behaviour

Browse Source
This commit is contained in:
Faris Ansari 2017-10-07 20:40:41 +05:30
parent c8bf326f70
commit 97ce04d8af
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/frappe-datatable.js
View File

@ -1515,9 +1515,14 @@ var DataTable = function () {
value: function checkAll(toggle) { value: function checkAll(toggle) {
var value = toggle ? 1 : 0; var value = toggle ? 1 : 0;
this.checkMap.map(function (c) { // update internal map
if (toggle) {
this.checkMap = Array.from(Array(this.getTotalRows())).map(function (c) {
return value; return value;
}); });
} else {
this.checkMap = [];
}
// set checkbox value // set checkbox value
this.bodyScrollable.find('.data-table-col[data-col-index="0"] [type="checkbox"]').prop('checked', toggle); this.bodyScrollable.find('.data-table-col[data-col-index="0"] [type="checkbox"]').prop('checked', toggle);
// highlight all // highlight all
@ -1528,7 +1533,7 @@ var DataTable = function () {
value: function highlightRow(rowIndex) { value: function highlightRow(rowIndex) {
var toggle = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true; var toggle = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
var $row = this.bodyScrollable.find('.data-table-row[data-row-index="' + rowIndex + '"]'); var $row = this.bodyScrollable.find('.data-table-row[data-row-index="' + rowIndex + '"]:not(.row-highlight)');
if (toggle) { if (toggle) {
$row.addClass('row-highlight'); $row.addClass('row-highlight');
@ -1665,6 +1670,11 @@ var DataTable = function () {
value: function getCellAttr($cell) { value: function getCellAttr($cell) {
return $cell.data(); return $cell.data();
} }
}, {
key: 'getTotalRows',
value: function getTotalRows() {
return this.data.rows.length;
}
}, { }, {
key: 'log', key: 'log',
value: function log() { value: function log() {

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

File diff suppressed because one or more lines are too long

14
src/datatable.js
View File

@ -592,7 +592,12 @@ export default class DataTable {
checkAll(toggle) { checkAll(toggle) {
const value = toggle ? 1 : 0; const value = toggle ? 1 : 0;
this.checkMap.map(c => value); // update internal map
if (toggle) {
this.checkMap = Array.from(Array(this.getTotalRows())).map(c => value);
} else {
this.checkMap = [];
}
// set checkbox value // set checkbox value
this.bodyScrollable this.bodyScrollable
.find('.data-table-col[data-col-index="0"] [type="checkbox"]') .find('.data-table-col[data-col-index="0"] [type="checkbox"]')
@ -602,7 +607,8 @@ export default class DataTable {
} }
highlightRow(rowIndex, toggle = true) { highlightRow(rowIndex, toggle = true) {
const $row = this.bodyScrollable.find(`.data-table-row[data-row-index="${rowIndex}"]`); const $row = this.bodyScrollable
.find(`.data-table-row[data-row-index="${rowIndex}"]:not(.row-highlight)`);
if (toggle) { if (toggle) {
$row.addClass('row-highlight'); $row.addClass('row-highlight');
@ -723,6 +729,10 @@ export default class DataTable {
return $cell.data(); return $cell.data();
} }
getTotalRows() {
return this.data.rows.length;
}
log() { log() {
if (this.options.enableLogs) { if (this.options.enableLogs) {
console.log.apply(console, arguments); console.log.apply(console, arguments);