Browse Source

Pull request #14831: REPORT-134713 & REPORT-133970【fr-fbp回归】最新设计器远程错误堆栈弹窗显示不全

Merge in DESIGN/design from ~RENEKTON/design:fbp/release to fbp/release

* commit 'd75b73c03e541b3d2c56588567ca1d612ddb8f74':
  值编辑面板缩放
  弹窗已经缩放,间距变大导致的遮挡,拉长20
fbp/release
Renekton-张世豪 2 months ago
parent
commit
4a9683eda2
  1. 8
      designer-base/src/main/java/com/fr/design/dialog/UIDetailErrorLinkDialog.java
  2. 2
      designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

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

@ -56,7 +56,7 @@ public class UIDetailErrorLinkDialog extends UIDialog {
private static final String TAG_A_END = "</a>";
private static final double SCALE = 1.2;
private final Dimension dimension = new Dimension(360, 180);
private final Dimension dimension = new Dimension(360, 200);
public static Builder newBuilder() {
return new Builder();
@ -99,8 +99,10 @@ public class UIDetailErrorLinkDialog extends UIDialog {
contentPane.add(link, BorderLayout.SOUTH);
// 确定 + 取消
JPanel actionPane = new JPanel(new FlowLayout(FlowLayout.RIGHT, GAP_10, GAP_8));
actionPane.add(createButton(Toolkit.i18nText("Fine-Design_Report_OK")));
JPanel actionPane = new JPanel(new FlowLayout(FlowLayout.RIGHT, GAP_8, GAP_10));
UIButton okButton = createButton(Toolkit.i18nText("Fine-Design_Report_OK"));
FineUIStyle.setStyle(okButton, FineUIStyle.STYLE_PRIMARY);
actionPane.add(okButton);
actionPane.add(createButton(Toolkit.i18nText("Fine-Design_Basic_Cancel")));
this.getContentPane().add(column(10,

2
designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@ -891,7 +891,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
vPane = new ValueEditorPane(types);
this.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 45));
this.add(vPane);
vPane.setPreferredSize(new Dimension(220, 25));
vPane.setPreferredSize(scale(new Dimension(220, 25)));
}
@Override

Loading…
Cancel
Save