Pull request #14922: REPORT-135453 fix:fbp回归问题修复

Merge in DESIGN/design from ~RICHARD.FANG/design:fbp/release to fbp/release

* commit '061483809f5a6298bd18df4d2904c478dd241796':
  REPORT-135453 fix:fbp回归问题修复

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

@@ -2,8 +2,8 @@ package com.fr.design.data.datapane.connect;
 
 import com.fine.theme.icon.LazyIcon;
 import com.fine.theme.utils.FineUIScale;
+import com.fine.theme.utils.FineUIStyle;
 import com.formdev.flatlaf.ui.FlatUIUtils;
-import com.fr.base.BaseUtils;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.i18n.Toolkit;
@@ -55,16 +55,16 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 		itemComboBox.setEnabled(true);
 		this.add(itemComboBox, BorderLayout.CENTER);
         refreshButton = new UIButton(new LazyIcon("refresh"));
+		FineUIStyle.setStyle(refreshButton, FineUIStyle.ORIGINAL_BUTTON);
         JPanel jPanel = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(2, 0 ,4);
         editButton = initEditButton(editButton, buttonSize);
-		editButton.setBorder(null);
+		FineUIStyle.setStyle(editButton, FineUIStyle.ORIGINAL_BUTTON);
 		editButton.setBackground(FlatUIUtils.getUIColor("default.background", new Color(246, 248, 250, 255)));
         jPanel.add(editButton);
         jPanel.add(refreshButton);
 		jPanel.setOpaque(true);
 		this.add(jPanel, BorderLayout.EAST);
         refreshButton.setPreferredSize(buttonSize);
-		refreshButton.setBorder(null);
 		refreshButton.setBackground(FlatUIUtils.getUIColor("default.background", new Color(246, 248, 250, 255)));
         refreshButton.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
@@ -74,7 +74,7 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 	}
 
 	protected UIButton initEditButton(UIButton editButton, Dimension buttonSize) {
-		editButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/control/control-center2.png"));
+		editButton = new UIButton(new LazyIcon("edit"));
 		editButton.setPreferredSize(buttonSize);
 		editButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {

designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellBiasTextPainterEditor.java

@@ -1,12 +1,11 @@
 package com.fr.quickeditor.cellquick;
 
+import com.fine.theme.utils.FineLayoutBuilder;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.insert.cell.BiasCellAction;
 import com.fr.design.cell.editor.BiasTextPainterCellEditor.BiasTextPainterPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.general.ComparatorUtils;
 
@@ -16,7 +15,6 @@ import com.fr.report.cell.painter.BiasTextPainter;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
-import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -39,11 +37,7 @@ public class CellBiasTextPainterEditor extends CellQuickEditor {
             }
         });
         editButton.setOpaque(false);
-        content.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
+        return FineLayoutBuilder.asBorderLayoutWrapped(editButton);
-                        new Component[]{EMPTY_LABEL, editButton}},
-                new double[]{TableLayout.PREFERRED},
-                new double[]{TableLayout.PREFERRED, TableLayout.FILL}, HGAP, VGAP), BorderLayout.CENTER);
-        return content;
     }
 
     @Override

designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellSubReportEditor.java

@@ -1,5 +1,6 @@
 package com.fr.quickeditor.cellquick;
 
+import com.fine.theme.utils.FineLayoutBuilder;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.insert.cell.SubReportCellAction;
 import com.fr.design.constants.UIConstants;
@@ -10,9 +11,6 @@ import javax.swing.JComponent;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
 
-import static com.fine.swing.ui.layout.Layouts.cell;
-import static com.fine.swing.ui.layout.Layouts.row;
-
 /**
  * 单元格元素子报表编辑器
  *
@@ -31,11 +29,7 @@ public class CellSubReportEditor extends CellQuickEditor {
     public JComponent createCenterBody() {
         JPanel content = new JPanel(new BorderLayout());
         subReportButton = new UIButton();
-        content.add(row(
+        return FineLayoutBuilder.asBorderLayoutWrapped(subReportButton);
-                cell(EMPTY_LABEL).weight(1.2),
-                cell(subReportButton).weight(3)
-        ).getComponent());
-        return content;
     }
 
     @Override