Merge pull request #5940 in DESIGN/design from feature/10.0 to feature/big-screen

* commit 'ddc4716561b63712684a8315ff3d8e85e9b0e45b':
  REPORT-59719 fix加个判断
  REPORT-59719 下拉框效果还有点问题 fix
  REPORT-59719 下拉框效果还有点问题
  REPORT-59719 【10.0】点击数据源的刷新按钮，数据列表会变空白

designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java

@@ -87,12 +87,13 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
      * 刷新ComboBox.items
      */
     protected Iterator<String> items() {
-        nameList = new ArrayList<String>();
-
         ConnectionConfig mgr = ConnectionConfig.getInstance();
         Iterator<String> nameIt = mgr.getConnections().keySet().iterator();
 
         Collection<String> noAuthConnections = WorkContext.getCurrent().get(DBConnectAuth.class).getNoAuthConnections();
+
+        nameList = new ArrayList<>();
+
         if (noAuthConnections == null) {
             return nameList.iterator();
         }

designer-base/src/main/java/com/fr/design/data/datapane/connect/ItemEditableComboBoxPanel.java

@@ -91,6 +91,9 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 			refreshWorker.cancel(true);
 		}
 
+		// 记录原来选中的Item,重新加载后需要再次选中
+		Object lastSelectedItem = itemComboBox.getSelectedItem();
+
 		DefaultComboBoxModel model = ((DefaultComboBoxModel) itemComboBox.getModel());
 		model.removeAllElements();
 
@@ -98,6 +101,12 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 		model.addElement(EMPTY);
 		model.addElement(PENDING);
 
+		// 存在两种场景之前只考虑了填充场景 有populate会填充下 把这边的填充逻辑删了 所以没有问题
+		// 如果是纯通过刷新按钮 没有populate 需要手动设置下上次选中的内容
+		if (lastSelectedItem != null) {
+			model.setSelectedItem(lastSelectedItem);
+		}
+
 		refreshWorker = new SwingWorker<Iterator<String>, Void>() {
 			@Override
 			protected Iterator<String> doInBackground() throws Exception {
@@ -112,7 +121,12 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 					while(itemIt.hasNext()) {
 						model.addElement(itemIt.next());
 					}
-					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);