From 479c53da141f84c6016fe41b8b4c1f52bdd64520 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Mon, 31 Oct 2022 11:48:38 +0800
Subject: [PATCH] =?UTF-8?q?BI-115201=20fix:=20=E3=80=906.0.3.3=E3=80=91?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A0=91=E4=B8=8B=E6=8B=89=E5=90=8E=E4=B8=8D?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BB=BB=E4=BD=95=E5=86=85=E5=AE=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=A4=9A=E5=8F=91=E4=B8=80=E4=B8=AAdata?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/multitree/multi.tree.list.combo.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/widget/multitree/multi.tree.list.combo.js b/src/widget/multitree/multi.tree.list.combo.js
index 9b82b8780..a3a016179 100644
--- a/src/widget/multitree/multi.tree.list.combo.js
+++ b/src/widget/multitree/multi.tree.list.combo.js
@@ -59,6 +59,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
                             self.combo.setValue(self.storeValue);
                             self.numberCounter.setValue(self.storeValue);
                             self._stopEditing();
+                            self._dataChange = true;
                         }
                     }]
                 }
@@ -116,6 +117,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
                         self.numberCounter.setButtonChecked(val);
                         self.storeValue = { value: self.combo.getValue() };
                         self.fireEvent(BI.MultiTreeListCombo.EVENT_CLICK_ITEM, self.getValue());
+                        self._dataChange = true;
                     }
                 }, {
                     eventName: BI.MultiTreePopup.EVENT_CLICK_CONFIRM,
@@ -126,6 +128,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
                     eventName: BI.MultiTreePopup.EVENT_CLICK_CLEAR,
                     action: function () {
                         clear = true;
+                        self._dataChange = true;
                         self.setValue();
                         self._defaultState();
                     }
@@ -209,12 +212,16 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
             this.getSearcher().setState(checked ? BI.Selection.Multi : BI.Selection.None);
             self.numberCounter.setButtonChecked(val);
             self.fireEvent(BI.MultiTreeListCombo.EVENT_CLICK_ITEM, self.combo.getValue());
+            self._dataChange = true;
         });
 
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
             if (isSearching()) {
                 return;
             }
+            if (!this.isViewVisible()) {
+                self._dataChange = false; // 标记数据是否发生变化
+            }
             if (change === true) {
                 self.storeValue = { value: self.combo.getValue() };
                 change = false;
@@ -227,7 +234,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
         this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
             if (isSearching()) {
                 self.trigger.stopEditing();
-                self.fireEvent(BI.MultiTreeListCombo.EVENT_CONFIRM);
+                self._dataChange && self.fireEvent(BI.MultiTreeListCombo.EVENT_CONFIRM);
             } else {
                 if (isPopupView()) {
                     self._stopEditing();
@@ -235,7 +242,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
                     if (clear === true) {
                         self.storeValue = { value: [] };
                     }
-                    self.fireEvent(BI.MultiTreeListCombo.EVENT_CONFIRM);
+                    self._dataChange && self.fireEvent(BI.MultiTreeListCombo.EVENT_CONFIRM);
                 }
             }
             clear = false;