Browse Source

报表引擎属性弹窗翻新

release/11.0
张世豪 6 months ago
parent
commit
2b2fd78d01
  1. 15
      designer-base/src/main/java/com/fr/design/gui/itree/filetree/TemplateFileTree.java
  2. 2
      designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java

15
designer-base/src/main/java/com/fr/design/gui/itree/filetree/TemplateFileTree.java

@ -38,10 +38,17 @@ public class TemplateFileTree extends EnvFileTree {
private static final int MAX_NODE_EXPAND_NUM = 50; private static final int MAX_NODE_EXPAND_NUM = 50;
private static final int MAX_MATCHED_NODE_NUM = 500; private static final int MAX_MATCHED_NODE_NUM = 500;
private boolean exportTemplate = false;
public TemplateFileTree() { public TemplateFileTree() {
super(ProjectConstants.REPORTLETS_NAME, null, null); super(ProjectConstants.REPORTLETS_NAME, null, null);
} }
public TemplateFileTree(boolean exportTemplate) {
this();
this.exportTemplate = exportTemplate;
}
/* /*
* 选中reportPath * 选中reportPath
*/ */
@ -152,13 +159,17 @@ public class TemplateFileTree extends EnvFileTree {
Set<FileExtension> supportTypes = new HashSet<FileExtension>(); Set<FileExtension> supportTypes = new HashSet<FileExtension>();
if (filter != null) { if (filter != null) {
for (String temp : filter.getSupportedTypes()) { for (String temp : filter.getSupportedTypes()) {
if (!(exportTemplate && temp.endsWith("fvs"))) {
supportTypes.add(FileExtension.parse(temp)); supportTypes.add(FileExtension.parse(temp));
} }
} }
}
Set<App> apps = ExtraDesignClassManager.getInstance().getArray(App.MARK_STRING); Set<App> apps = ExtraDesignClassManager.getInstance().getArray(App.MARK_STRING);
for (App temp : apps) { for (App temp : apps) {
for (String extendsion : temp.defaultExtensions()) { for (String extension : temp.defaultExtensions()) {
supportTypes.add(FileExtension.parse(extendsion)); if (!(exportTemplate && extension.endsWith("fvs"))) {
supportTypes.add(FileExtension.parse(extension));
}
} }
} }
return supportTypes; return supportTypes;

2
designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java

@ -965,7 +965,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
cardPane = FRGUIPaneFactory.createCardLayout_S_Pane(); cardPane = FRGUIPaneFactory.createCardLayout_S_Pane();
centerPane.add(cardPane, BorderLayout.CENTER); centerPane.add(cardPane, BorderLayout.CENTER);
cardPane.setLayout(new CardLayout()); cardPane.setLayout(new CardLayout());
templateReportletTree = new TemplateFileTree(); templateReportletTree = new TemplateFileTree(true);
IOFileNodeFilter filter = new IOFileNodeFilter(new String[]{".cpt"}); IOFileNodeFilter filter = new IOFileNodeFilter(new String[]{".cpt"});
templateReportletTree.setFileNodeFilter(filter); templateReportletTree.setFileNodeFilter(filter);
cardPane.add(t_panel = new JScrollPane(templateReportletTree), "TEMPLATE"); cardPane.add(t_panel = new JScrollPane(templateReportletTree), "TEMPLATE");

Loading…
Cancel
Save