Skip to content

Commit 26e00ba

Browse files
author
minjk-bl
committed
Bind > on / left, right operation update
1 parent 9faaf4d commit 26e00ba

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

src/common/vpBind.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,16 @@ define([
116116

117117
$(this._wrapSelector('#vp_bdHow')).val(merge.how);
118118
this._loadSelectorInput(this._wrapSelector('#vp_bdOn'), merge.on);
119-
if (on && on.length > 0) {
119+
if (merge.on && merge.on.length > 0) {
120120
$(this._wrapSelector('#vp_bdLeftOnSelect')).attr('disabled', true);
121121
$(this._wrapSelector('#vp_bdRightOnSelect')).attr('disabled', true);
122+
$(this._wrapSelector('#vp_bdLeftIndex')).attr('disabled', true);
123+
$(this._wrapSelector('#vp_bdRightIndex')).attr('disabled', true);
122124
}
123125
this._loadSelectorInput(this._wrapSelector('#vp_bdLeftOn'), merge.left.on);
124126
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) {
126129
$(this._wrapSelector('#vp_bdOnSelect')).attr('disabled', true);
127130
}
128131

@@ -666,9 +669,13 @@ define([
666669
if (colList && colList.length > 0) {
667670
$(that._wrapSelector('#vp_bdLeftOnSelect')).attr('disabled', true);
668671
$(that._wrapSelector('#vp_bdRightOnSelect')).attr('disabled', true);
672+
$(that._wrapSelector('#vp_bdLeftIndex')).attr('disabled', true);
673+
$(that._wrapSelector('#vp_bdRightIndex')).attr('disabled', true);
669674
} else {
670675
$(that._wrapSelector('#vp_bdLeftOnSelect')).attr('disabled', false);
671676
$(that._wrapSelector('#vp_bdRightOnSelect')).attr('disabled', false);
677+
$(that._wrapSelector('#vp_bdLeftIndex')).attr('disabled', false);
678+
$(that._wrapSelector('#vp_bdRightIndex')).attr('disabled', false);
672679
}
673680
});
674681

0 commit comments

Comments
 (0)