Merge pull request #16315 in DESIGN/design from bugfix/11.0 to feature/x

* commit '80bb3df20e2d18818ef848b0c56b83493e288a78':
  REPORT-147166 修改代码质量
  REPORT-147166 修改代码质量
  REPORT-147166 统信uos下切换条件属性后，卡片不能及时更新。
  REPORT-147166 统信uos下切换条件属性后，卡片不能及时更新。
  REPORT-147166 统信uos下切换条件属性后，卡片不能及时更新。

designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java

@@ -18,17 +18,21 @@ import javax.swing.JPanel;
 import java.awt.CardLayout;
 
 /**
- * Created by plough on 2018/8/13.
+ * 设计器控制部分的更新面板
+ *
+ * @author plough
+ * @version 11.0
+ * @since Created on 2018/8/13
  */
-class JControlUpdatePane extends JPanel {
+public class JControlUpdatePane extends JPanel {
     private ListControlPaneProvider listControlPane;
     private CardLayout card;
-    private JPanel cardPane;
+    protected JPanel cardPane;
     private BasicBeanPane[] updatePanes;
 
     private ListModelElement elEditing;
 
-    private JControlUpdatePane(ListControlPaneProvider listControlPane) {
+    protected JControlUpdatePane(ListControlPaneProvider listControlPane) {
         this.listControlPane = listControlPane;
         initUpdatePane();
     }

designer-base/src/main/java/com/fr/design/gui/controlpane/ListControlPaneHelper.java

@@ -145,6 +145,9 @@ class ListControlPaneHelper {
             ((UIControlPane.PopupEditDialog) popupEditDialog).setTitle(getSelectedName());
         }
         popupEditDialog.setVisible(true);
+
+        popupEditDialog.revalidate();
+        popupEditDialog.repaint();
         PopupDialogSaveAction osBasedAction = OSSupportCenter.getAction(PopupDialogSaveAction.class);
         osBasedAction.register(controlPane, popupEditDialog);
     }
@@ -184,7 +187,7 @@ class ListControlPaneHelper {
     /*
      * UINameEdList的鼠标事件
      */
-    protected MouseListener getListMouseListener(UINameEdList nameableList,  UIControlPane controlPane) {
+    protected MouseListener getListMouseListener(UINameEdList nameableList, UIControlPane controlPane) {
         return new MouseAdapter() {
             @Override
             public void mouseReleased(MouseEvent evt) {
@@ -251,5 +254,4 @@ class ListControlPaneHelper {
     }
 
 
-
 }

designer-realize/src/main/java/com/fr/design/present/ConditionAttributesGroupPane.java

@@ -22,6 +22,7 @@ import com.fr.report.core.SheetUtils;
 import com.fr.report.elementcase.TemplateElementCase;
 import com.fr.stable.Nameable;
 
+import javax.swing.JPanel;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -76,6 +77,11 @@ public class ConditionAttributesGroupPane extends UIListControlPane {
 		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Add_Condition");
 	}
 
+    @Override
+    protected JPanel createControlUpdatePane() {
+        return ConditionAttributesUpdatePane.newInstance(this);
+    }
+
 	public void populate(ElementCasePane ePane) {
 		this.ePane = ePane;
 		this.editSelection = ePane.getSelection();

designer-realize/src/main/java/com/fr/design/present/ConditionAttributesUpdatePane.java

@@ -0,0 +1,36 @@
+package com.fr.design.present;
+
+import com.fr.design.gui.controlpane.JControlUpdatePane;
+import com.fr.design.gui.controlpane.ListControlPaneProvider;
+
+
+/**
+ * 条件属性更新面板
+ *
+ * @author lidongy
+ * @version 11.0
+ * @since Created on 2025/1/23
+ */
+public class ConditionAttributesUpdatePane extends JControlUpdatePane {
+
+    protected ConditionAttributesUpdatePane(ListControlPaneProvider listControlPane) {
+        super(listControlPane);
+    }
+
+    /**
+     * 新建一个实例
+     * @param listControlPane 父面板
+     * @return 新面板实例
+     */
+    public static JControlUpdatePane newInstance(ListControlPaneProvider listControlPane) {
+        return new ConditionAttributesUpdatePane(listControlPane);
+    }
+
+    @Override
+    public void populate() {
+        super.populate();
+
+        cardPane.revalidate();
+        cardPane.repaint();
+    }
+}