Pull request #6991: REPORT-63729 填报-控件-控件数据字典设置显示值为公式时，公式界面关几次才关得掉

Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0

* commit 'f0e6bc120b0ab04a5f206ed7a827a676d5ba91be':
  REPORT-63729 填报-控件-控件数据字典设置显示值为公式时，公式界面关几次才关得掉

designer-base/src/main/java/com/fr/design/gui/ibutton/UIButtonGroup.java

@@ -389,9 +389,9 @@ public class UIButtonGroup<T> extends JPanel implements GlobalNameObserver, UIOb
      * @param l
      */
     public void addChangeListener(ChangeListener l) {
+        listenerList.add(ChangeListener.class, l);
         for (int i = 0; i < labelButtonList.size(); i++) {
             labelButtonList.get(i).addChangeListener(l);
-            listenerList.add(ChangeListener.class, l);
         }
     }
 
@@ -399,9 +399,9 @@ public class UIButtonGroup<T> extends JPanel implements GlobalNameObserver, UIOb
      * @param l
      */
     public void removeChangeListener(ChangeListener l) {
+        listenerList.remove(ChangeListener.class, l);
         for (int i = 0; i < labelButtonList.size(); i++) {
             labelButtonList.get(i).removeChangeListener(l);
-            listenerList.remove(ChangeListener.class, l);
         }
     }