Pull request #1434: 无JIRA任务 可搜索的单选下拉框支持水印

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit '9433d24ef23cba4fbec9a86bb014f58514b109c3':
  无JIRA任务 可搜索的单选下拉框支持水印

changelog.md

@@ -1,5 +1,6 @@
 # 更新日志
 2.0(2020-08)
+- search_text_value_combo支持水印
 - BI.makeObject 方法支持传入iteratee
 
 2.0(2020-07)

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;
                         },

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

@@ -3,9 +3,12 @@
  */
 BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
 
-    props: {
+    props: function () {
-        extraCls: "bi-search-text-value-trigger bi-border",
+        return {
-        height: 24
+            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,