drip-public/iview
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

修改_checked=true 时，在_disabled=true的时候被取消了选中的状态的问题

Browse source
This commit is contained in:
leonine 2017-02-23 16:51:43 +08:00
parent c731509853
commit cd85c67510
2 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/components/table/table-head.vue
View file

@ -84,23 +84,15 @@
}, },
isSelectAll () { isSelectAll () {
let isSelectAll = true; let isSelectAll = true;
let isAllDisabled = true;
if (!this.data.length) isSelectAll = false; if (!this.data.length) isSelectAll = false;
for (let i = 0; i < this.data.length; i++) { for (let i = 0; i < this.data.length; i++) {
if(this.objData[this.data[i]._index]._isDisabled){ if (!this.objData[this.data[i]._index]._isChecked && !this.objData[this.data[i]._index]._isDisabled) {
isAllDisabled = isAllDisabled && true;
continue;
}else{
isAllDisabled = isAllDisabled && false;
}
if (!this.objData[this.data[i]._index]._isChecked ) {
isSelectAll = false; isSelectAll = false;
break; break;
} }
} }
return isAllDisabled ? false : isSelectAll; return isSelectAll;
} }
}, },
methods: { methods: {

22
src/components/table/table.vue
View file

@ -391,15 +391,21 @@
this.$emit('on-selection-change', selection); this.$emit('on-selection-change', selection);
}, },
selectAll (status) { selectAll (status) {
this.rebuildData.forEach((data) => { // this.rebuildData.forEach((data) => {
// if(this.objData[data._index]._isDisabled){
// this.objData[data._index]._isChecked = false;
// }else{
// this.objData[data._index]._isChecked = status;
// }
// });
for(const data of this.rebuildData){
if(this.objData[data._index]._isDisabled){ if(this.objData[data._index]._isDisabled){
this.objData[data._index]._isChecked = false; continue;
}else{ }else{
this.objData[data._index]._isChecked = status; this.objData[data._index]._isChecked = status;
} }
}
});
const selection = this.getSelection(); const selection = this.getSelection();
if (status) { if (status) {
this.$emit('on-select-all', selection); this.$emit('on-select-all', selection);
@ -559,11 +565,7 @@
newRow._isDisabled = false; newRow._isDisabled = false;
} }
if (newRow._checked) { if (newRow._checked) {
if(newRow._isDisabled){ newRow._isChecked = newRow._checked;
newRow._isChecked = false;
}else{
newRow._isChecked = newRow._checked;
}
} else { } else {
newRow._isChecked = false; newRow._isChecked = false;
} }