Browse Source

Merge pull request #410 in BA/design from ~ZACK/design:dev to dev

* commit '6055f567df4c89e1c0a6eda6c7b7c9763f43d6f7':
  无JIRA任务 NPE
  无JIRA任务 组件共享fireTargetChange会多记住一次状态ctrl+z的时候得多按一次
master
superman 8 years ago
parent
commit
96fa09b1a3
  1. 1
      designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
  2. 18
      designer_form/src/com/fr/design/mainframe/CoverReportPane.java

1
designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java

@ -292,7 +292,6 @@ public class TableDataTreePane extends BasicTableDataTreePane {
}
tds.putTableData(tdName, td);
}
tc.fireTargetModified();
tc.parameterChanged();
dataTree.refresh();
}

18
designer_form/src/com/fr/design/mainframe/CoverReportPane.java

@ -62,15 +62,17 @@ public class CoverReportPane extends JPanel {
editButton.setBackground(new Color(176, 196, 222));
add(editButton);
add(controlButton);
WidgetPropertyPane.getInstance().getEditingFormDesigner().addDesignerEditListener(new DesignerEditListener() {
@Override
public void fireCreatorModified(DesignerEvent evt) {
if (evt.getCreatorEventID() == (DesignerEvent.CREATOR_DELETED)
|| evt.getCreatorEventID() == (DesignerEvent.CREATOR_RESIZED)) {
destroyHelpDialog();
if (WidgetPropertyPane.getInstance().getEditingFormDesigner() != null) {
WidgetPropertyPane.getInstance().getEditingFormDesigner().addDesignerEditListener(new DesignerEditListener() {
@Override
public void fireCreatorModified(DesignerEvent evt) {
if (evt.getCreatorEventID() == (DesignerEvent.CREATOR_DELETED)
|| evt.getCreatorEventID() == (DesignerEvent.CREATOR_RESIZED)) {
destroyHelpDialog();
}
}
}
});
});
}
}
public String getHelpMsg() {

Loading…
Cancel
Save