From 54a51dcfd729221d59c6d23f288f2a77b297055e Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Sat, 18 Sep 2021 16:14:11 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-59719=20fix=E5=8A=A0=E4=B8=AA=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/datapane/connect/ItemEditableComboBoxPanel.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ItemEditableComboBoxPanel.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ItemEditableComboBoxPanel.java
index 2205a4f56..d0738e57b 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ItemEditableComboBoxPanel.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ItemEditableComboBoxPanel.java
@@ -121,9 +121,12 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 					while(itemIt.hasNext()) {
 						model.addElement(itemIt.next());
 					}
-					// 重置下拉框高度 值一样时不会生效 所以先加再减下
-					itemComboBox.setMaximumRowCount(itemComboBox.getMaximumRowCount() + 1);
-					itemComboBox.setMaximumRowCount(itemComboBox.getMaximumRowCount() - 1);
+					// 如果加载成功 但是下拉框是可见的 下拉框高度是会固定为原始高度 不会因为填充了更多下拉项而变化
+					// 需要重新设置下拉框高度 但值一样时相关事件不会生效 所以先加再减下
+					if (itemComboBox.isPopupVisible()) {
+						itemComboBox.setMaximumRowCount(itemComboBox.getMaximumRowCount() + 1);
+						itemComboBox.setMaximumRowCount(itemComboBox.getMaximumRowCount() - 1);
+					}
 				} catch (Exception e) {
 					if (!(e instanceof CancellationException)) {
 						FineLoggerFactory.getLogger().error(e.getMessage(), e);