Merge branch '2.0' of https://github.com/iview/iview into 2.0

This commit is contained in:
梁灏 2017-07-10 13:30:03 +08:00
commit e129a2508c
2 changed files with 13 additions and 4 deletions

View file

@ -404,9 +404,7 @@
this.objData[_index]._isChecked = status;
const selection = this.getSelection();
if (status) {
this.$emit('on-select', selection, JSON.parse(JSON.stringify(this.data[_index])));
}
this.$emit(status ? 'on-select' : 'on-select-cancel', selection, JSON.parse(JSON.stringify(this.data[_index])));
this.$emit('on-selection-change', selection);
},
toggleExpand (_index) {