Browse Source

Merge remote-tracking branch 'origin/master'

es6
guy 7 years ago
parent
commit
aa859cd7c7
  1. 7
      dist/bundle.js
  2. 7
      dist/widget.js
  3. 4
      src/widget/singleselect/singleselect.combo.js

7
dist/bundle.js vendored

@ -103569,7 +103569,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
BI.isKey(self._startValue) && (self.storeValue = self._startValue); BI.isKey(self._startValue) && (self.storeValue = self._startValue);
self.trigger.getSearcher().setState(self.storeValue); self.trigger.getSearcher().setState(self.storeValue);
}; };
this.storeValue = o.value || ""; this.storeValue = o.value;
// 标记正在请求数据 // 标记正在请求数据
this.requesting = false; this.requesting = false;
@ -103875,7 +103875,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
}, },
setValue: function (v) { setValue: function (v) {
this.storeValue = v || ""; this.storeValue = v;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
this.combo.setValue(this.storeValue); this.combo.setValue(this.storeValue);
}, },
@ -103897,7 +103897,8 @@ BI.extend(BI.SingleSelectCombo, {
BI.SingleSelectCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.SingleSelectCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.shortcut("bi.single_select_combo", BI.SingleSelectCombo);/** BI.shortcut("bi.single_select_combo", BI.SingleSelectCombo);
/**
* 选择列表 * 选择列表
* *
* Created by GUY on 2015/11/1. * Created by GUY on 2015/11/1.

7
dist/widget.js vendored

@ -16682,7 +16682,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
BI.isKey(self._startValue) && (self.storeValue = self._startValue); BI.isKey(self._startValue) && (self.storeValue = self._startValue);
self.trigger.getSearcher().setState(self.storeValue); self.trigger.getSearcher().setState(self.storeValue);
}; };
this.storeValue = o.value || ""; this.storeValue = o.value;
// 标记正在请求数据 // 标记正在请求数据
this.requesting = false; this.requesting = false;
@ -16988,7 +16988,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
}, },
setValue: function (v) { setValue: function (v) {
this.storeValue = v || ""; this.storeValue = v;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
this.combo.setValue(this.storeValue); this.combo.setValue(this.storeValue);
}, },
@ -17010,7 +17010,8 @@ BI.extend(BI.SingleSelectCombo, {
BI.SingleSelectCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.SingleSelectCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.shortcut("bi.single_select_combo", BI.SingleSelectCombo);/** BI.shortcut("bi.single_select_combo", BI.SingleSelectCombo);
/**
* 选择列表 * 选择列表
* *
* Created by GUY on 2015/11/1. * Created by GUY on 2015/11/1.

4
src/widget/singleselect/singleselect.combo.js

@ -22,7 +22,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
BI.isKey(self._startValue) && (self.storeValue = self._startValue); BI.isKey(self._startValue) && (self.storeValue = self._startValue);
self.trigger.getSearcher().setState(self.storeValue); self.trigger.getSearcher().setState(self.storeValue);
}; };
this.storeValue = o.value || ""; this.storeValue = o.value;
// 标记正在请求数据 // 标记正在请求数据
this.requesting = false; this.requesting = false;
@ -328,7 +328,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
}, },
setValue: function (v) { setValue: function (v) {
this.storeValue = v || ""; this.storeValue = v;
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
this.combo.setValue(this.storeValue); this.combo.setValue(this.storeValue);
}, },

Loading…
Cancel
Save