From 23696b6dd0e28c0ada111a9b2b71739475a72460 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Tue, 24 Sep 2019 17:19:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20fix:=20ex?=
 =?UTF-8?q?panded[0]=E6=98=AFnode=E5=AF=B9=E8=B1=A1,=20=E6=AF=94=E8=BE=83?=
 =?UTF-8?q?=E5=8F=96value?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.md                                                | 1 +
 src/component/treevaluechooser/abstract.treevaluechooser.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index fc74c1c3c..035217856 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,6 @@
 # 更新日志
 2.0(2019-09)
+- 修复tree_value_chooser选中节点的唯一子节点后搜索该子节点，无法取消选中的问题
 - button的bubble创建的popup在收起的时候会destroy
 - 修复了dynamic_date_pane在切换静态时间和动态时间的时候不会发事件的问题
 
diff --git a/src/component/treevaluechooser/abstract.treevaluechooser.js b/src/component/treevaluechooser/abstract.treevaluechooser.js
index dbdedfcad..98c232b96 100644
--- a/src/component/treevaluechooser/abstract.treevaluechooser.js
+++ b/src/component/treevaluechooser/abstract.treevaluechooser.js
@@ -220,7 +220,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                         path.push(split);
                         childrenCount.push(expanded.length);
                         // 如果只有一个值且取消的就是这个值
-                        if (i === parents.length - 1 && expanded.length === 1 && expanded[0] === notSelectedValue) {
+                        if (i === parents.length - 1 && expanded.length === 1 && expanded[0].value === notSelectedValue) {
                             for (var j = childrenCount.length - 1; j >= 0; j--) {
                                 if (childrenCount[j] === 1) {
                                     self._deleteNode(selectedValues, path[j]);

From 44beeca589248d131a4e13d4c15b6deac5c4ae0f Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Tue, 24 Sep 2019 17:26:37 +0800
Subject: [PATCH 2/2] update

---
 src/case/colorchooser/colorchooser.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/case/colorchooser/colorchooser.js b/src/case/colorchooser/colorchooser.js
index 9414ab78d..b4ab6c9ec 100644
--- a/src/case/colorchooser/colorchooser.js
+++ b/src/case/colorchooser/colorchooser.js
@@ -10,7 +10,8 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.ColorChooser.superclass._defaultConfig.apply(this, arguments), {
             baseCls: "bi-color-chooser",
-            value: ""
+            value: "",
+            height: 24
         });
     },