@@ -116,13 +116,16 @@ define([
116
116
117
117
$ ( this . _wrapSelector ( '#vp_bdHow' ) ) . val ( merge . how ) ;
118
118
this . _loadSelectorInput ( this . _wrapSelector ( '#vp_bdOn' ) , merge . on ) ;
119
- if ( on && on . length > 0 ) {
119
+ if ( merge . on && merge . on . length > 0 ) {
120
120
$ ( this . _wrapSelector ( '#vp_bdLeftOnSelect' ) ) . attr ( 'disabled' , true ) ;
121
121
$ ( this . _wrapSelector ( '#vp_bdRightOnSelect' ) ) . attr ( 'disabled' , true ) ;
122
+ $ ( this . _wrapSelector ( '#vp_bdLeftIndex' ) ) . attr ( 'disabled' , true ) ;
123
+ $ ( this . _wrapSelector ( '#vp_bdRightIndex' ) ) . attr ( 'disabled' , true ) ;
122
124
}
123
125
this . _loadSelectorInput ( this . _wrapSelector ( '#vp_bdLeftOn' ) , merge . left . on ) ;
124
126
this . _loadSelectorInput ( this . _wrapSelector ( '#vp_bdRightOn' ) , merge . right . on ) ;
125
- if ( merge . left . on . length > 0 || merge . right . on . length > 0 ) {
127
+ if ( merge . left . on . length > 0 || merge . right . on . length > 0
128
+ || merge . left . useIndex || merge . right . useIndex ) {
126
129
$ ( this . _wrapSelector ( '#vp_bdOnSelect' ) ) . attr ( 'disabled' , true ) ;
127
130
}
128
131
@@ -666,9 +669,13 @@ define([
666
669
if ( colList && colList . length > 0 ) {
667
670
$ ( that . _wrapSelector ( '#vp_bdLeftOnSelect' ) ) . attr ( 'disabled' , true ) ;
668
671
$ ( that . _wrapSelector ( '#vp_bdRightOnSelect' ) ) . attr ( 'disabled' , true ) ;
672
+ $ ( that . _wrapSelector ( '#vp_bdLeftIndex' ) ) . attr ( 'disabled' , true ) ;
673
+ $ ( that . _wrapSelector ( '#vp_bdRightIndex' ) ) . attr ( 'disabled' , true ) ;
669
674
} else {
670
675
$ ( that . _wrapSelector ( '#vp_bdLeftOnSelect' ) ) . attr ( 'disabled' , false ) ;
671
676
$ ( that . _wrapSelector ( '#vp_bdRightOnSelect' ) ) . attr ( 'disabled' , false ) ;
677
+ $ ( that . _wrapSelector ( '#vp_bdLeftIndex' ) ) . attr ( 'disabled' , false ) ;
678
+ $ ( that . _wrapSelector ( '#vp_bdRightIndex' ) ) . attr ( 'disabled' , false ) ;
672
679
}
673
680
} ) ;
674
681
0 commit comments