Browse Source

Pull request #1828: REPORT-35259 当参数栏参数过多时是否有下拉框

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

* commit '4e743d189d7f352c97a31e60d973c81c6598825b':
  REPORT-35259 当参数栏参数过多时是否有下拉框 调整格式
  REPORT-35259 当参数栏参数过多时是否有下拉框 删除无用提交
  REPORT-35259 当参数栏参数过多时是否有下拉框
  REPORT-31546 公式面板的说明切换偶尔会失效
bugfix/10.0
Henry.Wang 4 years ago
parent
commit
c0d837118b
  1. 1
      designer-form/src/main/java/com/fr/design/mainframe/JForm.java
  2. 2
      designer-form/src/main/java/com/fr/design/parameter/ParameterPropertyPane.java

1
designer-form/src/main/java/com/fr/design/mainframe/JForm.java

@ -371,6 +371,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
return;
}
ParameterPropertyPane.getInstance().setAddParaPaneVisible(isAddParaPaneVisible(comp), this);
ParameterPropertyPane.getInstance().updateAddParaPaneSize();
editingComponent = comp.createToolPane(this, formDesign);
if (DesignerMode.isAuthorityEditing()) {
EastRegionContainerPane.getInstance().replaceWidgetSettingsPane(

2
designer-form/src/main/java/com/fr/design/parameter/ParameterPropertyPane.java

@ -103,7 +103,7 @@ public class ParameterPropertyPane extends JPanel{
refreshState(DesignerContext.getDesignerFrame().getSelectedJTemplate());
}
private void updateAddParaPaneSize() {
public void updateAddParaPaneSize() {
if (!addParaPane.isVisible()) {
return;
}

Loading…
Cancel
Save