From 8728284e923a206e6860181687c089712bf5289f Mon Sep 17 00:00:00 2001
From: iapyang <yklorse@gmail.com>
Date: Mon, 28 Dec 2020 11:08:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-46068=20fix:=20=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A0=91=E5=B1=95=E5=BC=80=E5=89=8D=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E9=87=8D=E6=96=B0=E8=AE=A1=E7=AE=97=E7=9A=84=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E5=90=8E=E7=9A=84=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../treevaluechooser/abstract.treevaluechooser.js          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/component/treevaluechooser/abstract.treevaluechooser.js b/src/component/treevaluechooser/abstract.treevaluechooser.js
index fb5ec83061..c03e9ee3d8 100644
--- a/src/component/treevaluechooser/abstract.treevaluechooser.js
+++ b/src/component/treevaluechooser/abstract.treevaluechooser.js
@@ -40,7 +40,12 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                 call();
             });
         } else {
-            call();
+            // 同步状态下，重新计算合并selectedValues
+            self._reqAdjustTreeNode(options, function (joinedValue) {
+                options.selectedValues = joinedValue;
+
+                call();
+            });
         }
 
         function call() {

From 4e7b82f2c3a99a375ea15e093cc0cc99c41f9aac Mon Sep 17 00:00:00 2001
From: iapyang <yklorse@gmail.com>
Date: Mon, 28 Dec 2020 11:29:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=E4=B8=80=E4=B8=8B?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../treevaluechooser/abstract.treevaluechooser.js      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/component/treevaluechooser/abstract.treevaluechooser.js b/src/component/treevaluechooser/abstract.treevaluechooser.js
index c03e9ee3d8..223538caff 100644
--- a/src/component/treevaluechooser/abstract.treevaluechooser.js
+++ b/src/component/treevaluechooser/abstract.treevaluechooser.js
@@ -37,10 +37,14 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
         if (!this.items) {
             o.itemsCreator({}, function (items) {
                 self._initData(items);
-                call();
+                join();
             });
         } else {
-            // 同步状态下，重新计算合并selectedValues
+            join();
+        }
+
+        // 重新计算合并selectedValues
+        function join() {
             self._reqAdjustTreeNode(options, function (joinedValue) {
                 options.selectedValues = joinedValue;
 
@@ -763,7 +767,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
 
             return true;
         });
-        
+
         return findParentNode;
     },