From cf19dcee7aa4313d30847a05ccb40720f398ea20 Mon Sep 17 00:00:00 2001
From: lucian <author@corpmail.com>
Date: Mon, 18 Apr 2022 13:39:38 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-68949=20=E6=8E=A7=E4=BB=B6-=E9=A2=84?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=8E=A7=E4=BB=B6-=E9=A2=84=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=8E=A7=E4=BB=B6=E6=96=B0=E5=BB=BA=E5=90=8E=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E5=88=97=E8=A1=A8=E4=B8=AD=E6=B2=A1=E6=9C=89=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/widget/WidgetPane.java | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java b/designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java
index 6bbc84ad3..1777237f9 100644
--- a/designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java
+++ b/designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java
@@ -20,6 +20,7 @@ import com.fr.form.ui.*;
 import com.fr.general.ComparatorUtils;
 
 import com.fr.stable.ArrayUtils;
+import com.fr.stable.AssistUtils;
 
 import javax.swing.*;
 import javax.swing.event.PopupMenuEvent;
@@ -274,9 +275,12 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener
                 @Override
                 public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
                     // 下拉刷新下列表
-                    Object selectedItem = getSelectedItem();
-                    setModel(new DefaultComboBoxModel(getWidgetsName(userDefined)));
-                    setSelectedItem(selectedItem);
+                    Vector<Item> widgetsName = getWidgetsName(userDefined);
+                    if (modelChanged(widgetsName)) {
+                        Object selectedItem = getSelectedItem();
+                        setModel(new DefaultComboBoxModel<>(widgetsName));
+                        setSelectedItem(selectedItem);
+                    }
                 }
 
                 @Override
@@ -290,6 +294,20 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener
                 }
             });
         }
+
+        private boolean modelChanged(Vector<Item> widgetsName) {
+            DefaultComboBoxModel model = (DefaultComboBoxModel) getModel();
+            int modelSize = model.getSize();
+            if (modelSize != widgetsName.size()) {
+                return true;
+            }
+            for (int i = 0; i < modelSize; i++) {
+                if (!AssistUtils.equals(model.getElementAt(i), widgetsName.elementAt(i))) {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 
     /**