From b88df2cebec3c3e9b8fb4eafc7047479b9233dae Mon Sep 17 00:00:00 2001
From: "Jimmy.Chai" <Jimmy.Chai@fanruan.com>
Date: Fri, 30 Aug 2024 15:05:34 +0800
Subject: [PATCH] =?UTF-8?q?BI-154149=20fix:=20=E6=97=A0=E6=B3=95=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fineui/src/widget/multiselect/multiselect.insert.combo.js | 4 ++++
 .../src/widget/multiselect/trigger/switcher.checkselected.js  | 2 ++
 packages/fineui/src/widget/multitree/multi.tree.combo.js      | 4 ++++
 .../typescript/widget/multiselect/multiselect.insert.combo.ts | 1 +
 .../fineui/typescript/widget/multitree/multi.tree.combo.ts    | 1 +
 5 files changed, 12 insertions(+)

diff --git a/packages/fineui/src/widget/multiselect/multiselect.insert.combo.js b/packages/fineui/src/widget/multiselect/multiselect.insert.combo.js
index 4cf2d8dfd..18a9d76fc 100644
--- a/packages/fineui/src/widget/multiselect/multiselect.insert.combo.js
+++ b/packages/fineui/src/widget/multiselect/multiselect.insert.combo.js
@@ -56,6 +56,7 @@ export class MultiSelectInsertCombo extends Single {
     static EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";
     static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
     static EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW = "EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW";
+    static EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW = "EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW";
 
     _defaultConfig() {
         return extend(super._defaultConfig(...arguments), {
@@ -313,6 +314,9 @@ export class MultiSelectInsertCombo extends Single {
             this.updateSelectedValue(self.storeValue);
             self.fireEvent(MultiSelectInsertCombo.EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW);
         });
+        this.numberCounter.on(MultiSelectCheckSelectedSwitcher.EVENT_AFTER_POPUPVIEW, function() {
+            self.fireEvent(MultiSelectInsertCombo.EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW);
+        });
 
         this.numberCounter.on(Events.VIEW, b => {
             nextTick(() => {
diff --git a/packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js b/packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js
index c4773e549..985e241f3 100644
--- a/packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js
+++ b/packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js
@@ -9,6 +9,7 @@ export class MultiSelectCheckSelectedSwitcher extends Widget {
 
     static EVENT_TRIGGER_CHANGE = "EVENT_TRIGGER_CHANGE";
     static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
+    static EVENT_AFTER_POPUPVIEW = "EVENT_AFTER_POPUPVIEW";
     static EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";
 
     _defaultConfig() {
@@ -72,6 +73,7 @@ export class MultiSelectCheckSelectedSwitcher extends Widget {
             const me = this;
             nextTick(() => {
                 me._populate();
+                self.fireEvent(MultiSelectCheckSelectedSwitcher.EVENT_AFTER_POPUPVIEW);
             });
         });
     }
diff --git a/packages/fineui/src/widget/multitree/multi.tree.combo.js b/packages/fineui/src/widget/multitree/multi.tree.combo.js
index 8edab4f41..f8443a0cf 100644
--- a/packages/fineui/src/widget/multitree/multi.tree.combo.js
+++ b/packages/fineui/src/widget/multitree/multi.tree.combo.js
@@ -35,6 +35,7 @@ export class MultiTreeCombo extends Single {
     static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
     static EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";
     static EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW = "EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW";
+    static EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW = "EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW";
 
     _defaultConfig() {
         return extend(super._defaultConfig(...arguments), {
@@ -335,6 +336,9 @@ export class MultiTreeCombo extends Single {
                 this.fireEvent(MultiTreeCombo.EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW);
             }
         );
+        this.numberCounter.on(MultiSelectCheckSelectedSwitcher.EVENT_AFTER_POPUPVIEW, function() {
+            self.fireEvent(MultiTreeCombo.EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW);
+        });
 
         this.numberCounter.on(Events.VIEW, b => {
             nextTick(() => {
diff --git a/packages/fineui/typescript/widget/multiselect/multiselect.insert.combo.ts b/packages/fineui/typescript/widget/multiselect/multiselect.insert.combo.ts
index 6aef0a5c5..6c675b48b 100644
--- a/packages/fineui/typescript/widget/multiselect/multiselect.insert.combo.ts
+++ b/packages/fineui/typescript/widget/multiselect/multiselect.insert.combo.ts
@@ -16,6 +16,7 @@ export declare class MultiSelectInsertCombo extends Single {
     static EVENT_AFTER_HIDEVIEW: string;
     static EVENT_BEFORE_POPUPVIEW: string;
     static EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW: string;
+    static EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW: string;
 
     props: {
         itemsCreator?: Function;
diff --git a/packages/fineui/typescript/widget/multitree/multi.tree.combo.ts b/packages/fineui/typescript/widget/multitree/multi.tree.combo.ts
index 944397695..010f961f9 100644
--- a/packages/fineui/typescript/widget/multitree/multi.tree.combo.ts
+++ b/packages/fineui/typescript/widget/multitree/multi.tree.combo.ts
@@ -13,6 +13,7 @@ export declare class MultiTreeCombo extends Single {
     static EVENT_CONFIRM: string;
     static EVENT_BEFORE_POPUPVIEW: string;
     static EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW: string;
+    static EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW: string;
 
     props: {
         popup?: any;