Pull request #15002: REPORT-135889 & REPORT-136077 & REPORT-136650 fix：NewUI细节问题修复

Merge in DESIGN/design from ~LEVY.XIE/design:fbp/release to fbp/release

* commit '51bfec255c83f56de09ae10ccdbc81ecaf581dcd':
  REPORT-136650 fix：控件自适应按钮交互异常修复
  REPORT-136077 fix：属性面板兼容旧图标
  REPORT-135889 fix：远程失败堆栈页面优化

designer-base/src/main/java/com/fr/design/dialog/UIDetailErrorLinkDialog.java

@@ -5,6 +5,7 @@ import com.fine.theme.utils.FineUIScale;
 import com.fine.theme.utils.FineUIStyle;
 import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.base.GraphHelper;
+import com.fr.design.border.FineBorderFactory;
 import com.fr.design.dialog.link.MessageWithLink;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icontainer.UIScrollPane;
@@ -14,7 +15,6 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.IOUtils;
 import com.fr.stable.StringUtils;
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -30,7 +30,6 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
@@ -179,9 +178,11 @@ public class UIDetailErrorLinkDialog extends UIDialog {
         public StackPane(String stack) {
             setLayout(new BorderLayout());
             UITextArea textArea = new UITextArea();
+            textArea.setBorder(null);
             textArea.setEditable(false);
             textArea.setText(stack);
             UIScrollPane scrollPane = new UIScrollPane(textArea);
+            scrollPane.setBorder(FineBorderFactory.createWrappedRoundBorder());
             add(scrollPane);
             // 滚动条默认在顶部
             SwingUtilities.invokeLater(new Runnable() {

designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java

@@ -1041,6 +1041,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                 button.setIcon(new LazyIcon(getBtnIconId(), ICON_WIDTH));
                 button.setDisabledIcon(new LazyIcon(btnIconName + ICON_SUFFIX_DISABLED, ICON_WIDTH));
             } else {
+                iconSuffix = ICON_SUFFIX_NORMAL_DEPRECATED;
                 button.setIcon(IconUtils.readIcon(getBtnIconUrl()));
                 button.setDisabledIcon(IconUtils.readIcon(getIconBaseDir() + btnIconName + ICON_SUFFIX_DISABLED_DEPRECATED));
             }

designer-realize/src/main/java/com/fr/design/widget/ui/ButtonGroupDictPane.java

@@ -1,8 +1,9 @@
 package com.fr.design.widget.ui;
 
 
+import com.fine.swing.ui.layout.Row;
+import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.data.Dictionary;
-import com.fr.design.gui.core.ReactiveCardPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UIBasicSpinner;
@@ -11,11 +12,8 @@ import com.fr.design.mainframe.widget.accessibles.AccessibleDictionaryEditor;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.form.ui.ButtonGroup;
 
-import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.SpinnerNumberModel;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 import static com.fine.swing.ui.layout.Layouts.cell;
 import static com.fine.swing.ui.layout.Layouts.column;
@@ -29,7 +27,7 @@ public class ButtonGroupDictPane extends JPanel {
 	private UICheckBox adaptiveCheckbox;
 	private UILabel columnLabel;
 	private AccessibleDictionaryEditor dictPane;
-	private ReactiveCardPane reactiveCardPane;
+	private Row showColumn;
 
 
 	public ButtonGroupDictPane() {
@@ -41,51 +39,29 @@ public class ButtonGroupDictPane extends JPanel {
      */
 	public void initComponents() {
 		dictPane = new AccessibleDictionaryEditor();
-		this.setLayout(FRGUIPaneFactory.createBorderLayout());
-		adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive"), true);
-		adaptiveCheckbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		adaptiveCheckbox.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				boolean selected = adaptiveCheckbox.isSelected();
-				if (selected) {
-					reactiveCardPane.select("adaptive").populate();
-				} else {
-					reactiveCardPane.select("inadaptive").populate();
-				}
-			}
-		});
 		UILabel dictLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary"));
 		this.columnLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns") + ":", dictLabel.getPreferredSize().width);
 		columnSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1));
-
+		showColumn = row(cell(columnLabel).weight(LEFT_WEIGHT), cell(columnSpinner).weight(RIGHT_WEIGHT)).getComponent();
-		reactiveCardPane = ReactiveCardPane.create()
+		this.setLayout(FRGUIPaneFactory.createBorderLayout());
-				.addSupplier("adaptive", () -> column(
+		adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive"), true);
-								10,
+		adaptiveCheckbox.setBorder(new ScaledEmptyBorder(0, 0, 0, 0));
-								row(cell(dictLabel).weight(LEFT_WEIGHT), cell(dictPane).weight(RIGHT_WEIGHT)),
+		adaptiveCheckbox.addActionListener(e -> {
-								row(cell(adaptiveCheckbox)),
+            boolean selected = adaptiveCheckbox.isSelected();
-								row(cell(columnLabel).weight(LEFT_WEIGHT), cell(columnSpinner).weight(RIGHT_WEIGHT))
+            showColumn.setVisible(!selected);
-						).getComponent()
+        });
-				).addSupplier("inadaptive", () -> column(
+		this.add(column(10,
-						10,
+				row(cell(dictLabel).weight(LEFT_WEIGHT), cell(dictPane).weight(RIGHT_WEIGHT)),
-						row(cell(dictLabel).weight(LEFT_WEIGHT), cell(dictPane).weight(RIGHT_WEIGHT)),
+				row(cell(adaptiveCheckbox)),
-						row(cell(adaptiveCheckbox))
+				cell(showColumn)
-				).getComponent());
+			).getComponent());
-
-		reactiveCardPane.select("inadaptive").populate();
-		this.add(reactiveCardPane);
-
 	}
 	
 	public void populate(ButtonGroup buttonGroup) {
 		dictPane.setValue(buttonGroup.getDictionary());
 		adaptiveCheckbox.setSelected(buttonGroup.isAdaptive());
 		boolean selected = adaptiveCheckbox.isSelected();
-		if (selected) {
+		showColumn.setVisible(!selected);
-			reactiveCardPane.select("adaptive").populate();
-		} else {
-			reactiveCardPane.select("inadaptive").populate();
-		}
 		columnSpinner.setValue(buttonGroup.getColumnsInRow());
 	}