Browse Source

Merge pull request #6052 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit '1857733955f72a2073d621247e495d65a9e79542':
  REPORT-59256 填报-填报属性设置-新增自定义提交会带出之前自定义提交设置
feature/10.0
superman 3 years ago
parent
commit
9b7f720b36
  1. 8
      designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java

8
designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java

@ -13,6 +13,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.DialogActionAdapter;
import com.fr.stable.ListMap;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
@ -115,7 +116,12 @@ public abstract class CustomJobPane extends BasicBeanPane {
@Override @Override
public void populateBean(Object ob) { public void populateBean(Object ob) {
if (ob instanceof AbstractClassJob) { if (ob == null) {
// 自定义提交新增时初始化页面 REPORT-59256
this.classNameTextField.setText(StringUtils.EMPTY);
this.objectProperiesPane.populateBean(new ListMap());
}
else if (ob instanceof AbstractClassJob) {
AbstractClassJob cj = (AbstractClassJob) ob; AbstractClassJob cj = (AbstractClassJob) ob;
this.classNameTextField.setText(cj.getClassName()); this.classNameTextField.setText(cj.getClassName());
this.objectProperiesPane.populateBean(cj.getPropertyMap()); this.objectProperiesPane.populateBean(cj.getPropertyMap());

Loading…
Cancel
Save