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