Browse Source

Merging in latest from upstream (VISUAL/fineui:refs/heads/master)

* commit '4c2272fba765ab7d0ae7199cfbe6d52faa2e3f96':
  无JIRA任务 默认值区分
es6
alan 5 years ago
parent
commit
f10ff534c4
  1. 15
      src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js

15
src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js

@ -25,10 +25,16 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
ref: function () {
self.editor = this;
},
text: this._digest(o.value, o.items),
text: this._getText(),
value: o.value,
height: o.height,
tipText: ""
tipText: "",
listeners: [{
eventName: BI.Events.MOUNT,
action: function () {
self.editor.setState(self._digest(o.value, o.items));
}
}]
},
popup: {
type: "bi.search_text_value_combo_popup",
@ -63,6 +69,11 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
this.editor.setState(v);
},
_getText: function () {
var o = this.options;
return (BI.isKey(o.value) && o.text === this._digest(o.value, o.items)) ? "" : o.text;
},
_digest: function(vals, items){
var o = this.options;
vals = BI.isArray(vals) ? vals : [vals];

Loading…
Cancel
Save