Skip to content

Filter not vgtDisabled on selectAll #920

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

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

Filter not vgtDisabled on selectAll #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36da7d1
Filter not vgtDisabled on selectAll
ndunks Feb 23, 2022
67d4e85
Fix disabled checkbox on cell click
ndunks Feb 23, 2022
a6c6b74
Fix deselect all checkbox
ndunks Feb 23, 2022
8d77ee8
Fix undefined refs
ndunks Feb 23, 2022
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
17 changes: 15 additions & 2 deletions dist/vue-good-table.cjs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3514,6 +3514,7 @@ var __vue_render__$4 = function __vue_render__() {
"scope": "col"
}
}, [_c('input', {
ref: "checkbox",
attrs: {
"type": "checkbox"
},
Expand Down Expand Up @@ -9208,18 +9209,29 @@ var script$6 = {
});
});
this.emitSelectedRows();
this.setSelectAllChecked(false);
},
selectAllChecked: function selectAllChecked() {
return this.$refs['table-header-primary'].$refs.checkbox.checked;
},
setSelectAllChecked: function setSelectAllChecked(checked) {
if (this.$refs['table-header-primary'] && this.$refs['table-header-primary'].$refs.checkbox) {
this.$refs['table-header-primary'].$refs.checkbox.checked = checked;
}
},
toggleSelectAll: function toggleSelectAll() {
var _this7 = this;

if (this.allSelected) {
if (this.allSelected || !this.selectAllChecked()) {
this.unselectAllInternal();
return;
}

var rows = this.selectAllByPage ? this.paginated : this.filteredRows;
rows.forEach(function (headerRow) {
headerRow.children.forEach(function (row) {
headerRow.children.filter(function (row) {
return !row.vgtDisabled;
}).forEach(function (row) {
_this7.$set(row, 'vgtSelected', true);
});
});
Expand Down Expand Up @@ -9310,6 +9322,7 @@ var script$6 = {
},
// checkbox click should always do the following
onCheckboxClicked: function onCheckboxClicked(row, index, event) {
if (row.vgtDisabled) return;
this.$set(row, 'vgtSelected', !row.vgtSelected);
this.$emit('on-row-click', {
row: row,
Expand Down
17 changes: 15 additions & 2 deletions dist/vue-good-table.esm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3510,6 +3510,7 @@ var __vue_render__$4 = function __vue_render__() {
"scope": "col"
}
}, [_c('input', {
ref: "checkbox",
attrs: {
"type": "checkbox"
},
Expand Down Expand Up @@ -9204,18 +9205,29 @@ var script$6 = {
});
});
this.emitSelectedRows();
this.setSelectAllChecked(false);
},
selectAllChecked: function selectAllChecked() {
return this.$refs['table-header-primary'].$refs.checkbox.checked;
},
setSelectAllChecked: function setSelectAllChecked(checked) {
if (this.$refs['table-header-primary'] && this.$refs['table-header-primary'].$refs.checkbox) {
this.$refs['table-header-primary'].$refs.checkbox.checked = checked;
}
},
toggleSelectAll: function toggleSelectAll() {
var _this7 = this;

if (this.allSelected) {
if (this.allSelected || !this.selectAllChecked()) {
this.unselectAllInternal();
return;
}

var rows = this.selectAllByPage ? this.paginated : this.filteredRows;
rows.forEach(function (headerRow) {
headerRow.children.forEach(function (row) {
headerRow.children.filter(function (row) {
return !row.vgtDisabled;
}).forEach(function (row) {
_this7.$set(row, 'vgtSelected', true);
});
});
Expand Down Expand Up @@ -9306,6 +9318,7 @@ var script$6 = {
},
// checkbox click should always do the following
onCheckboxClicked: function onCheckboxClicked(row, index, event) {
if (row.vgtDisabled) return;
this.$set(row, 'vgtSelected', !row.vgtSelected);
this.$emit('on-row-click', {
row: row,
Expand Down
17 changes: 15 additions & 2 deletions dist/vue-good-table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3516,6 +3516,7 @@
"scope": "col"
}
}, [_c('input', {
ref: "checkbox",
attrs: {
"type": "checkbox"
},
Expand Down Expand Up @@ -9210,18 +9211,29 @@
});
});
this.emitSelectedRows();
this.setSelectAllChecked(false);
},
selectAllChecked: function selectAllChecked() {
return this.$refs['table-header-primary'].$refs.checkbox.checked;
},
setSelectAllChecked: function setSelectAllChecked(checked) {
if (this.$refs['table-header-primary'] && this.$refs['table-header-primary'].$refs.checkbox) {
this.$refs['table-header-primary'].$refs.checkbox.checked = checked;
}
},
toggleSelectAll: function toggleSelectAll() {
var _this7 = this;

if (this.allSelected) {
if (this.allSelected || !this.selectAllChecked()) {
this.unselectAllInternal();
return;
}

var rows = this.selectAllByPage ? this.paginated : this.filteredRows;
rows.forEach(function (headerRow) {
headerRow.children.forEach(function (row) {
headerRow.children.filter(function (row) {
return !row.vgtDisabled;
}).forEach(function (row) {
_this7.$set(row, 'vgtSelected', true);
});
});
Expand Down Expand Up @@ -9312,6 +9324,7 @@
},
// checkbox click should always do the following
onCheckboxClicked: function onCheckboxClicked(row, index, event) {
if (row.vgtDisabled) return;
this.$set(row, 'vgtSelected', !row.vgtSelected);
this.$emit('on-row-click', {
row: row,
Expand Down
4 changes: 2 additions & 2 deletions dist/vue-good-table.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vue-good-table.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 14 additions & 2 deletions src/components/Table.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1064,16 +1064,27 @@ export default {
});
});
this.emitSelectedRows();
this.setSelectAllChecked(false);
},

selectAllChecked(){
return this.$refs['table-header-primary'].$refs.checkbox.checked
},

setSelectAllChecked(checked){
if( this.$refs['table-header-primary'] && this.$refs['table-header-primary'].$refs.checkbox ){
this.$refs['table-header-primary'].$refs.checkbox.checked = checked
}
},

toggleSelectAll() {
if (this.allSelected) {
if (this.allSelected || !this.selectAllChecked()) {
this.unselectAllInternal();
return;
}
const rows = this.selectAllByPage ? this.paginated : this.filteredRows;
rows.forEach((headerRow) => {
headerRow.children.forEach((row) => {
headerRow.children.filter( (row) => !row.vgtDisabled ).forEach((row) => {
this.$set(row, 'vgtSelected', true);
});
});
Expand Down Expand Up @@ -1159,6 +1170,7 @@ export default {

// checkbox click should always do the following
onCheckboxClicked(row, index, event) {
if( row.vgtDisabled ) return;
this.$set(row, 'vgtSelected', !row.vgtSelected);
this.$emit('on-row-click', {
row,
Expand Down
1 change: 1 addition & 0 deletions src/components/VgtTableHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<th scope="col" v-if="selectable" class="vgt-checkbox-col">
<input
type="checkbox"
ref="checkbox"
:checked="allSelected"
:indeterminate.prop="allSelectedIndeterminate"
@change="toggleSelectAll" />
Expand Down