|
@@ -235,6 +235,7 @@ export default {
|
|
|
const changeRowKeys = this.localDataSource.map(item => item[this.rowKeyName])
|
|
|
this.selectedRows = this.selectedRows.filter(item => !changeRowKeys.includes(item[this.rowKeyName]))
|
|
|
}
|
|
|
+ this.selectedRows = this.selectedRows.filter(item => !this.disableSelectedRowKeys.includes(item[this.rowKeyName]))
|
|
|
this.selectedRowKeys = selectedRowKeys
|
|
|
this.onRowSelection()
|
|
|
this.$emit('selectAllRowChange', { isSelected, selectedRowKeys })
|
|
@@ -242,13 +243,13 @@ export default {
|
|
|
// 触发已选项事件
|
|
|
onRowSelection () {
|
|
|
// console.log(this.selectedRows)
|
|
|
- const result = this.selectedRows.filter(item => !this.disableSelectedRowKeys.includes(item[this.rowKeyName]))
|
|
|
+ const result = this.selectedRows
|
|
|
const selectedRowKeys = result.map(item => item[this.rowKeyName])
|
|
|
this.$emit('rowSelection', { selectedRows: result, selectedRowKeys: selectedRowKeys })
|
|
|
},
|
|
|
// 页码改变的时候设置新页的已选项
|
|
|
setCheckedRows () {
|
|
|
- const list = this.selectedRows.filter(item => !this.disableSelectedRowKeys.includes(item[this.rowKeyName])).map(item => item[this.rowKeyName])
|
|
|
+ const list = this.selectedRows.map(item => item[this.rowKeyName])
|
|
|
this.selectedRowKeys = this.localDataSource.filter(item => list.includes(item[this.rowKeyName])).map(item => item[this.rowKeyName])
|
|
|
},
|
|
|
/**
|