File tree Expand file tree Collapse file tree 2 files changed +11
-9
lines changed Expand file tree Collapse file tree 2 files changed +11
-9
lines changed Original file line number Diff line number Diff line change @@ -941,17 +941,17 @@ class BootstrapTable extends Component {
941941 }
942942
943943 deleteRow ( dropRowKeys ) {
944- const { onDeleteRow } = this . props . options ;
944+ const dropRow = this . store . getRowByKey ( dropRowKeys ) ;
945+ const { onDeleteRow, afterDeleteRow } = this . props . options ;
946+
945947 if ( onDeleteRow ) {
946- onDeleteRow ( dropRowKeys ) ;
948+ onDeleteRow ( dropRowKeys , dropRow ) ;
947949 }
948950
949951 this . store . setSelectedRowKey ( [ ] ) ; // clear selected row key
950952
951- if ( this . allowRemote ( Const . REMOTE_DROP_ROW ) ) {
952- if ( this . props . options . afterDeleteRow ) {
953- this . props . options . afterDeleteRow ( dropRowKeys ) ;
954- }
953+ if ( this . allowRemote ( Const . REMOTE_DROP_ROW ) && afterDeleteRow ) {
954+ afterDeleteRow ( dropRowKeys , dropRow ) ;
955955 return ;
956956 }
957957
@@ -981,8 +981,8 @@ class BootstrapTable extends Component {
981981 } ;
982982 } ) ;
983983 }
984- if ( this . props . options . afterDeleteRow ) {
985- this . props . options . afterDeleteRow ( dropRowKeys ) ;
984+ if ( afterDeleteRow ) {
985+ afterDeleteRow ( dropRowKeys , dropRow ) ;
986986 }
987987 }
988988
Original file line number Diff line number Diff line change @@ -130,9 +130,11 @@ export class TableDataStore {
130130 // if (result.length !== 0) return result[0];
131131 // });
132132 const result = [ ] ;
133+ if ( ! keys || keys . length === 0 ) {
134+ return result ;
135+ }
133136 for ( let i = 0 ; i < this . data . length ; i ++ ) {
134137 const d = this . data [ i ] ;
135- if ( ! keys || keys . length === 0 ) break ;
136138 if ( keys . indexOf ( d [ this . keyField ] ) > - 1 ) {
137139 keys = keys . filter ( k => k !== d [ this . keyField ] ) ;
138140 result . push ( d ) ;
You can’t perform that action at this time.
0 commit comments