@@ -63,14 +63,14 @@ class CellColumnRowModel extends CellRowModel {
6363 * @param {Object } data
6464 */
6565 onCellClick ( data ) {
66- let me = this ,
67- id = data . data . currentTarget ,
68- columnNodeIds , index , tbodyNode ;
66+ let me = this ,
67+ { headerToolbar} = me . view . parent ,
68+ id = data . data . currentTarget ,
69+ columnNodeIds , index ;
6970
7071 if ( id ) {
71- index = ColumnModel . getColumnIndex ( id , me . view . items [ 0 ] . items ) ;
72- tbodyNode = VDomUtil . find ( me . view . vdom , { tag : 'tbody' } ) . vdom ;
73- columnNodeIds = VDomUtil . getColumnNodesIds ( tbodyNode , index ) ;
72+ index = ColumnModel . getColumnIndex ( id , headerToolbar . items ) ;
73+ columnNodeIds = VDomUtil . getColumnNodesIds ( me . view . vdom , index ) ;
7474
7575 me . deselectAllCells ( true ) ;
7676 me . select ( columnNodeIds , me . selectedColumnCellIds , me . selectedColumnCellCls )
@@ -88,7 +88,7 @@ class CellColumnRowModel extends CellRowModel {
8888 idArray = ColumnModel . getCellId ( data . path ) . split ( '__' ) ,
8989 currentColumn = idArray [ 2 ] ,
9090 { view} = me ,
91- dataFields = view . columns . map ( c => c . dataField ) ,
91+ dataFields = view . parent . columns . map ( c => c . dataField ) ,
9292 newIndex = ( dataFields . indexOf ( currentColumn ) + step ) % dataFields . length ,
9393 columnNodeIds , tbodyNode ;
9494
0 commit comments