From e4d04ebcea6a28e18d1344addd371993da099831 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Wed, 12 May 2021 14:45:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?KERNEL-7775=20refactor:=20=E6=A0=91?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8populate=E4=B8=8D=E9=9C=80=E8=A6=81=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0searcher?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.md                                  | 3 +++
 src/widget/multiselecttree/multiselecttree.js | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 5373793127..7ed2f1f39c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,7 @@
 # 更新日志
+2.0(2021-05)
+- 解决了树列表populate调用两次itemsCreator的问题
+
 2.0(2021-03)
 - 优化left_right_vertical_adapt布局，去掉float属性只使用flex
 - inline布局支持用calc计算fill列宽度
diff --git a/src/widget/multiselecttree/multiselecttree.js b/src/widget/multiselecttree/multiselecttree.js
index 8654996c05..d48d562bf4 100644
--- a/src/widget/multiselecttree/multiselecttree.js
+++ b/src/widget/multiselecttree/multiselecttree.js
@@ -164,7 +164,6 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
     },
 
     populate: function () {
-        this.searcher.populate();
         this.adapter.populate();
     }
 });

From d190461a01592e62a7703ac015799216d1fb8a7c Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Wed, 12 May 2021 15:49:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?BI-86802=20=E6=96=87=E6=9C=AC=E5=9F=9F?=
 =?UTF-8?q?=E5=85=89=E6=A0=87=E5=9C=A8=E6=B0=B4=E5=8D=B0=E5=A4=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E4=B8=8D=E6=98=AF=E8=BE=93=E5=85=A5=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/base/single/editor/editor.textarea.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/less/base/single/editor/editor.textarea.less b/src/less/base/single/editor/editor.textarea.less
index a95850abb0..bac545aacd 100644
--- a/src/less/base/single/editor/editor.textarea.less
+++ b/src/less/base/single/editor/editor.textarea.less
@@ -10,6 +10,8 @@
     & {
       border: none;
     }
+    // BI-86802 div构造的水印移上去没有输入状态的光标,让编辑框层级比水印高一点
+    z-index: 1;
   }
   & .textarea-watermark{
     max-height: 100%;

From c8b456966abb8aacc581470f00531a20961bba35 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Wed, 12 May 2021 16:31:03 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=A3=B0=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 typescript/core/widget.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/typescript/core/widget.ts b/typescript/core/widget.ts
index d642150996..4c360b4003 100644
--- a/typescript/core/widget.ts
+++ b/typescript/core/widget.ts
@@ -380,6 +380,11 @@ export interface _Widget extends _OB {
      */
     empty(): void;
 
+    /**
+     * 刷新控件
+     */
+    reset(): void;
+
     /**
      * 内部destory方法
      */
@@ -787,6 +792,11 @@ export declare class Widget extends OB {
      */
     empty(): void;
 
+    /**
+     * 刷新控件
+     */
+    reset(): void;
+
     /**
      * 内部destory方法
      */