Browse Source

Merge pull request #2176 in DESIGN/design from release/10.0 to bugfix/10.0

* commit 'd357214a339301fbbc5973e976a9960a6e38845a':
  REPORT-37870【共创】远程目录切换回本地,点击服务器-插件管理,页面显示异常;再打开一个模板,模板内容显示错乱
bugfix/10.0
superman 4 years ago
parent
commit
4a973c889d
  1. 1
      designer-base/src/main/java/com/fr/design/module/DesignModuleFactory.java
  2. 3
      designer-realize/src/main/java/com/fr/design/parameter/ParameterDefinitePane.java

1
designer-base/src/main/java/com/fr/design/module/DesignModuleFactory.java

@ -146,6 +146,7 @@ public class DesignModuleFactory {
try { try {
return (ParameterDesignerProvider) instance.formParaDesigner.newInstance(); return (ParameterDesignerProvider) instance.formParaDesigner.newInstance();
} catch (Exception e) { } catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
FineLoggerFactory.getLogger().error("error in form para designer"); FineLoggerFactory.getLogger().error("error in form para designer");
} }
} }

3
designer-realize/src/main/java/com/fr/design/parameter/ParameterDefinitePane.java

@ -95,7 +95,8 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
setComponentBg(this); setComponentBg(this);
paraDesignEditor = DesignModuleFactory.getFormParaDesigner(); paraDesignEditor = DesignModuleFactory.getFormParaDesigner();
if (paraDesignEditor == null) { if (paraDesignEditor == null) {
return; // 为空时 设置默认值
paraDesignEditor = new FormParaDesigner();
} }
paraDesignEditor.initWidgetToolbarPane(); paraDesignEditor.initWidgetToolbarPane();

Loading…
Cancel
Save