From 9433d24ef23cba4fbec9a86bb014f58514b109c3 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Thu, 13 Aug 2020 11:12:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E5=8F=AF?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=9A=84=E5=8D=95=E9=80=89=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E6=94=AF=E6=8C=81=E6=B0=B4=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.md                                           |  1 +
 .../searchtextvaluecombo/combo.searchtextvalue.js      |  1 +
 .../searchtextvaluecombo/trigger.searchtextvalue.js    | 10 +++++++---
 3 files changed, 9 insertions(+), 3 deletions(-)

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,