Browse Source

Pull request #6281: REPORT-52578 10.0兼容新自适应插件的同步代码在11.0中需要改成异步的

Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0

* commit 'f97d4f55bd3378af3080084b63589f2689f02f9f':
  REPORT-52578 10.0兼容新自适应插件的同步代码在11.0中需要改成异步的
bugfix/11.0
Henry.Wang 3 years ago
parent
commit
8e4d396b5b
  1. 5
      designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java

5
designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java

@ -58,7 +58,6 @@ class FormApp extends AbstractAppProvider {
* @return * @return
*/ */
private JTemplate<Form, ?> compatibleForm(FILE tplFile, HashMap<String, Class> classType) { private JTemplate<Form, ?> compatibleForm(FILE tplFile, HashMap<String, Class> classType) {
if (ComparatorUtils.equals(StableFactory.getRegisteredClass(BaseJForm.XML_TAG), JForm.class)) {
classType.put(Constants.ARG_2, Parameter[].class); classType.put(Constants.ARG_2, Parameter[].class);
JForm emptyForm = new JForm(new Form(new WBorderLayout("form")), tplFile); JForm emptyForm = new JForm(new Form(new WBorderLayout("form")), tplFile);
OpenWorker<OpenResult<Form, Parameter[]>> worker = new OpenWorker<>( OpenWorker<OpenResult<Form, Parameter[]>> worker = new OpenWorker<>(
@ -84,10 +83,6 @@ class FormApp extends AbstractAppProvider {
new Object[]{result.getBaseBook(), tplFile, new Parameter[0]}, classType, BaseJForm.class); new Object[]{result.getBaseBook(), tplFile, new Parameter[0]}, classType, BaseJForm.class);
} }
return emptyForm; return emptyForm;
} else {
return (JTemplate<Form, ?>) StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG,
new Object[]{getForm(tplFile), tplFile}, classType, BaseJForm.class);
}
} }
@Nullable @Nullable

Loading…
Cancel
Save