From f89ef8b13813f7ae6a85b388da368dde9c4f62d4 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 25 Sep 2020 15:45:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?BI-73804=20fix:=20=E5=85=A8=E9=80=89?= =?UTF-8?q?=E4=B8=8D=E4=BD=BF=E7=94=A8assist=E7=9B=B4=E6=8E=A5=E4=BB=8Eite?= =?UTF-8?q?ms=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/allvaluechooser/combo.allvaluechooser.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/component/allvaluechooser/combo.allvaluechooser.js b/src/component/allvaluechooser/combo.allvaluechooser.js index 8c170867af..803b04ac8d 100644 --- a/src/component/allvaluechooser/combo.allvaluechooser.js +++ b/src/component/allvaluechooser/combo.allvaluechooser.js @@ -53,10 +53,11 @@ BI.AllValueChooserCombo = BI.inherit(BI.AbstractAllValueChooser, { getValue: function () { var val = this.combo.getValue() || {}; - if (val.type === BI.Selection.All) { - return val.assist; + if (val.type === BI.Selection.Multi) { + return val.value || []; } - return val.value || []; + + return BI.difference(BI.map(this.items, "value"), val.value || []); }, populate: function (items) { From 6596dfbee6cd4bc0205ef49e92256f4a9fd70d60 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 25 Sep 2020 15:58:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=B9=E6=8D=AEcomment=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/allvaluechooser/combo.allvaluechooser.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/component/allvaluechooser/combo.allvaluechooser.js b/src/component/allvaluechooser/combo.allvaluechooser.js index 803b04ac8d..ac0f03b11b 100644 --- a/src/component/allvaluechooser/combo.allvaluechooser.js +++ b/src/component/allvaluechooser/combo.allvaluechooser.js @@ -52,6 +52,10 @@ BI.AllValueChooserCombo = BI.inherit(BI.AbstractAllValueChooser, { }, getValue: function () { + return this.getAllValue(); + }, + + getAllValue: function () { var val = this.combo.getValue() || {}; if (val.type === BI.Selection.Multi) { return val.value || []; From 62ec81335e015429ebdfdf14167c1bb21ebaa07b Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 25 Sep 2020 16:02:41 +0800 Subject: [PATCH 3/3] update --- src/component/treevaluechooser/pane.treevaluechooser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/treevaluechooser/pane.treevaluechooser.js b/src/component/treevaluechooser/pane.treevaluechooser.js index 39a81d0c4f..1d961a517a 100644 --- a/src/component/treevaluechooser/pane.treevaluechooser.js +++ b/src/component/treevaluechooser/pane.treevaluechooser.js @@ -46,7 +46,7 @@ BI.TreeValueChooserPane = BI.inherit(BI.AbstractTreeValueChooser, { }, getAllValue: function() { - return this.buildCompleteTree(this.combo.getValue()); + return this.buildCompleteTree(this.pane.getValue()); }, populate: function (items) {