From 12d9ac56aa79e4ff617232a29677ec38fea874f6 Mon Sep 17 00:00:00 2001
From: "Oliver.Ke" <Oliver.Ke@fanruan.com>
Date: Thu, 20 Jul 2023 17:36:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/fineui/typescript/case/button/icon/icon.change.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/fineui/typescript/case/button/icon/icon.change.ts b/packages/fineui/typescript/case/button/icon/icon.change.ts
index 717273487..3220bb65f 100644
--- a/packages/fineui/typescript/case/button/icon/icon.change.ts
+++ b/packages/fineui/typescript/case/button/icon/icon.change.ts
@@ -6,7 +6,7 @@ export declare class IconChangeButton extends Single {
     static EVENT_CHANGE: string;
 
     props: {
-        iconCls: string;
+        iconCls: string | (() => string);
     } & IconButton['props']
 
     isSelected(): boolean;

From e1e27267ef0a046d9f4b80503ab5c32606eb0e82 Mon Sep 17 00:00:00 2001
From: chenzeyu <you@qq.com>
Date: Fri, 21 Jul 2023 10:41:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?BI-129653=20fix=20:=20=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9bubble=E6=8F=90=E7=A4=BA=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=92=E7=9B=B8=E9=81=AE=E6=8C=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/fineui/src/base/single/button/button.basic.js     | 1 +
 packages/fineui/src/case/combo/bubblecombo/combo.bubble.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/fineui/src/base/single/button/button.basic.js b/packages/fineui/src/base/single/button/button.basic.js
index 37dfb403a..825b0bf91 100644
--- a/packages/fineui/src/base/single/button/button.basic.js
+++ b/packages/fineui/src/base/single/button/button.basic.js
@@ -193,6 +193,7 @@ export class BasicButton extends Single {
                                     trigger: "",
                                     // bubble的提示不需要一直存在在界面上
                                     destroyWhenHide: true,
+                                    hideWhenAnotherComboOpen: true,
                                     ref: _ref => {
                                         this.combo = _ref;
                                     },
diff --git a/packages/fineui/src/case/combo/bubblecombo/combo.bubble.js b/packages/fineui/src/case/combo/bubblecombo/combo.bubble.js
index df03267e4..c663f4c43 100644
--- a/packages/fineui/src/case/combo/bubblecombo/combo.bubble.js
+++ b/packages/fineui/src/case/combo/bubblecombo/combo.bubble.js
@@ -27,6 +27,7 @@ export class BubbleCombo extends Widget {
             destroyWhenHide: false,
             hideWhenClickOutside: true,
             hideWhenBlur: true,
+            hideWhenAnotherComboOpen: false,
             isNeedAdjustHeight: true, // 是否需要高度调整
             isNeedAdjustWidth: true,
             stopPropagation: false,