Browse Source

Pull request #2081: 无JIRA任务 feat: BI.SearchTextValueCombo 的defaultText和text区分开

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit '152a297931c84913f677a8b37706cdbb0cb12ac3':
  无JIRA任务 feat: BI.SearchTextValueCombo 的defaultText和text区分开
es6
Dailer 3 years ago
parent
commit
7f2ea37069
  1. 2
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  2. 2
      src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js

2
src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

@ -7,6 +7,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
baseCls: "bi-search-text-value-combo", baseCls: "bi-search-text-value-combo",
height: 24, height: 24,
text: "", text: "",
defaultText: "",
items: [], items: [],
tipType: "", tipType: "",
warningTitle: "", warningTitle: "",
@ -36,6 +37,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
items: o.items, items: o.items,
height: o.height - 2, height: o.height - 2,
text: o.text, text: o.text,
defaultText: o.defaultText,
value: o.value, value: o.value,
tipType: o.tipType, tipType: o.tipType,
warningTitle: o.warningTitle, warningTitle: o.warningTitle,

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

@ -29,7 +29,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
self.editor = this; self.editor = this;
}, },
watermark: o.watermark, watermark: o.watermark,
defaultText: o.text, defaultText: o.defaultText,
text: this._digest(o.value, o.items), text: this._digest(o.value, o.items),
value: o.value, value: o.value,
height: o.height, height: o.height,

Loading…
Cancel
Save