Merge branch 'release/11.0' of https://code.fineres.com/scm/~carlson/design into release/11.0

designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java

@@ -3,39 +3,28 @@
  */
 package com.fr.design.data.datapane.preview;
 
+import com.fr.base.BaseUtils;
 import com.fr.base.TableData;
-import com.fr.base.svg.IconUtils;
 import com.fr.data.TableDataSource;
-import com.fr.data.desensitize.base.DesensitizationTableData;
 import com.fr.data.impl.DBTableData;
 import com.fr.data.impl.EmbeddedTableData;
 import com.fr.data.impl.NameDataModel;
 import com.fr.data.operator.DataOperator;
 import com.fr.design.DesignerEnvManager;
-import com.fr.design.constants.UIConstants;
 import com.fr.design.data.DesignTableDataManager;
-import com.fr.design.data.datapane.preview.desensitization.TableDataPreviewDesensitizeManager;
-import com.fr.design.data.datapane.preview.desensitization.model.DesensitizedPreviewTableModel;
-import com.fr.design.data.datapane.preview.desensitization.view.setting.TableDataDesensitizationSettingPane;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
-import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.gui.frpane.UITabbedPane;
-import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.iprogressbar.AutoProgressBar;
 import com.fr.design.gui.itable.SortableJTable;
 import com.fr.design.gui.itable.TableSorter;
 import com.fr.design.gui.itextfield.UINumberField;
-import com.fr.design.gui.itoolbar.UIToolbar;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.mainframe.JTemplate;
-import com.fr.design.menu.SeparatorDef;
-import com.fr.design.menu.ToolBarDef;
 import com.fr.design.ui.util.UIUtil;
 import com.fr.function.TIME;
 import com.fr.general.FRFont;
@@ -50,7 +39,6 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
-import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
 import javax.swing.UIManager;
 import javax.swing.table.DefaultTableCellRenderer;
@@ -69,19 +57,12 @@ import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.concurrent.CancellationException;
 
 /**
  * august： PreviewTablePane一共提供5个共有的静态方法，用来预览。
  */
 public class PreviewTablePane extends BasicPane {
-
-    private static final String DATA_DESENSITIZATION_CONFIG = Toolkit.i18nText("Fine-Design_Report_Desensitization_Config");
-    private static final String LEFT_BRACKET = "(";
-    private static final String RIGHT_BRACKET = ")";
-    private static final String COUNT = Toolkit.i18nText("Fine-Design_Report_Desensitization_Count");
-
     private TableData tableData;
     private DataModel dataModel;
     private UINumberField maxPreviewNumberField;
@@ -97,54 +78,6 @@ public class PreviewTablePane extends BasicPane {
     private static PreviewTablePane THIS;
     private EmbeddedTableData previewTableData;
 
-    private UILabel desensitizationLabel;
-
-    /**
-     * 用于refreshLabel的鼠标监听
-     */
-    private final MouseAdapter refreshLabelMouseAdapter = new MouseAdapter() {
-        boolean mouseEntered = false;
-        boolean buttonPressed = false;
-
-        @Override
-        public void mouseEntered(MouseEvent e) { // 当鼠标进入时候调用.
-            mouseEntered = true;
-            if (!buttonPressed) {
-                refreshLabel.setBackground(java.awt.Color.WHITE);
-                refreshLabel.setOpaque(true);
-                refreshLabel.setBorder(BorderFactory.createLineBorder(java.awt.Color.GRAY));
-            }
-        }
-
-        @Override
-        public void mouseExited(MouseEvent e) {
-            mouseEntered = false;
-            refreshLabel.setOpaque(false);
-            refreshLabel.setBorder(BorderFactory.createEmptyBorder());
-        }
-
-        @Override
-        public void mousePressed(MouseEvent e) {
-            buttonPressed = true;
-            refreshLabel.setBackground(java.awt.Color.lightGray);
-        }
-
-        @Override
-        public void mouseReleased(MouseEvent e) {
-            buttonPressed = false;
-            if (mouseEntered) {
-                refreshLabel.setBackground(java.awt.Color.WHITE);
-                try {
-                    populate(tableData);
-                    if (dataModel != null) {
-                        setRowsLimitTableModel();
-                    }
-                } catch (Exception ignore) {
-                }
-            }
-        }
-    };
-
     public static final PreviewTablePane getInstance() {
         if (THIS == null) {
             THIS = new PreviewTablePane();
@@ -154,175 +87,91 @@ public class PreviewTablePane extends BasicPane {
 
     private PreviewTablePane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        // northPane
-        this.add(initNorthPane(), BorderLayout.NORTH);
-        // centerPane
-        this.add(initCenterPane(), BorderLayout.CENTER);
-        // dialog
-        initDialog();
-        // progressBar
-        initProgressBar();
-    }
 
-    /**
+        // elalke:预览行数
-     * 初始化northPane
-     *
-     * @return
-     */
-    private JComponent initNorthPane() {
-        JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        // 预览行数面板
-        northPane.add(initPreviewNumberPane(), BorderLayout.CENTER);
-        // 脱敏预览设置面板
-        northPane.add(initDesensitizationPane(), BorderLayout.EAST);
-        return northPane;
-    }
-
-    /**
-     * 初始化预览行数面板
-     *
-     * @return
-     */
-    private JComponent initPreviewNumberPane() {
         JPanel previewNumberPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-        // 当前行数
+        this.add(previewNumberPanel, BorderLayout.NORTH);
+
         JPanel currentPreviewPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        previewNumberPanel.add(currentPreviewPanel);
         currentPreviewPanel.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Current_Preview_Rows") + ":"));
+
         currentRowsField = new UINumberField();
         currentPreviewPanel.add(currentRowsField);
         currentRowsField.setEditable(false);
         currentRowsField.setColumns(4);
         currentRowsField.setInteger(true);
-        // 最大行数
+
         JPanel maxPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        previewNumberPanel.add(maxPanel);
         maxPanel.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Datasource_Maximum_Number_of_Preview_Rows") + ":"));
+
         maxPreviewNumberField = new UINumberField();
         maxPanel.add(maxPreviewNumberField);
         maxPreviewNumberField.setColumns(4);
         maxPreviewNumberField.setInteger(true);
-        maxPreviewNumberField.setValue(DesignerEnvManager.getEnvManager().getMaxNumberOrPreviewRow());
+
+        DesignerEnvManager designerEnvManager = DesignerEnvManager.getEnvManager();
+        maxPreviewNumberField.setValue(designerEnvManager.getMaxNumberOrPreviewRow());
+
         maxPreviewNumberField.addActionListener(new ActionListener() {
-            @Override
             public void actionPerformed(ActionEvent evt) {
                 DesignerEnvManager designerEnvManager = DesignerEnvManager.getEnvManager();
                 designerEnvManager.setMaxNumberOrPreviewRow((int) ((UINumberField) evt.getSource()).getValue());
             }
         });
-        // 刷新按钮
-        initRefreshLabel();
-
-        previewNumberPanel.add(currentPreviewPanel);
-        previewNumberPanel.add(maxPanel);
-        previewNumberPanel.add(refreshLabel);
-        return previewNumberPanel;
-    }
 
-    private void initRefreshLabel() {
+        Icon refreshImage = BaseUtils.readIcon("/com/fr/design/images/control/refresh.png");
-        Icon refreshImage = IconUtils.readIcon("/com/fr/design/images/control/refresh");
         refreshLabel = new UILabel(refreshImage);
-        refreshLabel.addMouseListener(refreshLabelMouseAdapter);
+        previewNumberPanel.add(refreshLabel);
-    }
+        refreshLabel.addMouseListener(new MouseAdapter() {
+            boolean mouseEntered = false;
+            boolean buttonPressed = false;
 
-    /**
+            public void mouseEntered(MouseEvent e) { // 当鼠标进入时候调用.
-     * 初始化脱敏设置面板
+                mouseEntered = true;
-     *
+                if (!buttonPressed) {
-     * @return
+                    refreshLabel.setBackground(java.awt.Color.WHITE);
-     */
+                    refreshLabel.setOpaque(true);
-    private JComponent initDesensitizationPane() {
+                    refreshLabel.setBorder(BorderFactory.createLineBorder(java.awt.Color.GRAY));
-        JPanel desensitizationPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-        // 初始化Label
-        desensitizationLabel = new UILabel(DATA_DESENSITIZATION_CONFIG);
-        desensitizationLabel.setForeground(UIConstants.NORMAL_BLUE);
-        desensitizationLabel.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseClicked(MouseEvent e) {
-                TableDataDesensitizationSettingPane settingPane = new TableDataDesensitizationSettingPane((DesensitizationTableData) tableData);
-                settingPane.populateBean((DesensitizationTableData) tableData);
-                BasicDialog dialog = settingPane.showWindowWithCustomSize(SwingUtilities.getWindowAncestor(PreviewTablePane.this), new DialogActionAdapter() {
-                    @Override
-                    public void doOk() {
-                        // 保存脱敏规则配置
-                        settingPane.updateBean();
-                        // 改变模板保存状态
-                        JTemplate<?, ?> editingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-                        if (Objects.nonNull(editingTemplate)) {
-                            editingTemplate.fireTargetModified(true);
                 }
             }
 
-                    @Override
+            public void mouseExited(MouseEvent e) {
-                    public void doCancel() {
+                mouseEntered = false;
-
+                refreshLabel.setOpaque(false);
-                    }
+                refreshLabel.setBorder(BorderFactory.createEmptyBorder());
-                }, BasicDialog.DEFAULT);
-                dialog.setVisible(true);
-                // 关闭预览页面
-                PreviewTablePane.this.dialog.setVisible(false);
             }
-        });
 
-        // 初始化分隔符
+            public void mousePressed(MouseEvent e) {
-        ToolBarDef toolbarDef = new ToolBarDef();
+                buttonPressed = true;
-        toolbarDef.addShortCut(SeparatorDef.DEFAULT);
+                refreshLabel.setBackground(java.awt.Color.lightGray);
-        UIToolbar toolBar = ToolBarDef.createJToolBar();
-        toolBar.setBorderPainted(false);
-        toolbarDef.updateToolBar(toolBar);
-
-        // 初始化预览按钮
-        UIToggleButton previewToggle = new UIToggleButton(new Icon[]{IconUtils.readIcon("/com/fr/design/images/m_file/preview"), IconUtils.readIcon("/com/fr/design/images/m_file/preview")}, true);
-        previewToggle.setToolTipText(Toolkit.i18nText("Fine-Design_Report_Desensitization_Preview"));
-        previewToggle.setSelected(false);
-        previewToggle.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                // 切换TableModel的脱敏状态
-                togglePreviewTableModelDesensitizeStatus();
-                // 刷新页面，展示
-                refreshTable();
             }
-        });
 
-        desensitizationPane.add(desensitizationLabel);
+            public void mouseReleased(MouseEvent e) {
-        desensitizationPane.add(toolBar);
+                buttonPressed = false;
-        desensitizationPane.add(previewToggle);
+                if (mouseEntered) {
-        return desensitizationPane;
+                    refreshLabel.setBackground(java.awt.Color.WHITE);
+                    try {
+                        populate(tableData);
+                        if (dataModel != null) {
+                            setRowsLimitTableModel();
+                        }
+                    } catch (Exception e1) {
                     }
-
-    /**
-     * 设置脱敏设置的个数
-     *
-     * @param model
-     */
-    private void setDesensitizationCount(TableModel model) {
-        if (isDesensitizeOpened()) {
-            int count = model instanceof DesensitizedPreviewTableModel ? ((DesensitizedPreviewTableModel) model).getDesensitizeColumnsCount() : 0;
-            desensitizationLabel.setText(DATA_DESENSITIZATION_CONFIG + LEFT_BRACKET + count + RIGHT_BRACKET + COUNT);
-        } else {
-            desensitizationLabel.setText(DATA_DESENSITIZATION_CONFIG);
                 }
             }
+        });
 
-    /**
-     * 初始化centerPane
-     *
-     * @return
-     */
-    private JComponent initCenterPane() {
         preveiwTable = new CopyableJTable(new TableSorter());
         preveiwTable.setRowSelectionAllowed(false);
         preveiwTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
-        return new JScrollPane(preveiwTable);
-    }
 
-    private void initDialog() {
+        this.add(new JScrollPane(preveiwTable), BorderLayout.CENTER);
         if (this.dialog == null) {
             this.dialog = this.showWindow(new JFrame());
         }
-    }
-
-    private void initProgressBar() {
         progressBar = new AutoProgressBar(this, Toolkit.i18nText("Fine-Design_Basic_Loading_Data"), "", 0, 100) {
-            @Override
             public void doMonitorCanceled() {
                 if (getWorker() != null) {
                     getWorker().cancel(true);
@@ -333,7 +182,7 @@ public class PreviewTablePane extends BasicPane {
     }
 
     public AutoProgressBar getProgressBar() {
-        return PreviewTablePane.progressBar;
+        return this.progressBar;
     }
 
     @Override
@@ -374,10 +223,9 @@ public class PreviewTablePane extends BasicPane {
     }
 
     /**
-     * 为预览表的columnIndex列着色.
+     * elake:为预览表的columnIndex列着色.
-     *
+     * @param columnIndex
-     * @param columnIndex 列索引值
+     * @param c
-     * @param c           颜色
      */
     private void setPreviewTableColumnColor(final int columnIndex, final Color c) {
         addLoadedListener(new LoadedEventListener() {
@@ -385,7 +233,6 @@ public class PreviewTablePane extends BasicPane {
             public void fireLoaded() {
                 TableColumn column = preveiwTable.getColumnModel().getColumn(columnIndex);
                 DefaultTableCellRenderer cellRenderer = new DefaultTableCellRenderer() {
-                    @Override
                     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
                         JComponent comp = (JComponent) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
                         comp.setBackground(c);
@@ -406,7 +253,7 @@ public class PreviewTablePane extends BasicPane {
         getInstance().preveiwTable = new SortableJTable(new TableSorter());
         getInstance().preveiwTable.setRowSelectionAllowed(false);
         getInstance().preveiwTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
-        PreviewTablePane.progressBar.close();
+        getInstance().progressBar.close();
         getInstance().repaint();
     }
 
@@ -488,7 +335,6 @@ public class PreviewTablePane extends BasicPane {
 
     private void previewTableDataSQL() throws Exception {
         connectionBar = new AutoProgressBar(this, Toolkit.i18nText("Fine-Design_Basic_Utils_Now_Create_Connection"), "", 0, 100) {
-            @Override
             public void doMonitorCanceled() {
                 getWorker().cancel(true);
                 getDialog().setVisible(false);
@@ -503,19 +349,7 @@ public class PreviewTablePane extends BasicPane {
     private void setPreviewTableColumnValue(final Graphics g) {
         for (int i = 0; i < preveiwTable.getColumnModel().getColumnCount(); i++) {
             TableColumn column = preveiwTable.getColumnModel().getColumn(i);
-            DefaultTableCellRenderer cellRenderer = getDefaultTableCellRenderer();
+            DefaultTableCellRenderer cellRenderer = new DefaultTableCellRenderer() {
-            column.setCellRenderer(cellRenderer);
-        }
-    }
-
-    /**
-     * 默认表格格子渲染器
-     *
-     * @return
-     */
-    private DefaultTableCellRenderer getDefaultTableCellRenderer() {
-        return new DefaultTableCellRenderer() {
-            @Override
                 public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
                     JComponent comp = (JComponent) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
                     Font f = table.getFont();
@@ -534,18 +368,23 @@ public class PreviewTablePane extends BasicPane {
                     return comp;
                 }
             };
+            column.setCellRenderer(cellRenderer);
+        }
     }
 
 
     private void setWorker() {
 
-        worker = new SwingWorker<TableModel, Void>() {
+        worker = new SwingWorker<PreviewTableModel, Void>() {
-
+            protected PreviewTableModel doInBackground() throws Exception {
-            @Override
-            protected TableModel doInBackground() throws Exception {
                 connectionBar.start();
                 try {
-                    testDBTableDataConnection(tableData);
+                    if (tableData instanceof DBTableData) {
+                        boolean status = DataOperator.getInstance().testConnection(((DBTableData) tableData).getDatabase());
+                        if (!status) {
+                            throw new Exception(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
+                        }
+                    }
                 } finally {
                     // 将close操作放到EDT线程中
                     UIUtil.invokeLaterIfNeeded(() -> connectionBar.close());
@@ -555,20 +394,22 @@ public class PreviewTablePane extends BasicPane {
                 // parameterInputDialog
                 // update之后的parameters,转成一个parameterMap,用于预览TableData
                 PreviewTableModel previewModel = new PreviewTableModel(previewTableData.createDataModel(null), (int) maxPreviewNumberField.getValue());
-                if (TableDataPreviewDesensitizeManager.getInstance().needDesensitize(tableData)) {
+                for (int i = 0; i < previewTableData.getColumnCount(); i++) {
-                    // 数据集预览脱敏
+                    Class<?> cls = previewTableData.getColumnClass(i);
-                    previewModel = TableDataPreviewDesensitizeManager.getInstance().desensitizeTableModel(tableData, previewModel);
+                    if (cls == Date.class || cls == TIME.class || cls == Timestamp.class) {
+                        previewModel.dateIndexs.add(i);
+                    }
                 }
-                dealWithPreviewTableModelColumnClass(previewModel, previewTableData);
                 return previewModel;
             }
 
-            @Override
             public void done() {
                 try {
-                    TableModel model = get();
+                    PreviewTableModel model = get();
-                    setPreviewTableModel(model);
+                    setModel(model);
+                    setCurrentRows(model.getRowCount());
                     setPreviewTableColumnValue(getParent().getGraphics());
+                    fireLoadedListener();
                 } catch (Exception e) {
                     if (!(e instanceof CancellationException)) {
                         FineLoggerFactory.getLogger().error(e.getMessage(), e);
@@ -583,36 +424,6 @@ public class PreviewTablePane extends BasicPane {
         };
     }
 
-    /**
-     * 检查DBTableData连接
-     *
-     * @param tableData
-     * @throws Exception
-     */
-    private void testDBTableDataConnection(TableData tableData) throws Exception {
-        if (tableData instanceof DBTableData) {
-            boolean status = DataOperator.getInstance().testConnection(((DBTableData) tableData).getDatabase());
-            if (!status) {
-                throw new Exception(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
-            }
-        }
-    }
-
-    /**
-     * 处理预览Model的列类型
-     *
-     * @param previewModel
-     * @param previewTableData
-     */
-    private void dealWithPreviewTableModelColumnClass(PreviewTableModel previewModel, EmbeddedTableData previewTableData) {
-        for (int i = 0; i < previewTableData.getColumnCount(); i++) {
-            Class<?> cls = previewTableData.getColumnClass(i);
-            if (cls == Date.class || cls == TIME.class || cls == Timestamp.class) {
-                previewModel.dateIndexs.add(i);
-            }
-        }
-    }
-
     /**
      * 直接预览存储过程的一个返回数据集，没有实际值和显示值
      *
@@ -721,61 +532,9 @@ public class PreviewTablePane extends BasicPane {
         } catch (Exception e) {
             previewModel = new PreviewTableModel((int) maxPreviewNumberField.getValue());
         }
-        setPreviewTableModel(previewModel);
+        setModel(previewModel);
-
+        setCurrentRows(previewModel.getRowCount());
-    }
-
-    /**
-     * 切换TableModel的展示状态
-     */
-    private void togglePreviewTableModelDesensitizeStatus() {
-        if (!isDesensitizeOpened()) {
-            // 未启用数据脱敏时，不需要切换
-            return;
-        }
-        TableSorter tableSorter = (TableSorter) preveiwTable.getModel();
-        TableModel originTableModel = tableSorter.getTableModel();
-        if (originTableModel instanceof DesensitizedPreviewTableModel) {
-            ((DesensitizedPreviewTableModel) originTableModel).toggleNeedDesensite();
-        }
-    }
-
-    /**
-     * 刷新一下预览页面，用于切换脱敏和非脱敏时的显示
-     */
-    private void refreshTable() {
-        TableModel originTableModel = getCurrentTableModel();
-        setPreviewTableModel(originTableModel);
-    }
-
-    /**
-     * 获取当前的TableModel，已经除掉了TableSorter的包装
-     *
-     * @return
-     */
-    private TableModel getCurrentTableModel() {
-        TableSorter tableSorter = (TableSorter) preveiwTable.getModel();
-        return tableSorter.getTableModel();
-    }
-
-    /**
-     * 设置预览TableModel
-     *
-     * @param previewTableModel
-     */
-    private void setPreviewTableModel(TableModel previewTableModel) {
-        setDesensitizationCount(previewTableModel);
-        setModel(previewTableModel);
-        setCurrentRows(previewTableModel.getRowCount());
         fireLoadedListener();
-    }
 
-    /**
-     * 数据脱敏是否启用
-     * @return
-     */
-    private boolean isDesensitizeOpened() {
-        return tableData instanceof DesensitizationTableData &&
-                ((DesensitizationTableData) tableData).getDesensitizationConfig().isDesensitizeOpened();
     }
 }

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

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe;
 
+import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.file.TemplateTreePane;
 import com.fr.design.gui.itree.filetree.TemplateFileTree;
 import com.fr.stable.StringUtils;
@@ -19,8 +20,6 @@ public class JTemplateNameHelper {
 
     private static final int PREFIX_NUM = 3000;
 
-    private static short currentIndex = 0;// 此变量用于多次新建模板时，让名字不重复
-
     public static String newTemplateNameByIndex(String prefix) {
         // 用于获取左侧模板的文件名，如左侧已包含"WorkBook1.cpt, WorkBook12.cpt, WorkBook177.cpt"
         // 那么新建的文件名将被命名为"WorkBook178.cpt",即取最大数+1
@@ -37,13 +36,33 @@ public class JTemplateNameHelper {
                 reportNum.add(index);
             }
         }
+        //把当前编辑面板的模板名也加进来判断
+        addHistoryTemplateName2List(reportNum, prefix);
         Collections.sort(reportNum);
         BigInteger idx = reportNum.size() > 0 ? reportNum.get(reportNum.size() - 1).add(BigInteger.valueOf(1)) : BigInteger.valueOf(1);
-        idx = idx.add(BigInteger.valueOf(currentIndex));
-        currentIndex++;
         return prefix + idx;
     }
 
+    /**
+     * 将当前打开的模板列表的模板名处理一下加进来，以便于获取左侧模板文件名与当前模板列表的最大值
+     *
+     * @param reportNum 存储后缀的列表
+     * @param prefix    前缀
+     */
+    private static void addHistoryTemplateName2List(List<BigInteger> reportNum, String prefix) {
+        int len = HistoryTemplateListCache.getInstance().getHistoryCount();
+        for (int i = 0; i < len; i++) {
+            JTemplate<?, ?> jTemplate = HistoryTemplateListCache.getInstance().get(i);
+            if (jTemplate != null) {
+                String templateName = jTemplate.getTemplateName();
+                BigInteger index = getFileNameIndex(prefix, templateName);
+                if (index != null) {
+                    reportNum.add(index);
+                }
+            }
+        }
+    }
+
     /**
      * @return java.lang.Integer WorkBook11.cpt则返回11，如果没有找到index返回null
      * @Description 返回文件名中的index

designer-base/src/main/java/com/fr/startup/ui/StartupPageWorkspacePanel.java

@@ -4,6 +4,7 @@ import com.fr.base.svg.IconUtils;
 import com.fr.design.components.tooltip.ModernToolTip;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.itextfield.FRGraphics2D;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.ColorUtils;
@@ -17,6 +18,8 @@ import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JToolTip;
+import javax.swing.JViewport;
+import javax.swing.RepaintManager;
 import javax.swing.ScrollPaneConstants;
 import javax.swing.border.EmptyBorder;
 import java.awt.BasicStroke;
@@ -28,9 +31,11 @@ import java.awt.Font;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.GridLayout;
+import java.awt.Image;
 import java.awt.RenderingHints;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.image.ImageObserver;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -127,9 +132,15 @@ public class StartupPageWorkspacePanel extends JPanel {
         this.contentPanel = generateUnLimitContentPanel(this.partitions);
         this.add(contentPanel, BorderLayout.NORTH);
     }
-    
     private JComponent generateUnLimitContentPanel(List<List<StartupWorkspaceBean>> partitions) {
     
+        JComponent panel = generateUnLimitContentPanel0(partitions);
+        ColorUtils.transparentBackground(panel);
+        return panel;
+    }
+    
+    private JComponent generateUnLimitContentPanel0(List<List<StartupWorkspaceBean>> partitions) {
+    
         JPanel workspaceDescWrapper = new JPanel();
         workspaceDescWrapper.setLayout(new BorderLayout(0, 0));
         workspaceDescWrapper.setBorder(new EmptyBorder(0, 0, 0, 0));
@@ -142,16 +153,28 @@ public class StartupPageWorkspacePanel extends JPanel {
         }
         boolean needScroll = partitions.size() > 4;
         if (needScroll) {
+            return generateScrollUnLimitContentPanel(workspaceDescWrapper, workspaceDescPanel);
+        }
+        workspaceDescWrapper.add(workspaceDescPanel, BorderLayout.CENTER);
+        
+        return workspaceDescWrapper;
+    }
+    
+    @NotNull
+    private JPanel generateScrollUnLimitContentPanel(JPanel workspaceDescWrapper, JPanel workspaceDescPanel) {
+        
         // 滚动条
         UIScrollPane scrollPane = new UIScrollPane(workspaceDescPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+        JViewport viewport = scrollPane.getViewport();
+        JViewport scrollViewport = new TransparentScrollViewPort();
+        // 动态画图
+        scrollViewport.addChangeListener(e -> repaintAll());
+        scrollViewport.setView(viewport.getView());
+        scrollPane.setViewport(scrollViewport);
         scrollPane.setBorder(new EmptyBorder(10, 0, 0, 0));
         scrollPane.setPreferredSize(new Dimension(CONTENT_WIDTH, SCROLL_HEIGHT));
         workspaceDescWrapper.add(scrollPane, BorderLayout.CENTER);
-            return workspaceDescWrapper;
-        }
-        workspaceDescWrapper.add(workspaceDescPanel, BorderLayout.CENTER);
         
-        ColorUtils.transparentBackground(workspaceDescWrapper);
         return workspaceDescWrapper;
     }
     
@@ -580,4 +603,27 @@ public class StartupPageWorkspacePanel extends JPanel {
         
         this.getRootPane().repaint();
     }
+    
+    /**
+     * 支持透明的滚动视图
+     */
+    private class TransparentScrollViewPort extends JViewport {
+    
+        /**
+         * 从而屏蔽掉 {@link RepaintManager.PaintManager#paintDoubleBuffered(JComponent, Image, Graphics, int, int, int, int)}
+         *
+         * @return 创建一个不会实际画图的 Graphics
+         */
+        @Override
+        public Graphics getGraphics() {
+        
+            Graphics graphics = super.getGraphics();
+            return new FRGraphics2D((Graphics2D) graphics) {
+                @Override
+                public boolean drawImage(Image img, int x, int y, ImageObserver observer) {
+                    return true;
+                }
+            };
+        }
+    }
 }

designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties

@@ -15,6 +15,7 @@ com.fr.design.report.fit.firstColumn=120*20
 com.fr.design.report.fit.column=160*20
 com.fr.design.lock.LockInfoDialog=500*180
 com.fr.design.mainframe.ForbiddenPane.refreshButton=75*24
+com.fr.start.common.DesignerOpenEmptyPanel.createButton=120*24
 com.fr.design.cell.expand.sort.pane=257*185
 com.fr.design.sort.rule.item=125*20
 com.fr.design.ds.column.sort.pane=250*180

designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties

@@ -14,6 +14,7 @@ com.fr.design.report.fit.firstColumn=170*20
 com.fr.design.report.fit.column=100*20
 com.fr.design.lock.LockInfoDialog=500*180
 com.fr.design.mainframe.ForbiddenPane.refreshButton=68*24
+com.fr.start.common.DesignerOpenEmptyPanel.createButton=70*24
 com.fr.design.cell.expand.sort.pane=257*170
 com.fr.design.sort.rule.item=125*20
 com.fr.design.ds.column.sort.pane=250*165

designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties

@@ -14,6 +14,7 @@ com.fr.design.report.fit.firstColumn=130*20
 com.fr.design.report.fit.column=100*20
 com.fr.design.lock.LockInfoDialog=500*180
 com.fr.design.mainframe.ForbiddenPane.refreshButton=80*24
+com.fr.start.common.DesignerOpenEmptyPanel.createButton=70*24
 com.fr.design.cell.expand.sort.pane=267*165
 com.fr.design.sort.rule.item=125*20
 com.fr.design.ds.column.sort.pane=250*180

designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties

@@ -14,6 +14,7 @@ com.fr.design.report.fit.firstColumn=80*20
 com.fr.design.report.fit.column=100*20
 com.fr.design.lock.LockInfoDialog=400*180
 com.fr.design.mainframe.ForbiddenPane.refreshButton=68*24
+com.fr.start.common.DesignerOpenEmptyPanel.createButton=70*24
 com.fr.design.cell.expand.sort.pane=227*155
 com.fr.design.sort.rule.item=80*20
 com.fr.design.ds.column.sort.pane=220*150

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/ColorPickerPaneNumFiled.java

@@ -6,6 +6,7 @@ import com.fr.module.ModuleContext;
 import com.fr.value.ClearableLazyValue;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.SwingUtilities;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
@@ -32,12 +33,9 @@ public class ColorPickerPaneNumFiled extends UINumberField {
 
     @Override
     protected void attributeChange() {
-        ses.getValue().schedule(new Runnable() {
+        ses.getValue().schedule(() -> {
-            @Override
-            public void run() {
             // kuns: 默认修改500, 在地图修改系列颜色text时, 快速响应.
-                runChange();
+            SwingUtilities.invokeLater(this::runChange);
-            }
         }, 500, TimeUnit.MILLISECONDS);
     }
 

designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/chart/SearchChartCollectionFormulaAction.java

@@ -34,6 +34,7 @@ import com.fr.plugin.chart.custom.CustomPlotFactory;
 import com.fr.plugin.chart.custom.VanChartCustomPlot;
 
 import com.fr.plugin.chart.custom.type.CustomPlotType;
+import com.fr.plugin.chart.drillmap.VanChartDrillMapPlot;
 import com.fr.plugin.chart.map.VanChartMapPlot;
 import com.fr.stable.StringUtils;
 
@@ -106,6 +107,10 @@ public class SearchChartCollectionFormulaAction {
                 customContent.addOtherPos(CustomPlotFactory.getTitle(CustomPlotFactory.getCustomType(plot.getCustomPlotList().get(i))));
                 dealPlot(formulaInfos, customContent, plot.getCustomPlotList().get(i));
             }
+        } else if (chart.getPlot() instanceof VanChartDrillMapPlot) {
+            ITContent drillContent = ITContent.copy(conditionContent);
+            drillContent.addOtherPos(Toolkit.i18nText("Fine-Design_Chart_Drill_Dir"));
+            dealNameJavaScriptGroup(formulaInfos, drillContent, ((VanChartDrillMapPlot) chart.getPlot()).getDrillUpHyperLink());
         } else if (chart.getPlot() != null) {
             dealPlot(formulaInfos, conditionContent, chart.getPlot());
         }

designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceMainDialog.java

@@ -138,7 +138,7 @@ public class ITReplaceMainDialog extends UIDialog {
         southPanel = new ITReplaceSouthPanel();
         westPanel = new ITReplaceWestPanel();
 
-        initCloseListener();
+        //initCloseListener();
         northPane.fitScreen(0, 0, jTemplate.getWidth());
 
         JPanel center = new JPanel(new BorderLayout());
@@ -212,7 +212,7 @@ public class ITReplaceMainDialog extends UIDialog {
      * 模板内容替换相关
      */
     private void replace4Content() {
-        String type = ((UITextField) (northPane.getFindCombobox().getEditor().getEditorComponent())).getText();
+        String type = GeneralUtils.objectToString(northPane.getFindCombobox().getSelectedItem());
         String searchStr = ((UITextField) (northPane.getFindInputCombobox().getEditor().getEditorComponent())).getText();
         String replaceStr = ((UITextField) (northPane.getReplaceInputCombobox().getEditor().getEditorComponent())).getText();
         clearContentCount();
@@ -257,15 +257,19 @@ public class ITReplaceMainDialog extends UIDialog {
      * @param replaceStr
      */
     public void replace(String searchStr, String replaceStr) {
-        HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified(true);
         for (Info info : searchContentResultList) {
-            if (!info.getContent().isWrongful() && info.getContent().isSelected()) {
+            if (!info.getContent().isWrongful() && isSupportReplace(info)) {
                 info.setValue(info, searchStr, replaceStr, info.getContent().getOperatorArray());
+                contentReplaceCount++;
+            }
+            if (info.getContent().isWrongful()) {
+                contentReplaceFailedCount++;
             }
             if (info.getContent().isSelected()) {
                 info.getContent().setReplaced(true);
             }
         }
+        HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified(true);
         northPane.getResultLabel().setText(ShowValueUtils.getResultTip(searchContentResultList.size(), contentReplaceCount, contentReplaceFailedCount));
         southPanel.getTableEditorPane().update();
         northPane.refreshReplaceInputComboBoxItems();
@@ -318,13 +322,10 @@ public class ITReplaceMainDialog extends UIDialog {
         for (Info info : searchContentResultList) {
             if (isAllow2Replace(info)) {
                 if (!info.isLegalValid(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(), searchStr, replaceStr)) {
-                    contentReplaceFailedCount++;
                     checkValidList.add(info);
                     serialNumber.add(count);
                     info.getContent().setWrongful(true);
                     info.getContent().setReplaced(true);
-                } else {
-                    contentReplaceCount++;
                 }
                 count++;
             }
@@ -529,7 +530,6 @@ public class ITReplaceMainDialog extends UIDialog {
             if (isInputStrValid(inputStr, extraStr)) {
                 String secondStr = GeneralUtils.objectToString(northPane.getReplaceSettingInputComboBox().getSelectedItem());
                 String thirdStr = GeneralUtils.objectToString(northPane.getReplaceExtraSettingComboBox().getSelectedItem());
-                HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified(true);
                 for (Info info : searchSettingResultList) {
                     if (isSupportReplace(info)) {
                         SettingController controller = SettingController.match(firstStr);
@@ -540,10 +540,10 @@ public class ITReplaceMainDialog extends UIDialog {
                         }
                     }
                 }
+                HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified(true);
                 northPane.getSettingResultLabel().setText(ShowValueUtils.getResultTip(searchSettingResultList.size(), settingReplaceCount, settingReplaceFailedCount));
                 southPanel.getTableEditorPane().update();
                 ITTableEditorPane.getEditTable().repaint();
-                HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified();
             } else {
                 search4Setting();
             }

designer-realize/src/main/java/com/fr/design/actions/replace/utils/SearchJSUtils.java

@@ -26,6 +26,7 @@ import com.fr.plugin.chart.base.VanChartHtmlLabel;
 import com.fr.plugin.chart.custom.CustomPlotFactory;
 import com.fr.plugin.chart.custom.VanChartCustomPlot;
 import com.fr.plugin.chart.custom.type.CustomPlotType;
+import com.fr.plugin.chart.drillmap.VanChartDrillMapPlot;
 import com.fr.plugin.chart.map.VanChartMapPlot;
 import com.fr.plugin.chart.map.attr.AttrMapLabel;
 import com.fr.plugin.chart.map.attr.AttrMapTooltip;
@@ -63,6 +64,14 @@ public class SearchJSUtils {
      */
     public static final String CATEGORY_LABEL = ShowValueUtils.joinStr4Position(Toolkit.i18nText("Fine-Design_Basic_Style"), Toolkit.i18nText("Fine-Design_Chart_Data_Label"), Toolkit.i18nText("Fine-Design_Chart_Category_Label"));
 
+    /**
+     * 条件属性
+     */
+    public static final String CONDITION = ShowValueUtils.joinStr4Position(
+            Toolkit.i18nText("Fine-Design_Chart_Chart"),
+            Toolkit.i18nText("Fine-Design_Chart_Animation_Special"),
+            Toolkit.i18nText("Fine-Design_Chart_Interactive"));
+
     /**
      * 从Listener中获取JS
      */
@@ -338,6 +347,8 @@ public class SearchJSUtils {
                 VanChart chart = ((VanChart) chartCollection.getChart(i));
                 if (isCustomMapPlot(chart.getPlot())) {
                     dealMapNameJavaScript(content, chart.getPlot(), jsInfos);
+                } else if (chart.getPlot() instanceof VanChartDrillMapPlot) {
+                    dealDrillNameJavaScript(content, chart.getPlot(), jsInfos);
                 } else {
                     NameJavaScriptGroup nameJavaScriptGroup = chart.getPlot().getHotHyperLink();
                     addNameJavaScript2Array(nameJavaScriptArrayList, nameJavaScriptGroup);
@@ -347,6 +358,17 @@ public class SearchJSUtils {
         return nameJavaScriptArrayList;
     }
 
+    private static void dealDrillNameJavaScript(ITContent content, VanChartDrillMapPlot plot, List<JSInfo> jsInfos) {
+        ITContent chartContent = ITContent.copy(content);
+        chartContent.addOtherPos(
+                CONDITION,
+                Toolkit.i18nText("Fine-Design_Chart_Drill_Dir")
+        );
+        List<NameJavaScript> list = new ArrayList<>();
+        addNameJavaScript2Array(list, plot.getDrillUpHyperLink());
+        addJSInfosFromNameJS(chartContent, list, jsInfos);
+    }
+
     /**
      * 是否是组合地图
      * @param plot 图表的plot
@@ -366,14 +388,15 @@ public class SearchJSUtils {
         List<NameJavaScript> areaJavaScriptList = new ArrayList<>();
         List<NameJavaScript> lineJavaScriptList = new ArrayList<>();
         List<NameJavaScript> pointJavaScriptList = new ArrayList<>();
-
+        ITContent chartContent = ITContent.copy(content);
+        chartContent.addOtherPos(CONDITION);
         addNameJavaScript2Array(areaJavaScriptList, plot.getAreaHotHyperLink());
         addNameJavaScript2Array(lineJavaScriptList, plot.getLineHotHyperLink());
         addNameJavaScript2Array(pointJavaScriptList, plot.getPointHotHyperLink());
 
-        addJSInfosFromNameJS(ShowValueUtils.getCustomMapContent(content, Toolkit.i18nText("Fine-Design_Chart_Region_Map")), areaJavaScriptList, jsInfos);
+        addJSInfosFromNameJS(ShowValueUtils.getCustomMapContent(chartContent, Toolkit.i18nText("Fine-Design_Chart_Region_Map")), areaJavaScriptList, jsInfos);
-        addJSInfosFromNameJS(ShowValueUtils.getCustomMapContent(content, Toolkit.i18nText("Fine-Design_Chart_LineMap")), lineJavaScriptList, jsInfos);
+        addJSInfosFromNameJS(ShowValueUtils.getCustomMapContent(chartContent, Toolkit.i18nText("Fine-Design_Chart_LineMap")), lineJavaScriptList, jsInfos);
-        addJSInfosFromNameJS(ShowValueUtils.getCustomMapContent(content, Toolkit.i18nText("Fine-Design_Chart_PointMap")), pointJavaScriptList, jsInfos);
+        addJSInfosFromNameJS(ShowValueUtils.getCustomMapContent(chartContent, Toolkit.i18nText("Fine-Design_Chart_PointMap")), pointJavaScriptList, jsInfos);
     }
 
     private static void addNameJavaScript2Array(List<NameJavaScript> nameJavaScriptArrayList, NameJavaScriptGroup nameJavaScriptGroup) {