Browse Source

Merge pull request #1367 in BA/design from ~MOMEAK/design9.0:release/9.0 to release/9.0

* commit '8d3052a2d3b7b9957af0184e0d84ab75e4c76f35':
  REPORT-5081 [9.0 二轮]表单文件的控件设置,无法进行手动输入 更新操作不用触发populate
master
superman 7 years ago
parent
commit
dbfa40c145
  1. 6
      designer_form/src/com/fr/design/mainframe/FormDesigner.java
  2. 3
      designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java

6
designer_form/src/com/fr/design/mainframe/FormDesigner.java

@ -668,8 +668,10 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
// 只有选择组件时不触发模版更新,其他都要触发 // 只有选择组件时不触发模版更新,其他都要触发
if (evt.getCreatorEventID() != DesignerEvent.CREATOR_SELECTED) { if (evt.getCreatorEventID() != DesignerEvent.CREATOR_SELECTED) {
FormDesigner.this.fireTargetModified(); FormDesigner.this.fireTargetModified();
setParameterArray(getNoRepeatParas(getTarget().getParameters())); if (evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED) {
refreshParameter(); setParameterArray(getNoRepeatParas(getTarget().getParameters()));
refreshParameter();
}
} }
} }

3
designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java

@ -330,8 +330,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope
@Override @Override
public void fireCreatorModified(DesignerEvent evt) { public void fireCreatorModified(DesignerEvent evt) {
if (evt.getCreatorEventID() == DesignerEvent.CREATOR_EDITED if (evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED
|| evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED
|| evt.getCreatorEventID() == DesignerEvent.CREATOR_RESIZED) { || evt.getCreatorEventID() == DesignerEvent.CREATOR_RESIZED) {
formWidgetCardPane.populate(); formWidgetCardPane.populate();
} else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_SELECTED){ } else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_SELECTED){

Loading…
Cancel
Save