Browse Source

Pull request #3678: REPORT-47886 参数面板先添加两个参数,再新建两个参数 全部添加,参数和查询按钮会重叠

Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0

* commit '66d6036ef79788a1025d569cbb27aa4b5591befb':
  REPORT-47886 参数面板先添加两个参数,再新建两个参数 全部添加,参数和查询按钮会重叠
  REPORT-47886 参数面板先添加两个参数,再新建两个参数 全部添加,参数和查询按钮会重叠
feature/big-screen
Henry.Wang 4 years ago
parent
commit
d6100c29c5
  1. 8
      designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java

8
designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java

@ -474,7 +474,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
*/ */
@Override @Override
public void updateUI() { public void updateUI() {
setUI(new FormDesignerUI(){ setUI(new FormDesignerUI() {
@Override @Override
protected Rectangle getFitPaintBounds(Component component, Component parent) { protected Rectangle getFitPaintBounds(Component component, Component parent) {
return new Rectangle(0, 0, parent.getSize().width, parent.getSize().height); return new Rectangle(0, 0, parent.getSize().width, parent.getSize().height);
@ -694,8 +694,8 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
formSubmitButton.setWidgetName("Search"); formSubmitButton.setWidgetName("Search");
formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Query")); formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Query"));
XCreator xCreator = XCreatorUtils.createXCreator(formSubmitButton); XCreator xCreator = XCreatorUtils.createXCreator(formSubmitButton);
if (!(this.autoAddComponent(xCreator, H_COMPONENT_GAP * 3 + H_GAP, FIRST_V_LOCATION if (this.autoAddComponent(xCreator, H_COMPONENT_GAP * 3 + H_GAP, FIRST_V_LOCATION
+ V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) { + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE))) {
currentIndex = ((int) Math.ceil((currentIndex + 1) / (double) NUM_IN_A_LINE)) * NUM_IN_A_LINE; currentIndex = ((int) Math.ceil((currentIndex + 1) / (double) NUM_IN_A_LINE)) * NUM_IN_A_LINE;
} }
} }
@ -741,7 +741,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
} }
@Override @Override
public boolean checkIfBeyondValidArea(MouseEvent e){ public boolean checkIfBeyondValidArea(MouseEvent e) {
return false; return false;
} }

Loading…
Cancel
Save