diff --git a/changelog.md b/changelog.md index f23110bbc..6ec4a48f8 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,6 @@ # 更新日志 2.0(2020-08) +- search_text_value_combo支持水印 - BI.makeObject 方法支持传入iteratee 2.0(2020-07) diff --git a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js index 2875425df..4929a2f7f 100644 --- a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js +++ b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js @@ -31,6 +31,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, { el: { type: "bi.search_text_value_trigger", cls: "search-text-value-trigger", + watermark: o.watermark, ref: function () { self.trigger = this; }, diff --git a/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js index e5b75d153..ff62ef243 100644 --- a/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js +++ b/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js @@ -3,9 +3,12 @@ */ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { - props: { - extraCls: "bi-search-text-value-trigger bi-border", - height: 24 + props: function () { + return { + extraCls: "bi-search-text-value-trigger bi-border", + height: 24, + watermark: BI.i18nText("BI-Basic_Search") + }; }, render: function () { @@ -25,6 +28,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, + watermark: o.watermark, defaultText: o.text, text: this._digest(o.value, o.items), value: o.value,