Browse Source

REPORT-135235 fix:fbp回归问题:调整高级编辑弹窗大小

fbp/merge
Richard.Fang 5 months ago
parent
commit
e4ff94f24e
  1. 7
      designer-base/src/main/java/com/fr/design/javascript/JSContentWithDescriptionPane.java
  2. 10
      designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java

7
designer-base/src/main/java/com/fr/design/javascript/JSContentWithDescriptionPane.java

@ -1,5 +1,6 @@
package com.fr.design.javascript; package com.fr.design.javascript;
import com.fine.theme.utils.FineUIScale;
import com.fr.base.svg.IconUtils; import com.fr.base.svg.IconUtils;
import com.fr.design.border.UIRoundedBorder; import com.fr.design.border.UIRoundedBorder;
import com.fr.design.constants.UIConstants; import com.fr.design.constants.UIConstants;
@ -140,7 +141,7 @@ public class JSContentWithDescriptionPane extends JSContentPane implements KeyLi
//js函数声明面板 //js函数声明面板
JPanel jsParaPane = createJSParaPane(); JPanel jsParaPane = createJSParaPane();
jsParaPane.setPreferredSize(new Dimension(650, 80)); jsParaPane.setPreferredSize(FineUIScale.createScaleDimension(650, 80));
//右上角的搜索提示面板 //右上角的搜索提示面板
JPanel tipsPane = createTipsPane(); JPanel tipsPane = createTipsPane();
@ -153,7 +154,7 @@ public class JSContentWithDescriptionPane extends JSContentPane implements KeyLi
UIScrollPane contentTextAreaPanel = createContentTextAreaPanel(); UIScrollPane contentTextAreaPanel = createContentTextAreaPanel();
initContextAreaListener(); initContextAreaListener();
contentTextAreaPanel.setPreferredSize(new Dimension(850, 250)); contentTextAreaPanel.setPreferredSize(FineUIScale.createScaleDimension(850, 250));
//js函数结束标签 //js函数结束标签
UILabel endBracketsLabel = new UILabel(); UILabel endBracketsLabel = new UILabel();
endBracketsLabel.setText("}"); endBracketsLabel.setText("}");
@ -173,7 +174,7 @@ public class JSContentWithDescriptionPane extends JSContentPane implements KeyLi
//函数分类和函数说明面板================================== //函数分类和函数说明面板==================================
JPanel functionNameAndDescriptionPanel = createInterfaceAndDescriptionPanel(); JPanel functionNameAndDescriptionPanel = createInterfaceAndDescriptionPanel();
functionNameAndDescriptionPanel.setPreferredSize(new Dimension(880, 220)); functionNameAndDescriptionPanel.setPreferredSize(FineUIScale.createScaleDimension(880, 220));
this.add(functionNameAndDescriptionPanel, BorderLayout.SOUTH); this.add(functionNameAndDescriptionPanel, BorderLayout.SOUTH);
} }

10
designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java

@ -13,13 +13,11 @@ import com.fr.design.hyperlink.AbstractHyperLinkPane;
import com.fr.design.javascript.jsapi.JSImplPopulateAction; import com.fr.design.javascript.jsapi.JSImplPopulateAction;
import com.fr.design.javascript.jsapi.JSImplUpdateAction; import com.fr.design.javascript.jsapi.JSImplUpdateAction;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.scrollruler.ModLineBorder;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.js.JavaScriptImpl; import com.fr.js.JavaScriptImpl;
import com.fr.stable.ParameterProvider; import com.fr.stable.ParameterProvider;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import javax.swing.BorderFactory;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener; import javax.swing.event.TableModelListener;
@ -30,7 +28,6 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import static com.fine.swing.ui.layout.Layouts.column;
import static com.fine.swing.ui.layout.Layouts.row; import static com.fine.swing.ui.layout.Layouts.row;
import static com.fine.swing.ui.layout.Layouts.cell; import static com.fine.swing.ui.layout.Layouts.cell;
@ -76,12 +73,11 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
cell(FineUIUtils.wrapComponentWithTitle(importedJsPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript"))).weight(0.5), cell(FineUIUtils.wrapComponentWithTitle(importedJsPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript"))).weight(0.5),
cell(FineUIUtils.wrapComponentWithTitle(parameterPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"))).weight(0.5) cell(FineUIUtils.wrapComponentWithTitle(parameterPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"))).weight(0.5)
).getComponent()); ).getComponent());
topPane.setPreferredSize(new Dimension(super.getPreferredSize().width, 150));
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.add(column(10, this.add(topPane, BorderLayout.NORTH);
cell(topPane).weight(0.5), this.add(FineUIUtils.wrapComponentWithTitle(jsPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript")), BorderLayout.CENTER);
cell(FineUIUtils.wrapComponentWithTitle(jsPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript"))).weight(0.5)
).getComponent());
this.reLayoutForChart(); this.reLayoutForChart();
} }

Loading…
Cancel
Save