报表引擎属性弹窗翻新

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

@@ -38,17 +38,10 @@ public class TemplateFileTree extends EnvFileTree {
     private static final int MAX_NODE_EXPAND_NUM = 50;
     private static final int MAX_MATCHED_NODE_NUM = 500;
 
-    private boolean exportTemplate = false;
-
     public TemplateFileTree() {
         super(ProjectConstants.REPORTLETS_NAME, null, null);
     }
 
-    public TemplateFileTree(boolean exportTemplate) {
-        this();
-        this.exportTemplate = exportTemplate;
-    }
-
     /*
      * 选中reportPath
      */
@@ -159,16 +152,15 @@ public class TemplateFileTree extends EnvFileTree {
         Set<FileExtension> supportTypes = new HashSet<FileExtension>();
         if (filter != null) {
             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);
         for (App temp : apps) {
             for (String extension : temp.defaultExtensions()) {
-                if (!(exportTemplate && extension.endsWith("fvs"))) {
+                FileExtension fileExtension = FileExtension.parse(extension);
-                    supportTypes.add(FileExtension.parse(extension));
+                if (filter == null || !filter.getNotSupportedTypes().contains(fileExtension)) {
+                    supportTypes.add(fileExtension);
                 }
             }
         }

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

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