Browse Source

REPORT-6443 控件树消失问题=>减少对其他地方的影响

plough 7 years ago
parent
commit
4989dffbf7
  1. 5
      designer_form/src/com/fr/design/mainframe/JForm.java
  2. 6
      designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java

5
designer_form/src/com/fr/design/mainframe/JForm.java

@ -248,15 +248,12 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
@Override
public void fireCreatorModified(DesignerEvent evt) {
if (formDesign.getArea() == null || !formDesign.getArea().isValid()) {
return;
}
if (evt.getCreatorEventID() == DesignerEvent.CREATOR_CUTED) {
setPropertyPaneChange(formDesign.getRootComponent());
} else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED) {
// 在 delete 之前,会先 select 父组件。这里直接传入 lastAffectedCreator 就好了
setPropertyPaneChange(lastAffectedCreator);
} else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_SELECTED || evt.getCreatorEventID() == DesignerEvent.CREATOR_EDITED) {
} else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_SELECTED) {
lastAffectedCreator = evt.getAffectedCreator();
setPropertyPaneChange(lastAffectedCreator);
}

6
designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java

@ -106,7 +106,7 @@ public class ParameterPropertyPane extends JPanel{
}
public void setAddParaPaneVisible(boolean isVisible, JTemplate jt) {
if (isVisible == addParaPane.isVisible() || formHierarchyTreePaneWrapper == null) {
if (formHierarchyTreePaneWrapper == null) {
return;
}
// 表单中,只有添加并选中参数面板时,才显示
@ -122,7 +122,9 @@ public class ParameterPropertyPane extends JPanel{
this.setPreferredSize(null);
} else {
addParaPane.setVisible(false);
this.setPreferredSize(new Dimension(getWidth(), formHierarchyTreePaneWrapper.getPreferredSize().height + UIConstants.GAP_NORMAL));
if (formHierarchyTreePaneWrapper.getPreferredSize().height > 0) {
this.setPreferredSize(new Dimension(getWidth(), formHierarchyTreePaneWrapper.getPreferredSize().height + UIConstants.GAP_NORMAL));
}
}
}

Loading…
Cancel
Save