From 250cceb293c96d65061eea9bf5667dbb39a3142c Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Mon, 2 Dec 2019 16:59:45 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-24696=20fix:=20=E4=B8=8D=E5=BD=B1?=
 =?UTF-8?q?=E5=93=8D=E7=88=B6=E8=8A=82=E7=82=B9=E5=8B=BE=E9=80=89=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=9A=84=E5=A4=8D=E9=80=89=E6=A0=91=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=B0=B4=E5=8D=B0=E5=92=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.md                                             | 3 +++
 src/widget/multiselect/trigger/searcher.multiselect.js   | 1 +
 src/widget/multitree/trigger/searcher.list.multi.tree.js | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/changelog.md b/changelog.md
index c5e29ff74b..d73c1ae25c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,7 @@
 # 更新日志
+2.0(2019-12)
+- 不影响父节点勾选状态的复选树支持自定义水印和默认值
+
 2.0(2019-11)
 - 日期系列新增setMinDate和setMaxDate接口
 - 修复了同步复选树设置节点默认open后, 叶子节点无法选中的问题
diff --git a/src/widget/multiselect/trigger/searcher.multiselect.js b/src/widget/multiselect/trigger/searcher.multiselect.js
index e9d484b420..abac999993 100644
--- a/src/widget/multiselect/trigger/searcher.multiselect.js
+++ b/src/widget/multiselect/trigger/searcher.multiselect.js
@@ -26,6 +26,7 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, {
             type: "bi.multi_select_editor",
             height: o.height,
             text: o.text,
+            watermark: o.watermark,
             listeners: [{
                 eventName: BI.MultiSelectEditor.EVENT_FOCUS,
                 action: function () {
diff --git a/src/widget/multitree/trigger/searcher.list.multi.tree.js b/src/widget/multitree/trigger/searcher.list.multi.tree.js
index acfe1cf450..0985f9849e 100644
--- a/src/widget/multitree/trigger/searcher.list.multi.tree.js
+++ b/src/widget/multitree/trigger/searcher.list.multi.tree.js
@@ -26,6 +26,8 @@ BI.MultiListTreeSearcher = BI.inherit(BI.Widget, {
         this.editor = BI.createWidget({
             type: "bi.multi_select_editor",
             height: o.height,
+            text: o.text,
+            watermark: o.watermark,
             el: {
                 type: "bi.simple_state_editor",
                 height: o.height