Pull request #6064: REPORT-59567 & REPORT-59524 & REPORT-59520 & REPORT-59737 & REPORT-59706

Merge in DESIGN/design from ~FLY.LI/design:feature/x to feature/x

* commit 'e43bedb410ee0ac7a9b39ebefe6dad2531bb23e3':
  REPORT-59567:报表引擎属性面板按交互修改
  REPORT-59567:修改代码不规范的地方
  REPORT-59567:将长方法拆分
  解决冲突·
  解决冲突
  解决冲突
  REPORT-59567:报表引擎属性面板按交互修改
  REPORT-59567:报表引擎界面按交互修改
  解决冲突
  解决冲突
  REPORT-59520:删除cptx与cpt转换按钮以及删除文件菜单中的批量格式转换按钮
  解决冲突
  解决冲突
  REPORT-59524:删除误导入的文件
  REPORT-59724：修改成默认选中新计算引擎选项以及顺便修改一下报表引擎属性类相关属性命名不规范的地方
  REPORT-59706:有不支持功能时，日志里面的提示语句需要修改一下
  REPORT-59737:修复另存为流程中出现文件默认名未xxx.cptx.cpt的bug
  REPORT-59520:删除转换按钮和文件菜单中的批量格式转换菜单
  REPORT-59524:另存为流程中删除cptx选项

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -19,7 +19,6 @@ import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.TableDataSourceAction;
 import com.fr.design.actions.edit.RedoAction;
 import com.fr.design.actions.edit.UndoAction;
-import com.fr.design.actions.file.BatchCompileAction;
 import com.fr.design.actions.file.SaveAsTemplateAction;
 import com.fr.design.actions.file.SaveTemplateAction;
 import com.fr.design.actions.file.WebPreviewUtils;
@@ -974,7 +973,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         } else if (DesignerMode.isAuthorityEditing()) {
             return new ShortCut[]{new SaveTemplateAction(this), new UndoAction(this), new RedoAction(this)};
         } else {
-            return new ShortCut[]{new SaveTemplateAction(this), new SaveAsTemplateAction(this), new BatchCompileAction(), new UndoAction(this), new RedoAction(this)};
+            return new ShortCut[]{new SaveTemplateAction(this), new SaveAsTemplateAction(this), new UndoAction(this), new RedoAction(this)};
         }
 
     }
@@ -1411,9 +1410,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      * @return 按钮组
      */
     public UIButton[] createExtraButtons() {
-        UIButton[] uiButtons = new UIButton[]{
-                (UIButton) new CompileAction().createToolBarComponent()
-        };
+        UIButton[] uiButtons = new UIButton[0];
         Set<DesignerFrameUpButtonProvider> providers = ExtraDesignClassManager.getInstance().getArray(DesignerFrameUpButtonProvider.XML_TAG);
         for (DesignerFrameUpButtonProvider provider : providers) {
             uiButtons = ArrayUtils.addAll(uiButtons, provider.getUpButtons(getMenuState()));

designer-base/src/main/java/com/fr/file/FILEChooserPane.java

@@ -648,7 +648,7 @@ public class FILEChooserPane extends BasicPane {
         this.suffix = suffix;
 
         if (!text.endsWith(suffix)) {
-            text = text + suffix;
+            text = removeSuffix(text) + suffix;
         }
         fileNameTextField.removeDocumentListener();
         fileNameTextField.setText(text);
@@ -664,6 +664,14 @@ public class FILEChooserPane extends BasicPane {
         fileNameTextField.setFilter(new DefaultCompletionFilter(names));
     }
 
+    /**
+     * 移除文件后缀的方法
+     * 解决cptx文件的另存为操作默认会出现双后缀的bug(xxx.cptx.cpt)
+     **/
+    private String removeSuffix(String text){
+        return FileExtension.CPTX.matchExtension(text) ? text.substring(0, text.length() - FileExtension.CPTX.getSuffix().length()) : text;
+    }
+
 
     /**
      * 打开对话框

designer-base/src/main/java/com/fr/nx/app/designer/toolbar/TransformResultInfo.java

@@ -57,7 +57,7 @@ public class TransformResultInfo {
                 return InterProviderFactory.getProvider().getLocText("Fine-Plugin_Engine_Transform_Success_Tip");
             case UNSUPPORT:
                 return transformLog + "\n"
-                        + InterProviderFactory.getProvider().getLocText("Fine-Plugin_Engine_Transform_Unsupport_Tip");
+                        + InterProviderFactory.getProvider().getLocText("Fine-Plugin_Engine_X_Unsupport_Tip");
         }
         return transformLog;
     }

designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@@ -1247,7 +1247,6 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
     protected void addChooseFILEFilter(FILEChooserPane fileChooser) {
         String appName = ProductConstants.APP_NAME;
         fileChooser.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPT, appName + Toolkit.i18nText("Fine-Design_Report_Template_File")));
-        fileChooser.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPTX, appName + Toolkit.i18nText("Fine-Design_Report_Template_File")));
         addExtraChooseFILEFilter(fileChooser);
     }
 

designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java

@@ -7,22 +7,38 @@ import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.FRExplainLabel;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.general.SiteCenter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.report.core.ReportUtils;
 import com.fr.report.stable.LayerReportAttr;
 import com.fr.report.worksheet.WorkSheet;
+import com.fr.stable.ProductConstants;
+import javax.swing.AbstractButton;
 import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
+import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Component;
+import java.awt.Desktop;
 import java.awt.Dimension;
+import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -33,9 +49,12 @@ import java.util.List;
  */
 public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
     private static final int LABEL_HEIGHT = 55;
-    private UICheckBox isClientPaging;
-    private UICheckBox isShowDataNumber;
-    private UICheckBox isPageQueryBox;
+    private UICheckBox clientPaging;
+    private UICheckBox showDataNumber;
+    private UICheckBox pageQueryBox;
+    private JPanel outPagingEngineSelectPane;
+    private JPanel outEngineXSettingPane;
+    private JPanel pageQueryPane;
     private IntegerEditor countPerPageEditor;
     private WorkSheet worksheet;
     private List<JRadioButton> radioButtons = new ArrayList<>(2);
@@ -51,94 +70,125 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
 
     protected void initComponents() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        JPanel outlayerReportPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report_Engine_Attribute"));
-        JPanel layerReportPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
-        this.add(outlayerReportPane);
-        outlayerReportPane.add(layerReportPane);
+        JPanel outReportEnginePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report_Engine_Attribute"));
+        outReportEnginePane.setPreferredSize(new Dimension(600, 370));
+        this.add(outReportEnginePane, BorderLayout.NORTH);
+        outReportEnginePane.add(createReportEnginePane());
+        JPanel outAdvicePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advice"));
+        this.add(outAdvicePane, BorderLayout.SOUTH);
+        outAdvicePane.setPreferredSize(new Dimension(600, 150));
+        outAdvicePane.add(createAdvicePane());
+    }
+
+    private JPanel createReportEnginePane(){
+        JPanel reportEnginePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
+        JPanel clientPagingpanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        clientPaging = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Enable_Client_Page"));
+        clientPaging.setSelected(false);
+        clientPagingpanel.add(clientPaging);
+        reportEnginePane.add(clientPagingpanel);
+        outPagingEngineSelectPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Paging_Engine_Select"));
+        reportEnginePane.add(outPagingEngineSelectPane);
+        outPagingEngineSelectPane.setVisible(false);
+        outPagingEngineSelectPane.setPreferredSize(new Dimension(600, 300));
+        outPagingEngineSelectPane.add(createPagingEngineSelectPane());
+        clientPaging.addActionListener(new SelectActionListener(clientPaging, outPagingEngineSelectPane));
+        return reportEnginePane;
+    }
+
+    private JPanel createPagingEngineSelectPane(){
+        JPanel pagingEngineSelectPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
+        outEngineXSettingPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_New_Engine"));
+        outEngineXSettingPane.setVisible(false);
+        outEngineXSettingPane.setPreferredSize(new Dimension(570, 240));
+        outEngineXSettingPane.add(createEngineXSettingPane());
+        pagingEngineSelectPane.add(createPagingEngineRadioPanel());
+        pagingEngineSelectPane.add(outEngineXSettingPane);
 
-        JPanel isClientPagingPanle = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-        isClientPaging = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Enable_Client_Page"));
-        isClientPaging.addActionListener(new ActionListener(){
+        return pagingEngineSelectPane;
+    }
+
+    private JPanel createEngineXSettingPane(){
+        JPanel engineXSettingPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
+        JPanel pageQueryBoxPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        pageQueryBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fixed_Line_Paging"));
+        pageQueryBox.setSelected(false);
+        pageQueryBoxPanel.add(pageQueryBox);
+        engineXSettingPane.add(pageQueryBoxPanel);
+        pageQueryPane = createPageQueryPane();
+        pageQueryPane.setVisible(false);
+        engineXSettingPane.add(pageQueryPane);
+        pageQueryBox.addActionListener(new SelectActionListener(pageQueryBox, pageQueryPane));
+        JPanel tipPane = new JPanel();
+        UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report_Engine_tip"), SwingConstants.LEFT);
+        tipPane.add(tip);
+        engineXSettingPane.add(tipPane);
+        return engineXSettingPane;
+    }
+
+    private JPanel createPageQueryPane() {
+        double p = TableLayout.PREFERRED;
+        double rowSize[] = {p, p};
+        double columnSize[] = {p, p};
+        countPerPageEditor = new IntegerEditor(new Integer(30));
+        countPerPageEditor.setPreferredSize(new Dimension(120,20));
+        countPerPageEditor.setEnabled(false);
+        Component[][] components = {{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_LayerPageReport_Count_PerPage") + ":"), countPerPageEditor}};
+        JPanel pageQueryPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+        pageQueryPane.setBorder(BorderFactory.createEmptyBorder(5, 15, 0, 0));
+        return pageQueryPane;
+    }
 
+    private JPanel createAdvicePane(){
+        JPanel advicePane = new JPanel(new BorderLayout());
+        FRExplainLabel topExplainLabel = new FRExplainLabel(Toolkit.i18nText("Fine-Design_Report_Report_Engine_Warnning_Info"));
+        advicePane.add(topExplainLabel, BorderLayout.NORTH);
+        topExplainLabel.setForeground(new Color(0, 0, 0));
+        FlowLayout flowLayout = new FlowLayout(FlowLayout.LEADING);
+        flowLayout.setHgap(0);
+        flowLayout.setVgap(0);
+        JPanel adviceDownPane = new JPanel(flowLayout);
+        advicePane.add(adviceDownPane, BorderLayout.CENTER);
+        FRExplainLabel downExplainLabel = new FRExplainLabel(Toolkit.i18nText("Fine-Design_Report_Report_Detail_Reference"));
+        adviceDownPane.add(downExplainLabel);
+        downExplainLabel.setForeground(new Color(0, 0, 0));
+        JLabel helper = new FRExplainLabel( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help"));
+        helper.setForeground(new Color(1, 159, 222));
+        adviceDownPane.add(helper);
+        helper.addMouseListener(new MouseAdapter() {
             @Override
-            public void actionPerformed(ActionEvent e) {
-                if (isClientPaging.isSelected()){
-                    isPageQueryBox.setEnabled(true);
-                }else{
-                    isPageQueryBox.setEnabled(false);
+            public void mouseClicked(MouseEvent e) {
+                try {
+                    Desktop.getDesktop().browse(new URI(SiteCenter.getInstance().acquireUrlByKind("standard.doc", ProductConstants.WEBSITE_URL)));
+                } catch (IOException | URISyntaxException ex) {
+                    FineLoggerFactory.getLogger().error("io exception or not find website", ex);
                 }
-
             }
         });
-        isClientPaging.setSelected(false);
-        isClientPagingPanle.add(isClientPaging);
-        layerReportPane.add(isClientPagingPanle);
-        UIRadioButton lineEngine = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_New_Engine"), false);
-        UIRadioButton newEngine = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Line_Engine"), false);
+        return advicePane;
+    }
 
+    private JPanel createPagingEngineRadioPanel(){
+        UIRadioButton newEngine = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_New_Engine"), false);
+        UIRadioButton lineEngine = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Line_Engine"), false);
         ButtonGroup buttonGroup = new ButtonGroup();
         buttonGroup.add(newEngine);
         buttonGroup.add(lineEngine);
-        radioButtons.add(lineEngine);
         radioButtons.add(newEngine);
-
+        radioButtons.add(lineEngine);
         double p = TableLayout.PREFERRED;
         double[] rowSize = {p};
         double[] columnSize = {p, p, p, p, p};
         Component[][] components = new Component[][]{
                 new Component[] {
-                        new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Page_Engine_Select")),
-                        lineEngine,
-                        newEngine
+                        newEngine,
+                        lineEngine
                 }
         };
         JPanel pagingEngineRadioPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
-        layerReportPane.add(pagingEngineRadioPanel);
-
-        JPanel infoPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Attention"));
-        FRExplainLabel label = new FRExplainLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Layer_Report_Warnning_Info"));
-        label.setPreferredSize(new Dimension(label.getPreferredSize().width, LABEL_HEIGHT));
-        infoPane.add(label);
-        layerReportPane.add(infoPane);
-
-        JPanel isShowDataNumberPanle = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-        isShowDataNumber = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Data_Total_Number"));
-        isShowDataNumber.setSelected(false);
-        isShowDataNumberPanle.add(isShowDataNumber);
-        layerReportPane.add(isShowDataNumberPanle);
-
-        JPanel isPageQueryBoxPanle = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-        isPageQueryBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fixed_Line_Paging"));
-        isPageQueryBox.setSelected(false);
-        isPageQueryBox.setEnabled(false);
-        isPageQueryBoxPanle.add(isPageQueryBox);
-        layerReportPane.add(isPageQueryBoxPanle);
-        isPageQueryBox.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent arg0) {
-                if (isPageQueryBox.isSelected()) {
-                    countPerPageEditor.setEnabled(true);
-                } else {
-                    countPerPageEditor.setEnabled(false);
-                }
-            }
-        });
-
-        JPanel pageQueryPane = createPageQueryPane();
-        layerReportPane.add(pageQueryPane);
-
-    }
-
-    private JPanel createPageQueryPane() {
-        double p = TableLayout.PREFERRED;
-        double rowSize[] = {p, p};
-        double columnSize[] = {p, p};
-        countPerPageEditor = new IntegerEditor(new Integer(30));
-        countPerPageEditor.setPreferredSize(new Dimension(120,20));
-        countPerPageEditor.setEnabled(false);
-        Component[][] components = {{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_LayerPageReport_Count_PerPage") + ":"), countPerPageEditor}};
-        JPanel pageQueryPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
-        pageQueryPane.setBorder(BorderFactory.createEmptyBorder(5, 15, 0, 0));
-        return pageQueryPane;
+        newEngine.addActionListener(new SelectActionListener(newEngine, outEngineXSettingPane));
+        lineEngine.addActionListener(new SelectActionListener(lineEngine, outEngineXSettingPane));
+        return pagingEngineRadioPanel;
     }
 
     @Override
@@ -152,28 +202,36 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
             setDefaultAttr();
             return;
         }
-        isClientPaging.setSelected(ob.isClientPaging());
-        isShowDataNumber.setSelected(ob.isShowDataNumber());
+        clientPaging.setSelected(ob.isClientPaging());
+        if (clientPaging.isSelected()){
+            outPagingEngineSelectPane.setVisible(true);
+        }
         countPerPageEditor.setValue(new Integer(ob.getCountPerPage()));
         if (ob.isPageQuery()) {
-            isPageQueryBox.setSelected(true);
+            pageQueryBox.setSelected(true);
             countPerPageEditor.setEnabled(true);
         } else {
-            isPageQueryBox.setSelected(false);
+            pageQueryBox.setSelected(false);
             countPerPageEditor.setEnabled(false);
         }
-        radioButtons.get(0).setSelected(ob.getEngineState() == LayerReportAttr.ENGINE_X ? true : false);
-        radioButtons.get(1).setSelected(ob.getEngineState() == LayerReportAttr.LINE_ENGINE ? true : false);
+        if (pageQueryBox.isSelected()){
+            pageQueryPane.setVisible(true);
+        }
+        radioButtons.get(0).setSelected(ob.getEngineState() == LayerReportAttr.ENGINE_X);
+        radioButtons.get(1).setSelected(ob.getEngineState() == LayerReportAttr.LINE_ENGINE);
+        //有一个默认值，一定会显示分页选项界面
+        outEngineXSettingPane.setVisible(true);
+
     }
 
     @Override
     public LayerReportAttr updateBean() {
         //这里注意一下怎么更新的，后续可能存在判断为空的调用，从而对老引擎造成影响。
         LayerReportAttr attr = new LayerReportAttr();
-        attr.setPageQuery(isPageQueryBox.isSelected());
-        attr.setCountPerPage(Math.min(500, ((Integer)countPerPageEditor.getValue()).intValue()));
-        attr.setClientPaging(isClientPaging.isSelected());
-        attr.setShowDataNumber(isShowDataNumber.isSelected());
+        attr.setPageQuery(pageQueryBox.isSelected());
+        attr.setCountPerPage(Math.min(500, (countPerPageEditor.getValue()).intValue()));
+        attr.setClientPaging(clientPaging.isSelected());
+        attr.setShowDataNumber(showDataNumber.isSelected());
         for (int i = 0; i < radioButtons.size(); i++){
             if (radioButtons.get(i).isSelected()){
                 attr.setEngineState(i);
@@ -184,25 +242,40 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
 
     @Override
     public void checkValid() throws Exception {
-        if (isClientPaging.isSelected()) {
+        if (clientPaging.isSelected()) {
             if (!ReportUtils.isLayerReportUsable(worksheet)) {
                 int value = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_After_Changed_Some_Attributes_Are_Different") + "?",
                         com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
                 if (value != JOptionPane.YES_OPTION) {
-                    isClientPaging.setSelected(false);
+                    clientPaging.setSelected(false);
                 }
             }
         }
     }
     public void setDefaultAttr(){
-        isClientPaging.setSelected(false);
-        isShowDataNumber.setSelected(false);
-        countPerPageEditor.setValue(new Integer(30));
+        clientPaging.setSelected(false);
+        countPerPageEditor.setValue(30);
         countPerPageEditor.setEnabled(false);
-        isPageQueryBox.setSelected(false);
-        isPageQueryBox.setEnabled(false);
+        pageQueryBox.setSelected(false);
         radioButtons.get(0).setSelected(false);
         radioButtons.get(1).setSelected(false);
     }
+
+    private class SelectActionListener implements ActionListener {
+        private AbstractButton source;
+        private JPanel target;
+        private SelectActionListener(AbstractButton source,  JPanel target){
+            this.source = source;
+            this.target = target;
+        }
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            if (source.isSelected()){
+                target.setVisible(true);
+            }else {
+                target.setVisible(false);
+            }
+        }
+    }
 }