无jira 解决冲突

designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@@ -192,6 +192,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
 
     private static List<SwingWorker> mapWorkerList = new ArrayList<SwingWorker>();
     private boolean imageCompress = false;//图片压缩
+    private boolean showImageCompressMoveTip = true;
     // 开启内嵌web页面的调试窗口
     private boolean openDebug = false;
 
@@ -1637,6 +1638,15 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         this.imageCompress = imageCompress;
     }
 
+    public boolean isShowImageCompressMoveTip() {
+        return showImageCompressMoveTip;
+    }
+
+    public void setShowImageCompressMoveTip(boolean showImageCompressMoveTip) {
+        this.showImageCompressMoveTip = showImageCompressMoveTip;
+    }
+
+
     public boolean isOpenDebug() {
         return openDebug;
     }
@@ -1792,6 +1802,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         this.setCachingTemplateLimit(reader.getAttrAsInt("cachingTemplateLimit", CACHINGTEMPLATE_LIMIT));
         this.setJoinProductImprove(reader.getAttrAsBoolean("joinProductImprove", true));
         this.setImageCompress(reader.getAttrAsBoolean("imageCompress", true));
+        this.setShowImageCompressMoveTip(reader.getAttrAsBoolean("showImageCompressMoveTip", true));
         this.setAutoBackUp(reader.getAttrAsBoolean("autoBackUp", true));
         this.setTemplateTreePaneExpanded(reader.getAttrAsBoolean("templateTreePaneExpanded", false));
         // peter:读取webinfLocation
@@ -2072,6 +2083,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         if (!this.isImageCompress()) {
             writer.attr("imageCompress", this.isImageCompress());
         }
+        writer.attr("showImageCompressMoveTip", this.isShowImageCompressMoveTip());
         if (!this.isAutoBackUp()) {
             writer.attr("autoBackUp", this.isAutoBackUp());
         }

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -15,6 +15,9 @@ import com.fr.design.gui.ibutton.UIColorButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIDictionaryComboBox;
+import com.fr.design.gui.ifilechooser.FileChooserProvider;
+import com.fr.design.gui.ifilechooser.FileSelectionMode;
+import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
 import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.iprogressbar.UIProgressBarUI;
@@ -47,6 +50,8 @@ import com.fr.transaction.Worker;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.vcs.VcsOperator;
 import com.fr.workspace.server.vcs.git.config.GcConfig;
+import com.sun.javafx.tk.FileChooserType;
+import javafx.stage.FileChooser;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
@@ -165,6 +170,7 @@ public class PreferencePane extends BasicPane {
     private UICheckBox joinProductImproveCheckBox;
     private UICheckBox autoPushUpdateCheckBox;
     private UICheckBox embedServerLazyStartupCheckBox;
+    private UICheckBox imageCompressPanelCheckBox;
 
     private UICheckBox vcsEnableCheckBox;
     private UICheckBox saveCommitCheckBox;
@@ -256,6 +262,10 @@ public class PreferencePane extends BasicPane {
         embedServerPanel.add(embedServerLazyStartupCheckBox);
         advancePane.add(embedServerPanel);
 
+        JPanel imageCompressPanel = FRGUIPaneFactory.createVerticalTitledBorderPane(i18nText("Fine-Design_Template_Preview_Performance"));
+        imageCompressPanelCheckBox = new UICheckBox(i18nText("Fine-Design_Image_Compress"));
+        imageCompressPanel.add(imageCompressPanelCheckBox);
+        advancePane.add(imageCompressPanel);
     }
 
     private void createVcsSettingPane(JPanel generalPane) {
@@ -489,11 +499,13 @@ public class PreferencePane extends BasicPane {
         chooseDirBtn.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent evt) {
-                JFileChooser fileChooser = new JFileChooser();
+                FileChooserProvider fileChooserProvider =
-                fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+                        new JavaFxNativeFileChooser.Builder().
-                int saveValue = fileChooser.showOpenDialog(DesignerContext.getDesignerFrame());
+                                fileSelectionMode(FileSelectionMode.DIR).
+                                build();
+                int saveValue = fileChooserProvider.showDialog(null);
                 if (saveValue == JFileChooser.APPROVE_OPTION) {
-                    File selectedFile = fileChooser.getSelectedFile();
+                    File selectedFile = fileChooserProvider.getSelectedFile();
                     logExportDirectoryField.setText(selectedFile.getAbsolutePath());
                 }
             }
@@ -717,6 +729,8 @@ public class PreferencePane extends BasicPane {
         }
 
         this.embedServerLazyStartupCheckBox.setSelected(designerEnvManager.isEmbedServerLazyStartup());
+
+        this.imageCompressPanelCheckBox.setSelected(designerEnvManager.isImageCompress());
     }
 
     private int chooseCase(int sign) {
@@ -775,6 +789,7 @@ public class PreferencePane extends BasicPane {
         designerEnvManager.setCachingTemplateLimit((int) this.cachingTemplateSpinner.getValue());
         designerEnvManager.setJoinProductImprove(this.joinProductImproveCheckBox.isSelected());
         designerEnvManager.setEmbedServerLazyStartup(this.embedServerLazyStartupCheckBox.isSelected());
+        designerEnvManager.setImageCompress(this.imageCompressPanelCheckBox.isSelected());
         VcsConfigManager vcsConfigManager = designerEnvManager.getVcsConfigManager();
         vcsConfigManager.setSaveInterval(this.saveIntervalEditor.getValue());
         vcsConfigManager.setVcsEnable(this.vcsEnableCheckBox.isSelected());

designer-base/src/main/java/com/fr/design/base/clipboard/ClipboardHelper.java

@@ -0,0 +1,24 @@
+package com.fr.design.base.clipboard;
+
+import java.util.List;
+
+public class ClipboardHelper {
+    public static String formatExcelString(List<List<Object>> table) {
+        StringBuffer stringBuffer = new StringBuffer();
+
+        for (int row = 0; row < table.size(); row++) {
+            List<Object> rowValue = table.get(row);
+            for (int col = 0; col < rowValue.size(); col++) {
+                Object cell = rowValue.get(col);
+                stringBuffer.append(cell);
+                if (col != rowValue.size() - 1) {
+                    stringBuffer.append("\t");
+                }
+            }
+            if (row != table.size() - 1) {
+                stringBuffer.append("\n");
+            }
+        }
+        return stringBuffer.toString();
+    }
+}

designer-base/src/main/java/com/fr/design/base/mode/DesignModeContext.java

@@ -3,6 +3,7 @@ package com.fr.design.base.mode;
 import com.fr.design.designer.TargetComponent;
 
 import static com.fr.design.base.mode.DesignerMode.AUTHORITY;
+import static com.fr.design.base.mode.DesignerMode.DUCHAMP;
 
 public class DesignModeContext {
 
@@ -42,6 +43,9 @@ public class DesignModeContext {
         return mode == AUTHORITY;
     }
 
+    public static boolean isDuchampMode() {
+        return mode == DUCHAMP;
+    }
 
     public static void doCopy(TargetComponent principal) {
         if (isBanCopyAndCut() || principal == null) {

designer-base/src/main/java/com/fr/design/base/mode/DesignerMode.java

@@ -4,5 +4,6 @@ public enum DesignerMode {
     NORMAL,
     BAN_COPY_AND_CUT,
     VCS,
-    AUTHORITY
+    AUTHORITY,
+    DUCHAMP
 }

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

@@ -0,0 +1,203 @@
+package com.fr.design.data.datapane.preview;
+
+import com.fr.design.base.clipboard.ClipboardHelper;
+import com.fr.design.gui.itable.SortableJTable;
+import com.fr.design.gui.itable.TableSorter;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.os.OperatingSystem;
+
+import javax.swing.table.TableCellRenderer;
+import java.awt.*;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+
+public class CopyableJTable extends SortableJTable {
+
+    //区域选中用到的定位数据
+    public int startRow = -1;
+    public int startCol = -1;
+    public int endRow = -1;
+    public int endCol = -1;
+    //单元格不连续多选用到的定位数据
+    java.util.List<Point> pointList = new ArrayList<>();
+    //shift键是否被按下
+    public boolean isShiftDown = false;
+    //control\command键是否被按下
+    public boolean isControlDown = false;
+    //是否可以复制
+    public boolean isCopy = true;
+    int ctrlKeyCode = 17;
+    int cKeyCode = 67;
+    int shiftKeyCode = 16;
+    int commandKeyCode = 157;
+    //选中单元格的背景色
+    Color selectBackGround = new Color(54, 133, 242, 63);
+
+
+    public CopyableJTable(TableSorter tableModel) {
+        super(tableModel);
+        initListener();
+    }
+
+    private void initListener() {
+        CopyableJTable self = this;
+        this.addMouseMotionListener(new java.awt.event.MouseAdapter() {
+            @Override
+            public void mouseDragged(MouseEvent evt) {
+                int row = self.rowAtPoint(evt.getPoint());
+                int col = self.columnAtPoint(evt.getPoint());
+                if (self.updateEndPoint(row, col)) {
+                    self.repaint();
+                }
+            }
+        });
+        this.addMouseListener(new MouseAdapter() {
+            public void mousePressed(MouseEvent e) {
+                int row = self.rowAtPoint(e.getPoint());
+                int col = self.columnAtPoint(e.getPoint());
+                if (!self.isControlDown) {
+                    self.clearPoint();
+                }
+                if (self.isShiftDown) {
+                    self.clearPoint();
+                } else {
+                    self.updateStartPoint(row, col);
+                }
+                self.addPoint(row, col);
+                self.updateEndPoint(row, col);
+
+                self.repaint();
+            }
+
+        });
+        this.addKeyListener(new KeyAdapter() {
+            @Override
+            public void keyPressed(KeyEvent e) {
+                if (isControlKey(e)) {
+                    isControlDown = true;
+                } else if (e.getKeyCode() == shiftKeyCode) {
+                    isShiftDown = true;
+                } else if (e.getKeyCode() == cKeyCode) {
+                    if (isControlDown && isCopy) {
+                        self.copy();
+                        isCopy = false;
+                    }
+                }
+            }
+
+            @Override
+            public void keyReleased(KeyEvent e) {
+                if (isControlKey(e)) {
+                    isControlDown = false;
+                    isCopy = true;
+                } else if (e.getKeyCode() == shiftKeyCode) {
+                    isShiftDown = false;
+                }
+            }
+
+            private boolean isControlKey(KeyEvent e) {
+                if (e.getKeyCode() == ctrlKeyCode) {
+                    return true;
+                }
+                if (e.getKeyCode() == commandKeyCode && OperatingSystem.isMacos()) {
+                    return true;
+                }
+                return false;
+            }
+        });
+    }
+
+
+    @Override
+    public Component prepareRenderer(TableCellRenderer renderer, int row, int column) {
+        Component comp = super.prepareRenderer(renderer, row, column);
+        if (isChoose(row, column)) {
+            comp.setBackground(selectBackGround);
+        } else {
+            comp.setBackground(this.getBackground());
+        }
+        return comp;
+    }
+
+
+    private boolean updateEndPoint(int row, int col) {
+        if (endRow != row || endCol != col) {
+            endRow = row;
+            endCol = col;
+            return true;
+        }
+        return false;
+    }
+
+    private boolean updateStartPoint(int row, int col) {
+        if (startRow != row || startCol != col) {
+            startRow = row;
+            startCol = col;
+            return true;
+        }
+        return false;
+    }
+
+    private void addPoint(int row, int col) {
+        pointList.add(new Point(row, col));
+    }
+
+    private void clearPoint() {
+        pointList = new ArrayList<>();
+    }
+
+    private void copy() {
+        FineLoggerFactory.getLogger().info("copy cell value");
+        java.util.List<java.util.List<Object>> table = new ArrayList<>();
+        if ((startRow != endRow || startCol != endCol) &&
+                Math.min(startRow, endRow) > -1 && Math.min(startCol, endCol) > -1) {
+            for (int i = Math.min(startRow, endRow); i <= Math.max(startRow, endRow); i++) {
+                table.add(new ArrayList<>());
+                for (int j = Math.min(startCol, endCol); j <= Math.max(startCol, endCol); j++) {
+                    Object text = this.getValueAt(i, j);
+                    table.get(i - Math.min(startRow, endRow)).add(text);
+                }
+            }
+        } else if (pointList.size() > 0) {
+            Collections.sort(pointList, Comparator.comparing(Point::getX).thenComparing(Point::getY));
+            int startRow = pointList.get(0).x;
+            int currentRow = startRow;
+            table.add(new ArrayList<>());
+            for (Point point : pointList) {
+                while (currentRow < point.x) {
+                    table.add(new ArrayList<>());
+                    currentRow++;
+                }
+                Object text = this.getValueAt(point.x, point.y);
+                table.get(currentRow - startRow).add(text);
+            }
+        }
+
+        Clipboard clip = Toolkit.getDefaultToolkit().getSystemClipboard();
+        Transferable tText = new StringSelection(ClipboardHelper.formatExcelString(table));
+        clip.setContents(tText, null);
+    }
+
+    private boolean isChoose(int row, int col) {
+        if (row >= Math.min(startRow, endRow) && row <= Math.max(startRow, endRow)) {
+            if (col >= Math.min(startCol, endCol) && col <= Math.max(startCol, endCol)) {
+                return true;
+            }
+        }
+        for (Point point : pointList) {
+            if (point.x == row && point.y == col) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}

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

@@ -26,7 +26,6 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.ui.util.UIUtil;
-import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.function.TIME;
 import com.fr.general.FRFont;
 import com.fr.log.FineLoggerFactory;
@@ -162,7 +161,7 @@ public class PreviewTablePane extends BasicPane {
             }
         });
 
-        preveiwTable = new SortableJTable(new TableSorter());
+        preveiwTable = new CopyableJTable(new TableSorter());
         preveiwTable.setRowSelectionAllowed(false);
         preveiwTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
 

designer-base/src/main/java/com/fr/design/dialog/BasicPane.java

@@ -410,6 +410,4 @@ public abstract class BasicPane extends JPanel {
         }
 
     }
-
-
 }

designer-base/src/main/java/com/fr/design/gui/chart/ChartEditPaneActionListener.java

@@ -0,0 +1,16 @@
+package com.fr.design.gui.chart;
+
+import com.fr.chart.chartattr.ChartCollection;
+
+import java.util.EventListener;
+
+/**
+ * @author shine
+ * @version 10.0
+ * Created by shine on 2021/5/26
+ */
+public interface ChartEditPaneActionListener extends EventListener {
+
+    void attributeChange(ChartCollection chartCollection);
+
+}

designer-base/src/main/java/com/fr/design/gui/chart/ChartEditPaneProvider.java

@@ -10,4 +10,10 @@ public interface ChartEditPaneProvider {
 
     void fire();
 
+    default void addChartEditPaneActionListener(ChartEditPaneActionListener l) {
+    }
+
+    default void removeChartEditPaneActionListener(ChartEditPaneActionListener l) {
+    }
+
 }

designer-base/src/main/java/com/fr/design/gui/controlpane/JControlPane.java

@@ -120,6 +120,7 @@ abstract class JControlPane extends BasicPane implements UnrepeatedNameHelper, S
     }
 
     public void showEditPane() {
+        // record
         this.cardLayout.show(cardPane, EDIT);
     }
 

designer-base/src/main/java/com/fr/design/gui/frpane/AbstractAttrNoScrollPane.java

@@ -46,9 +46,11 @@ public abstract class AbstractAttrNoScrollPane extends BasicPane {
 
 	protected void initContentPane() {
 		leftContentPane = createContentPane();
+		if (leftContentPane != null) {
 			leftContentPane.setBorder(BorderFactory.createMatteBorder(10, 10, 0, 0, original));
 			this.add(leftContentPane, BorderLayout.CENTER);
 		}
+	}
 
 	protected abstract JPanel createContentPane();
 

designer-base/src/main/java/com/fr/design/gui/ibutton/UIHead.java

@@ -0,0 +1,63 @@
+package com.fr.design.gui.ibutton;
+
+import com.fr.stable.StringUtils;
+
+import javax.swing.Icon;
+
+public class UIHead {
+    private String text = StringUtils.EMPTY;
+    private Icon icon = null;
+    private boolean enable = true;
+    private int index = 0;
+
+    public UIHead(String text, int index) {
+        this.text = text;
+        this.index = index;
+    }
+
+    public UIHead(String text, int index, boolean enable) {
+        this(text, index);
+        this.enable = enable;
+    }
+
+    public UIHead(Icon icon, int index) {
+        this.icon = icon;
+        this.index = index;
+    }
+
+    public UIHead(Icon icon, int index, boolean enable) {
+        this(icon, index);
+        this.enable = enable;
+    }
+
+    public UIHead(String text, Icon icon, int index) {
+        this.text = text;
+        this.icon = icon;
+        this.index = index;
+    }
+
+    public UIHead(String text, Icon icon, int index, boolean enable) {
+        this(text, icon, index);
+        this.enable = enable;
+    }
+
+    public boolean isOnlyText() {
+        return StringUtils.isNotEmpty(text) && icon == null;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public Icon getIcon() {
+        return icon;
+    }
+
+    public boolean isEnable() {
+        return enable;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+}

designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java

@@ -10,7 +10,6 @@ import javax.swing.JFrame;
 import javax.swing.JPanel;
 import java.awt.Color;
 import java.awt.Dimension;
-import java.awt.Graphics;
 import java.awt.GridLayout;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -18,8 +17,10 @@ import java.awt.event.MouseListener;
 import java.util.ArrayList;
 import java.util.List;
 
+// fanglei：不是原作者，只是优化如下问题：代码冗余，无法拓展（例如我想加个enable属性没法加），甚至还有数组越界的问题。
 public class UIHeadGroup extends JPanel {
     private static final int MIN_HEIGHT = 25;
+    private List<UIHead> uiHeads = new ArrayList<>();
     protected List<UIToggleButton> labelButtonList;
     private boolean isNeedLeftRightOutLine = true;
     protected int selectedIndex = -1;
@@ -29,77 +30,47 @@ public class UIHeadGroup extends JPanel {
     }
 
     public UIHeadGroup(String[] textArray) {
-        labelButtonList = new ArrayList<UIToggleButton>(textArray.length);
-        this.setBackground(UIConstants.TREE_BACKGROUND);
-        this.setLayout(new GridLayout(0, textArray.length, 0, 0));
         for (int i = 0; i < textArray.length; i++) {
-            final int index = i;
+            uiHeads.add(new UIHead(textArray[i], i));
-            String text = textArray[i];
-            final UIToggleButton labelButton = new UIToggleButton(text) {
-                @Override
-                protected MouseListener getMouseListener() {
-                    return new MouseAdapter() {
-                        @Override
-                        public void mousePressed(MouseEvent e) {
-                            setSelectedIndex(index);
-                            UIHeadGroup.this.repaint();
         }
-                    };
+        initUIHeadGroup(uiHeads);
-                }
-            };
-            initButton(labelButton);
-        }
-        setSelectedIndex(0);
     }
 
     public UIHeadGroup(Icon[] iconArray) {
-        labelButtonList = new ArrayList<UIToggleButton>(iconArray.length);
-        this.setBackground(UIConstants.NORMAL_BACKGROUND);
-        this.setLayout(new GridLayout(0, iconArray.length, 1, 0));
         for (int i = 0; i < iconArray.length; i++) {
-            final int index = i;
+            uiHeads.add(new UIHead(iconArray[i], i));
-            Icon icon = iconArray[i];
-            final UIToggleButton labelButton = new UIToggleButton(icon) {
-                @Override
-                protected MouseListener getMouseListener() {
-                    return new MouseAdapter() {
-                        @Override
-                        public void mousePressed(MouseEvent e) {
-                            setSelectedIndex(index);
-                            UIHeadGroup.this.repaint();
         }
-                    };
+        initUIHeadGroup(uiHeads);
     }
-            };
+
-            initButton(labelButton);
+    public UIHeadGroup(Icon[] iconArray, String[] textArray) {
+        int length = Math.min(textArray.length, iconArray.length);
+        for (int i = 0; i < length; i++) {
+            uiHeads.add(new UIHead(textArray[i], iconArray[i], i));
         }
-        setSelectedIndex(0);
+        initUIHeadGroup(uiHeads);
     }
 
-    public UIHeadGroup(Icon[] iconArray, String[] textArray) {
+    public UIHeadGroup(List<UIHead> uiHeads) {
-        labelButtonList = new ArrayList<UIToggleButton>(Math.min(textArray.length, iconArray.length));
+        initUIHeadGroup(uiHeads);
-        this.setBackground(UIConstants.NORMAL_BACKGROUND);
-        this.setLayout(new GridLayout(0, textArray.length, 1, 0));
-        for (int i = 0; i < textArray.length; i++) {
-            final int index = i;
-            String text = textArray[i];
-            Icon icon = iconArray[i];
-            final UIToggleButton labelButton = new UIToggleButton(text, icon) {
-                @Override
-                protected MouseListener getMouseListener() {
-                    return new MouseAdapter() {
-                        @Override
-                        public void mousePressed(MouseEvent e) {
-                            setSelectedIndex(index);
-                            UIHeadGroup.this.repaint();
     }
-                    };
+
+    public void initUIHeadGroup(List<UIHead> uiHeads) {
+        if (uiHeads != null) {
+            labelButtonList = new ArrayList<UIToggleButton>(uiHeads.size());
+            this.setLayout(new GridLayout(0, uiHeads.size(), 1, 0));
+
+            for (UIHead head : uiHeads) {
+                if (head.isOnlyText()) {
+                    this.setBackground(UIConstants.TREE_BACKGROUND);
+                } else {
+                    this.setBackground(UIConstants.NORMAL_BACKGROUND);
                 }
-            };
+                initButton(createUIToggleButton(head));
-            initButton(labelButton);
             }
             setSelectedIndex(0);
         }
+    }
 
     @Override
     public Dimension getPreferredSize() {
@@ -110,32 +81,6 @@ public class UIHeadGroup extends JPanel {
         return dim;
     }
 
-    @Override
-    protected void paintBorder(Graphics g) {
-//		Graphics2D g2d = (Graphics2D)g;
-//		g2d.setColor(UIConstants.LINE_COLOR);
-//
-//		int width = 0;
-//		for(int i = 0; i < labelButtonList.size() - 1; i++) {
-//			int height = labelButtonList.get(i).getHeight();
-//			width += labelButtonList.get(i).getWidth() + 1;
-//			g.drawLine(width, 0, width, height);
-//		}
-//
-//		width += labelButtonList.get(labelButtonList.size() - 1).getWidth() + 1;
-//		if(isNeedLeftRightOutLine) {
-//			g2d.drawRect(0, 0, width, getHeight() - 1);
-//		} else {
-//			g2d.drawLine(1, 0, width - 1, 0);
-//			g2d.drawLine(1, getHeight() - 1, width - 1, getHeight() - 1);
-//		}
-//
-//
-//		g2d.setColor(UIConstants.NORMAL_BACKGROUND);
-//		UIToggleButton headButton = labelButtonList.get(selectedIndex);
-//		g2d.drawLine(headButton.getX(), headButton.getHeight() + 1, headButton.getX() + headButton.getWidth() - 1, headButton.getHeight() + 1);
-    }
-
     private void initButton(UIToggleButton labelButton) {
         labelButton.setRoundBorder(false);
         labelButton.setBorderPainted(false);
@@ -172,6 +117,26 @@ public class UIHeadGroup extends JPanel {
         return selectedIndex;
     }
 
+    public UIToggleButton createUIToggleButton(final UIHead head) {
+        UIToggleButton uiToggleButton = new UIToggleButton(head.getText(), head.getIcon()) {
+            @Override
+            protected MouseListener getMouseListener() {
+                return new MouseAdapter() {
+                    @Override
+                    public void mousePressed(MouseEvent e) {
+                        if (head.isEnable()) {
+                            setSelectedIndex(head.getIndex());
+                            UIHeadGroup.this.repaint();
+                        }
+                    }
+                };
+            }
+        };
+
+        uiToggleButton.setEnabled(head.isEnable());
+        return uiToggleButton;
+    }
+
     public static void main(String... args) {
         JFrame jf = new JFrame("test");
         jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);

designer-base/src/main/java/com/fr/design/gui/ifilechooser/AbstractFileChooser.java

@@ -1,103 +0,0 @@
-package com.fr.design.gui.ifilechooser;
-
-import javax.swing.filechooser.FileFilter;
-import java.awt.*;
-import java.io.File;
-
-/**
- * @author hades
- * @version 10.0
- * Created by hades on 2020/3/31
- */
-public abstract class AbstractFileChooser {
-
-    /**
-     * 返回当前目录
-     *
-     */
-    public abstract File getCurrentDirectory();
-
-    /**
-     * 返回当前的文件选择过滤器
-     *
-     */
-    public abstract FileFilter getFileFilter();
-
-    /**
-     * 返回选择的文件
-     *
-     */
-    public abstract File getSelectedFile();
-
-    /**
-     * 多文件选择模式下 返回选择的多个文件
-     *
-     */
-    public abstract File[] getSelectedFiles();
-
-    /**
-     * 是否可以选择多个文件
-     *
-     */
-    public abstract boolean isMultiSelectionEnabled();
-
-    /**
-     * 设置当前选择的目录
-     *
-     */
-    public abstract void setCurrentDirectory(File dir);
-
-    /**
-     * 设置左上角标题
-     *
-     */
-    public abstract void setDialogTitle(String title);
-
-    /**
-     * 设置当前的文件过滤器
-     *
-     */
-    public abstract void setFileFilter(final FileFilter filter);
-
-    /**
-     * 设置文件选择器模式
-     *
-     * JFileChooser.FILES_ONLY
-     * JFileChooser.DIRECTORIES_ONLY
-     * JFileChooser.FILES_AND_DIRECTORIES
-     */
-    public abstract void setFileSelectionMode(int selectionMode);
-
-    /**
-     * 设置是否允许选择多个文件
-     *
-     */
-    public abstract void setMultiSelectionEnabled(boolean multiple);
-
-    /**
-     * 设置选择的文件 用于showSaveDialog
-     *
-     */
-    public abstract void setSelectedFile(File file);
-
-    /**
-     * 弹出文件选择器 打开文件
-     *
-     */
-    public abstract int showOpenDialog(Component parent);
-
-    /**
-     * 弹出文件选择器 保存文件
-     *
-     */
-    public abstract int showSaveDialog(Component parent);
-
-
-    /**
-     * https://bugs.java.com/bugdatabase/view_bug.do?bug_id=4031440
-     *
-     * 设置文件名后缀 起到文件过滤的作用 形如 "*.jpg;*.jpeg"
-     *
-     */
-    public abstract void setExtensionFilter(String file);
-}

designer-base/src/main/java/com/fr/design/gui/ifilechooser/FileChooserProvider.java

@@ -0,0 +1,12 @@
+package com.fr.design.gui.ifilechooser;
+
+import java.awt.*;
+import java.io.File;
+
+public interface FileChooserProvider {
+    File[] getSelectedFiles();
+
+    File getSelectedFile();
+
+    int showDialog(Component parent);
+}

designer-base/src/main/java/com/fr/design/gui/ifilechooser/FileSelectionMode.java

@@ -0,0 +1,5 @@
+package com.fr.design.gui.ifilechooser;
+
+public enum FileSelectionMode {
+    FILE, MULTIPLE_FILE, DIR
+}

designer-base/src/main/java/com/fr/design/gui/ifilechooser/JavaFxNativeFileChooser.java

@@ -0,0 +1,158 @@
+package com.fr.design.gui.ifilechooser;
+
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.upm.UpmUtils;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
+import com.sun.javafx.application.PlatformImpl;
+import javafx.stage.DirectoryChooser;
+import javafx.stage.FileChooser;
+import javafx.stage.Window;
+
+import javax.swing.*;
+import javax.swing.filechooser.FileNameExtensionFilter;
+import java.awt.*;
+import java.io.File;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+
+public class JavaFxNativeFileChooser implements FileChooserProvider {
+    private File[] selectedFiles = new File[0];
+    private FileSelectionMode fileSelectionMode = FileSelectionMode.FILE;
+    private String title = Toolkit.i18nText("Fine-Design_Basic_Open");
+    private FileChooser.ExtensionFilter[] filters;
+    private File currentDirectory;
+
+    @Override
+    public File[] getSelectedFiles() {
+        return selectedFiles;
+    }
+
+    @Override
+    public File getSelectedFile() {
+        if (selectedFiles.length > 0) {
+            return selectedFiles[0];
+        }
+        return null;
+    }
+
+    @Override
+    public int showDialog(Component parent) {
+        final CountDownLatch latch = new CountDownLatch(1);
+        PlatformImpl.startup(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    if (fileSelectionMode == FileSelectionMode.FILE || fileSelectionMode == FileSelectionMode.MULTIPLE_FILE) {
+                        FileChooser fileChooser = new FileChooser();
+                        fileChooser.setTitle(title);
+                        fileChooser.getExtensionFilters().addAll(filters);
+                        fileChooser.setInitialDirectory(currentDirectory);
+                        if (fileSelectionMode == FileSelectionMode.FILE) {
+                            File file = fileChooser.showOpenDialog(null);
+                            if (file != null) {
+                                selectedFiles = new File[]{file};
+                            }
+                        } else if (fileSelectionMode == FileSelectionMode.MULTIPLE_FILE) {
+                            List<File> fileList = fileChooser.showOpenMultipleDialog(null);
+                            if (fileList != null) {
+                                selectedFiles = new File[fileList.size()];
+                                fileList.toArray(selectedFiles);
+                            }
+                        }
+                    } else if (fileSelectionMode == FileSelectionMode.DIR) {
+                        DirectoryChooser directoryChooser = new DirectoryChooser();
+                        directoryChooser.setTitle(title);
+                        directoryChooser.setInitialDirectory(currentDirectory);
+                        File folder = directoryChooser.showDialog(null);
+                        if (folder != null) {
+                            selectedFiles = new File[]{folder};
+                        }
+                        System.out.println(folder);
+                    }
+
+                } catch (Exception e) {
+                    FineLoggerFactory.getLogger().error(e, e.getMessage());
+                } finally {
+                    latch.countDown();
+                }
+            }
+        });
+
+        try {
+            latch.await();
+        } catch (InterruptedException ignore) {
+        }
+        return selectedFiles.length > 0 ? JFileChooser.APPROVE_OPTION : JFileChooser.CANCEL_OPTION;
+    }
+
+    public void setSelectionMode(FileSelectionMode fileSelectionMode) {
+        this.fileSelectionMode = fileSelectionMode;
+    }
+
+    public void setCurrentDirectory(File currentDirectory) {
+        this.currentDirectory = currentDirectory;
+    }
+
+
+    public static class Builder {
+        private FileSelectionMode fileSelectionMode = FileSelectionMode.FILE;
+        private String title = Toolkit.i18nText("Fine-Design_Basic_Open");
+        private FileChooser.ExtensionFilter[] filters = new FileChooser.ExtensionFilter[0];
+        private File currentDirectory;
+
+        public Builder fileSelectionMode(FileSelectionMode fileSelectionMode) {
+            this.fileSelectionMode = fileSelectionMode;
+            return this;
+        }
+
+        public Builder title(String title) {
+            this.title = title;
+            return this;
+        }
+
+        public Builder filters(FileChooser.ExtensionFilter[] filters) {
+            this.filters = filters;
+            return this;
+        }
+
+        public Builder filter(String des, String... extensions) {
+            if (extensions != null) {
+                this.filters = new FileChooser.ExtensionFilter[]{new FileChooser.ExtensionFilter(des, extensions)};
+            }
+            return this;
+        }
+
+
+        public Builder currentDirectory(File currentDirectory) {
+            if (currentDirectory != null) {
+                if (!currentDirectory.isDirectory()) {
+                    currentDirectory = currentDirectory.getParentFile();
+                }
+                if (currentDirectory != null && currentDirectory.isDirectory()) {
+                    this.currentDirectory = currentDirectory;
+                }
+            }
+            return this;
+        }
+
+        public Builder currentDirectory(String path) {
+            if (path != null) {
+                return currentDirectory(new File(path));
+            }
+            return this;
+        }
+
+        public JavaFxNativeFileChooser build() {
+            return new JavaFxNativeFileChooser(this);
+        }
+    }
+
+    private JavaFxNativeFileChooser(Builder builder) {
+        this.fileSelectionMode = builder.fileSelectionMode;
+        this.title = builder.title;
+        this.filters = builder.filters;
+        this.currentDirectory = builder.currentDirectory;
+    }
+}

designer-base/src/main/java/com/fr/design/gui/ifilechooser/UINativeFileChooser.java

@@ -1,154 +0,0 @@
-package com.fr.design.gui.ifilechooser;
-
-import com.fr.design.gui.ifilechooser.AbstractFileChooser;
-import com.fr.design.mainframe.DesignerContext;
-import com.fr.stable.os.OperatingSystem;
-
-import javax.swing.*;
-import javax.swing.filechooser.FileFilter;
-import java.awt.*;
-import java.io.File;
-import java.io.FilenameFilter;
-
-
-/**
- * 系统原生风格的文件选择器
- *
- *  jdk问题：
- *  https://bugs.openjdk.java.net/browse/JDK-4811090 不支持文件扩展选择
- *  https://stackoverflow.com/questions/40713398/filter-not-working-in-filedialog windows下 setFilenameFilter不work
- *
- * @author hades
- * @version 10.0
- * Created by hades on 2020/3/31
- */
-public class UINativeFileChooser extends AbstractFileChooser {
-
-    private final FileDialog fileDialog;
-    private FileFilter fileFilter;
-    private int selectionMode;
-
-    public UINativeFileChooser(File file) {
-        fileDialog = new FileDialog(DesignerContext.getDesignerFrame());
-        if (file != null) {
-            fileDialog.setDirectory(file.getAbsolutePath());
-            fileDialog.setFile(file.toString());
-        }
-    }
-
-    public UINativeFileChooser() {
-        this(null);
-    }
-
-    @Override
-    public File getCurrentDirectory() {
-        return new File(fileDialog.getDirectory());
-    }
-
-    @Override
-    public FileFilter getFileFilter() {
-        return fileFilter;
-    }
-
-    @Override
-    public File getSelectedFile() {
-        return new File(fileDialog.getDirectory() + fileDialog.getFile());
-    }
-
-    @Override
-    public File[] getSelectedFiles() {
-        return fileDialog.getFiles();
-    }
-
-    @Override
-    public boolean isMultiSelectionEnabled() {
-        return fileDialog.isMultipleMode();
-    }
-
-    @Override
-    public void setCurrentDirectory(File f) {
-        fileDialog.setDirectory(f.toString());
-    }
-
-    @Override
-    public void setDialogTitle(String title) {
-        fileDialog.setTitle(title);
-    }
-
-    @Override
-    public void setFileFilter(final FileFilter cff) {
-        FilenameFilter filter = new FilenameFilter() {
-            @Override
-            public boolean accept(File Directory, String fileName) {
-                return cff.accept(new File(Directory.getAbsolutePath() + fileName));
-            }
-        };
-        fileDialog.setFilenameFilter(filter);
-        fileFilter = cff;
-    }
-
-    @Override
-    public void setFileSelectionMode(int selectionMode) {
-        this.selectionMode = selectionMode;
-    }
-
-    @Override
-    public void setMultiSelectionEnabled(boolean multiple) {
-        fileDialog.setMultipleMode(multiple);
-    }
-
-    @Override
-    public void setSelectedFile(File file) {
-        fileDialog.setDirectory(file.getAbsolutePath());
-        fileDialog.setFile(file.getName());
-    }
-
-    @Override
-    public int showOpenDialog(Component parent) {
-        boolean appleProperty = OperatingSystem.isMacos() && selectionMode == JFileChooser.DIRECTORIES_ONLY;
-        if (appleProperty) {
-            System.setProperty("apple.awt.fileDialogForDirectories", "true");
-        }
-        try {
-            fileDialog.setLocale(JComponent.getDefaultLocale());
-            fileDialog.setMode(FileDialog.LOAD);
-            fileDialog.setVisible(true);
-            return fileDialog.getFile() == null ? JFileChooser.CANCEL_OPTION : JFileChooser.APPROVE_OPTION;
-        } finally {
-            if (appleProperty) {
-                System.setProperty("apple.awt.fileDialogForDirectories", "false");
-            }
-        }
-    }
-
-    @Override
-    public int showSaveDialog(Component parent) {
-        fileDialog.setLocale(JComponent.getDefaultLocale());
-        fileDialog.setMode(FileDialog.SAVE);
-        fileDialog.setVisible(true);
-        return fileDialog.getFile() == null ? JFileChooser.CANCEL_OPTION : JFileChooser.APPROVE_OPTION;
-    }
-
-    @Override
-    public void setExtensionFilter(String file) {
-        fileDialog.setFile(file);
-    }
-
-    /**
-     * 确认本地文件选择器是否支持选择模式
-     * @param selectionMode 选择模式
-     * @return 是否支持选择模式
-     */
-    public static boolean supportsSelectionMode(int selectionMode) {
-        switch (selectionMode) {
-            case JFileChooser.FILES_AND_DIRECTORIES:
-                return false;
-            case JFileChooser.DIRECTORIES_ONLY:
-                return OperatingSystem.isMacos();
-            case JFileChooser.FILES_ONLY:
-            default:
-                return true;
-        }
-    }
-
-}

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

@@ -0,0 +1,278 @@
+package com.fr.design.mainframe;
+
+import com.fr.design.DesignState;
+import com.fr.design.base.mode.DesignModeContext;
+import com.fr.design.constants.UIConstants;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.file.NewTemplatePane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.imenu.UIMenuHighLight;
+import com.fr.design.gui.itoolbar.UILargeToolbar;
+import com.fr.design.gui.itoolbar.UIToolbar;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
+import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.border.MatteBorder;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Insets;
+import java.util.ArrayList;
+
+/**
+ * @author shine
+ * @version 10.0
+ * Created by shine on 2021/4/6
+ */
+public class CenterRegionContainerPane extends JPanel {
+
+    private static volatile CenterRegionContainerPane THIS;
+
+    private static final int LEFT_ALIGN_GAP = -5;
+
+    private DesktopCardPane centerTemplateCardPane;
+
+    private JPanel toolbarPane;//撤销重做 等工具栏 + 模板tab标签 + maybe have cpt 字体
+
+    private JComponent toolbarComponent;//cpt 字体 等工具栏
+
+    private JPanel eastPane;//=largeToolbar+eastCenterPane
+    private UILargeToolbar largeToolbar;//预览
+
+    private JPanel eastCenterPane;//=combineUp + templateTabPane
+
+    private UIToolbar combineUp;//撤销重做 等工具栏
+
+    private JPanel templateTabPane;//新建模板 + 模板tab标签
+    private NewTemplatePane newWorkBookPane;//新建模板button
+
+
+    public static CenterRegionContainerPane getInstance() {
+        if (THIS == null) {
+            synchronized (CenterRegionContainerPane.class) {
+                if (THIS == null) {
+                    THIS = new CenterRegionContainerPane();
+                }
+            }
+        }
+        return THIS;
+    }
+
+    public CenterRegionContainerPane() {
+
+        toolbarPane = new JPanel() {
+
+            @Override
+            public Dimension getPreferredSize() {
+
+                Dimension dim = super.getPreferredSize();
+                // dim.height = TOOLBAR_HEIGHT;
+                return dim;
+            }
+        };
+        toolbarPane.setLayout(FRGUIPaneFactory.createBorderLayout());
+        eastPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        eastPane.add(largeToolbar = getToolBarMenuDock().createLargeToolbar(), BorderLayout.WEST);
+        eastCenterPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        combineUpTooBar();
+        eastCenterPane.add(combineUp, BorderLayout.NORTH);
+        templateTabPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        templateTabPane.add(newWorkBookPane = getToolBarMenuDock().getNewTemplatePane(), BorderLayout.WEST);
+        templateTabPane.add(MutilTempalteTabPane.getInstance(), BorderLayout.CENTER);
+        eastCenterPane.add(templateTabPane, BorderLayout.CENTER);
+
+        eastPane.add(eastCenterPane, BorderLayout.CENTER);
+        toolbarPane.add(eastPane, BorderLayout.NORTH);
+        toolbarPane.add(new UIMenuHighLight(), BorderLayout.SOUTH);
+
+        this.setLayout(new BorderLayout());
+        this.add(centerTemplateCardPane = new DesktopCardPane(), BorderLayout.CENTER);
+        this.add(toolbarPane, BorderLayout.NORTH);
+
+    }
+
+    private ToolBarMenuDock getToolBarMenuDock() {
+        return DesignerContext.getDesignerFrame().getToolBarMenuDock();
+    }
+
+    /**
+     * 创建上工具栏
+     */
+    private void combineUpTooBar() {
+        combineUp = new UIToolbar(FlowLayout.LEFT);
+        combineUp.setBorder(new MatteBorder(new Insets(0, LEFT_ALIGN_GAP, 1, 0), UIConstants.LINE_COLOR));
+        combineUp.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 2));
+        setUpUpToolBar(null);
+
+    }
+
+
+    /**
+     * 重置上工具栏
+     */
+    private void resetCombineUpTooBar(JComponent[] toolbar4Form, ToolBarMenuDockPlus plus) {
+        combineUp.removeAll();
+        setUpUpToolBar(toolbar4Form);
+        plus.insertToCombineUpToolbar(combineUp);
+    }
+
+
+    /**
+     * 填充上工具栏的中的工具
+     *
+     * @param toolbar4Form 目标组件
+     */
+    private void setUpUpToolBar(@Nullable JComponent[] toolbar4Form) {
+        UIButton[] fixButtons = getToolBarMenuDock().createUp();
+        for (UIButton fixButton : fixButtons) {
+            combineUp.add(fixButton);
+        }
+        if (!DesignModeContext.isAuthorityEditing()) {
+            combineUp.addSeparator(new Dimension(2, 16));
+            if (toolbar4Form != null) {
+                for (JComponent jComponent : toolbar4Form) {
+                    combineUp.add(jComponent);
+                }
+            }
+            //添加检测按钮
+            addCheckButton();
+        }
+        //添加分享按钮
+        addShareButton();
+        //添加插件中的按钮
+        addExtraButtons();
+    }
+
+
+    private void addExtraButtons() {
+
+        JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        if (jt == null) {
+            return;
+        }
+
+
+        UIButton[] extraButtons = jt.createExtraButtons();
+        for (UIButton extraButton : extraButtons) {
+            combineUp.add(extraButton);
+        }
+        if (extraButtons.length > 0) {
+            combineUp.addSeparator(new Dimension(2, 16));
+        }
+    }
+
+    private void addCheckButton() {
+        JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        if (jt == null) {
+            return;
+        }
+        combineUp.addSeparator(new Dimension(2, 16));
+        UIButton[] checkButtons = jt.createCheckButton();
+        for (UIButton checkButton : checkButtons) {
+            combineUp.add(checkButton);
+        }
+    }
+
+    private void addShareButton() {
+
+        JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        if (jt == null) {
+            return;
+        }
+
+        combineUp.addSeparator(new Dimension(2, 16));
+        UIButton[] shareButtons = jt.createShareButton();
+        for (UIButton shareButton : shareButtons) {
+            combineUp.add(shareButton);
+        }
+    }
+
+    /**
+     * 检查
+     *
+     * @param flag 组件是否可见
+     * @param al   组件名称
+     */
+    protected void checkCombineUp(boolean flag, ArrayList<String> al) {
+        //Yvan: 检查当前是否为WORK_SHEET状态，因为只有WORK_SHEET中含有格式刷组件，此时是不需要进行checkComponentsByNames的
+        JTemplate<?, ?> jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        if (jTemplate != null) {
+            // 第一个条件满足后还需要添加一重判断，判断是编辑报表块还是参数面板，编辑报表块时则直接return
+            if (jTemplate.getMenuState() == DesignState.WORK_SHEET && !jTemplate.isUpMode()) {
+                return;
+            }
+            combineUp.checkComponentsByNames(flag, al);
+        }
+    }
+
+
+    /**
+     * 重置相关的工具条.
+     *
+     * @param plus 工具条中相关信息
+     */
+    protected void resetToolkitByPlus(ToolBarMenuDockPlus plus, ToolBarMenuDock ad) {
+
+        resetCombineUpTooBar(ad.resetUpToolBar(plus), plus);
+
+        if (toolbarComponent != null) {
+            toolbarPane.remove(toolbarComponent);
+        }
+
+        // 颜色，字体那些按钮的工具栏
+        toolbarPane.add(toolbarComponent = ad.resetToolBar(toolbarComponent, plus), BorderLayout.CENTER);
+
+        if (plus.hasToolBarPane()) {
+            this.add(toolbarPane, BorderLayout.NORTH);
+        } else {
+            this.remove(toolbarPane);
+        }
+
+        resetByDesignMode();
+    }
+
+    private void resetByDesignMode() {
+        if (DesignModeContext.isDuchampMode()) {
+            eastPane.remove(largeToolbar);
+            eastCenterPane.remove(templateTabPane);
+            centerTemplateCardPane.refresh(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate());
+        } else {
+            eastPane.add(largeToolbar, BorderLayout.WEST);
+            eastCenterPane.add(templateTabPane, BorderLayout.CENTER);
+        }
+
+    }
+
+    JComponent getToolbarComponent() {
+
+        return this.toolbarComponent;
+    }
+
+    /**
+     * 判断是否在权限编辑状态，若是在权限编辑状态，则需要有虚线框和关闭突变
+     */
+    protected void needToAddAuhtorityPaint() {
+        newWorkBookPane.setButtonGray(DesignModeContext.isAuthorityEditing());
+
+    }
+
+
+    protected DesktopCardPane getCenterTemplateCardPane() {
+
+        return centerTemplateCardPane;
+    }
+
+    protected void refreshUIToolBar() {
+        if (toolbarComponent instanceof UIToolbar) {
+            ((UIToolbar ) toolbarComponent).refreshUIToolBar();
+        }
+        combineUp.refreshUIToolBar();
+        getToolBarMenuDock().updateEnable();
+    }
+
+}

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

@@ -4,9 +4,7 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.chart.exception.ChartNotFoundException;
 import com.fr.design.DesignModelAdapter;
-import com.fr.design.DesignState;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.core.ActionFactory;
@@ -22,24 +20,16 @@ import com.fr.design.event.TargetModifiedListener;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.file.MutilTempalteTabPane;
-import com.fr.design.file.NewTemplatePane;
 import com.fr.design.file.SaveSomeTemplatePane;
 import com.fr.design.file.TemplateTreePane;
 import com.fr.design.fun.OemProcessor;
-import com.fr.design.fun.TitlePlaceProcessor;
 import com.fr.design.fun.impl.AbstractTemplateTreeShortCutProvider;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.gui.imenu.UIMenuHighLight;
 import com.fr.design.gui.iprogressbar.ProgressDialog;
 import com.fr.design.gui.iscrollbar.UIScrollBar;
-import com.fr.design.gui.itoolbar.UIToolbar;
 import com.fr.design.i18n.Toolkit;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.loghandler.LogMessageBar;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
 import com.fr.design.mainframe.vcs.common.VcsHelper;
-import com.fr.design.menu.MenuManager;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.os.impl.MacOsAddListenerAction;
 import com.fr.design.os.impl.SupportOSImpl;
@@ -51,49 +41,32 @@ import com.fr.file.FILE;
 import com.fr.file.FILEFactory;
 import com.fr.file.FileFILE;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.GeneralContext;
 import com.fr.general.GeneralUtils;
 import com.fr.general.IOUtils;
 import com.fr.invoke.Reflect;
 import com.fr.log.FineLoggerFactory;
-import com.fr.plugin.context.PluginContext;
-import com.fr.plugin.injectable.PluginModule;
-import com.fr.plugin.manage.PluginFilter;
-import com.fr.plugin.observer.PluginEvent;
-import com.fr.plugin.observer.PluginEventListener;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 import com.fr.stable.image4j.codec.ico.ICODecoder;
 import com.fr.stable.os.OperatingSystem;
-import com.fr.stable.os.support.OSBasedAction;
 import com.fr.stable.os.support.OSSupportCenter;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.start.OemHandler;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.Workspace;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JLayeredPane;
-import javax.swing.JMenuBar;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.WindowConstants;
-import javax.swing.border.MatteBorder;
 import java.awt.BorderLayout;
-import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.FlowLayout;
 import java.awt.Graphics;
-import java.awt.Insets;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.datatransfer.DataFlavor;
@@ -116,9 +89,12 @@ import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 public class DesignerFrame extends JFrame implements JTemplateActionListener, TargetModifiedListener {
 
@@ -128,8 +104,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 
     private static final long serialVersionUID = -8732559571067484460L;
 
-    private static final int LEFT_ALIGN_GAP = -5;
-
     private static final int MENU_HEIGHT = 26;
 
     private static final Integer SECOND_LAYER = 100;
@@ -140,22 +114,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 
     private ToolBarMenuDock ad;
 
-    private DesktopCardPane centerTemplateCardPane;
-
-    private JPanel toolbarPane;
-
-    private JComponent toolbarComponent;
-
-    private JPanel menuPane;
-
-    private JMenuBar menuBar;
-
-    private JPanel eastCenterPane;
-
-    private UIToolbar combineUp;
-
-    private NewTemplatePane newWorkBookPane;
-
     private Icon closeMode;
 
     private JLayeredPane layeredPane = this.getLayeredPane();
@@ -285,37 +243,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 
         // the content pane
         basePane.setLayout(new BorderLayout());
-        toolbarPane = new JPanel() {
 
-            @Override
+        basePane.add(CenterRegionContainerPane.getInstance(), BorderLayout.CENTER);
-            public Dimension getPreferredSize() {
-
-                Dimension dim = super.getPreferredSize();
-                // dim.height = TOOLBAR_HEIGHT;
-                return dim;
-            }
-        };
-        toolbarPane.setLayout(FRGUIPaneFactory.createBorderLayout());
-        JPanel eastPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        eastPane.add(ad.createLargeToolbar(), BorderLayout.WEST);
-        eastCenterPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        combineUpTooBar();
-        eastCenterPane.add(combineUp, BorderLayout.NORTH);
-        JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        panel.add(newWorkBookPane = ad.getNewTemplatePane(), BorderLayout.WEST);
-        panel.add(MutilTempalteTabPane.getInstance(), BorderLayout.CENTER);
-        eastCenterPane.add(panel, BorderLayout.CENTER);
-
-        eastPane.add(eastCenterPane, BorderLayout.CENTER);
-        toolbarPane.add(eastPane, BorderLayout.NORTH);
-        toolbarPane.add(new UIMenuHighLight(), BorderLayout.SOUTH);
-
-        JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        centerPane.add(centerTemplateCardPane = new DesktopCardPane(), BorderLayout.CENTER);
-        centerPane.add(toolbarPane, BorderLayout.NORTH);
-
-
-        basePane.add(centerPane, BorderLayout.CENTER);
         laoyoutWestPane();
         basePane.add(EastRegionContainerPane.getInstance(), BorderLayout.EAST);
         basePane.setBounds(0, 0, contentWidth, contentHeight);
@@ -423,7 +352,11 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 
     public DesktopCardPane getCenterTemplateCardPane() {
 
-        return centerTemplateCardPane;
+        return CenterRegionContainerPane.getInstance().getCenterTemplateCardPane();
+    }
+
+    public void refreshUIToolBar() {
+        CenterRegionContainerPane.getInstance().refreshUIToolBar();
     }
 
     /**
@@ -431,80 +364,12 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      */
     protected void initMenuPane() {
 
-        menuPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        basePane.add(NorthRegionContainerPane.getInstance(), BorderLayout.NORTH);
-        menuPane.add(new UIMenuHighLight(), BorderLayout.SOUTH);
-        menuPane.add(initNorthEastPane(ad), BorderLayout.EAST);
-        basePane.add(menuPane, BorderLayout.NORTH);
         this.resetToolkitByPlus(null);
     }
 
-    /**
-     * @param ad 菜单栏
-     * @return panel
-     */
     protected JPanel initNorthEastPane(final ToolBarMenuDock ad) {
-        //hugh: private修改为protected方便oem的时候修改右上的组件构成
+        return NorthRegionContainerPane.getInstance().initNorthEastPane(ad);
-        //顶部日志+登陆按钮
-        final JPanel northEastPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        //优先级为-1，保证最后全面刷新一次
-        GeneralContext.listenPluginRunningChanged(new PluginEventListener(-1) {
-
-            @Override
-            public void on(PluginEvent event) {
-
-                refreshNorthEastPane(northEastPane, ad);
-                SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        if (DesignerContext.getDesignerFrame() == null) {
-                            return;
-                        }
-                        DesignerContext.getDesignerFrame().refresh();
-                        DesignerContext.getDesignerFrame().repaint();
-                    }
-                });
-            }
-        }, new PluginFilter() {
-
-            @Override
-            public boolean accept(PluginContext context) {
-
-                return context.contain(PluginModule.ExtraDesign);
-            }
-        });
-        refreshNorthEastPane(northEastPane, ad);
-        return northEastPane;
-    }
-
-    private void refreshNorthEastPane(final JPanel northEastPane, final ToolBarMenuDock ad) {
-
-        northEastPane.removeAll();
-        northEastPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 0, 0));
-        northEastPane.add(LogMessageBar.getInstance());
-        TitlePlaceProcessor processor = ExtraDesignClassManager.getInstance().getSingle(TitlePlaceProcessor.MARK_STRING);
-        if (processor != null) {
-            final Component[] bbsLoginPane = {null};
-            OSSupportCenter.buildAction(new OSBasedAction() {
-                @Override
-                public void execute(Object... objects) {
-                    bbsLoginPane[0] = ad.createBBSLoginPane();
-                }
-            }, SupportOSImpl.USERINFOPANE);
-            processor.hold(northEastPane, LogMessageBar.getInstance(), bbsLoginPane[0]);
-        }
-        northEastPane.add(ad.createAlphaFinePane());
-        if (!DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) {
-            ad.createAlphaFinePane().setVisible(false);
-        }
-        northEastPane.add(ad.createNotificationCenterPane());
-
-        OSSupportCenter.buildAction(new OSBasedAction() {
-            @Override
-            public void execute(Object... objects) {
-                northEastPane.add(ad.createBBSLoginPane());
-            }
-        }, SupportOSImpl.USERINFOPANE);
-
     }
 
     public void initTitleIcon() {
@@ -698,94 +563,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         this.closeMode = closeMode;
     }
 
-    /**
-     * 创建上工具栏
-     */
-    private void combineUpTooBar() {
-        combineUp = new UIToolbar(FlowLayout.LEFT);
-        combineUp.setBorder(new MatteBorder(new Insets(0, LEFT_ALIGN_GAP, 1, 0), UIConstants.LINE_COLOR));
-        combineUp.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 2));
-        setUpUpToolBar(null);
-
-    }
-
-    /**
-     * 重置上工具栏
-     */
-    private void resetCombineUpTooBar(JComponent[] toolbar4Form) {
-        combineUp.removeAll();
-        setUpUpToolBar(toolbar4Form);
-    }
-
-    /**
-     * 填充上工具栏的中的工具
-     *
-     * @param toolbar4Form 目标组件
-     */
-    private void setUpUpToolBar(@Nullable JComponent[] toolbar4Form) {
-        UIButton[] fixButtons = ad.createUp();
-        for (UIButton fixButton : fixButtons) {
-            combineUp.add(fixButton);
-        }
-        if (!DesignModeContext.isAuthorityEditing()) {
-            combineUp.addSeparator(new Dimension(2, 16));
-            if (toolbar4Form != null) {
-                for (JComponent jComponent : toolbar4Form) {
-                    combineUp.add(jComponent);
-                }
-            }
-            //添加检测按钮
-            addCheckButton();
-        }
-        //添加分享按钮
-        addShareButton();
-        //添加插件中的按钮
-        addExtraButtons();
-    }
-
-    private void addExtraButtons() {
-
-        JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-        if (jt == null) {
-            return;
-        }
-
-
-        UIButton[] extraButtons = jt.createExtraButtons();
-        for (UIButton extraButton : extraButtons) {
-            combineUp.add(extraButton);
-        }
-        if (extraButtons.length > 0) {
-            combineUp.addSeparator(new Dimension(2, 16));
-        }
-    }
-
-    private void addCheckButton() {
-        JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-        if (jt == null) {
-            return;
-        }
-        combineUp.addSeparator(new Dimension(2, 16));
-        UIButton[] checkButtons = jt.createCheckButton();
-        for (UIButton checkButton : checkButtons) {
-            combineUp.add(checkButton);
-        }
-    }
-
-    private void addShareButton() {
-
-        JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-        if (jt == null) {
-            return;
-        }
-
-        combineUp.addSeparator(new Dimension(2, 16));
-        UIButton[] shareButtons = jt.createShareButton();
-        for (UIButton shareButton : shareButtons) {
-            combineUp.add(shareButton);
-        }
-    }
-
     /**
      * 检查
      *
@@ -793,17 +570,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      * @param al   组件名称
      */
     public void checkCombineUp(boolean flag, ArrayList<String> al) {
-        //Yvan: 检查当前是否为WORK_SHEET状态，因为只有WORK_SHEET中含有格式刷组件，此时是不需要进行checkComponentsByNames的
+        CenterRegionContainerPane.getInstance().checkCombineUp(flag, al);
-        JTemplate<?, ?> jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-        if (jTemplate != null) {
-            // 第一个条件满足后还需要添加一重判断，判断是编辑报表块还是参数面板，编辑报表块时则直接return
-            if (jTemplate.getMenuState() == DesignState.WORK_SHEET && !jTemplate.isUpMode()) {
-                return;
-            }
-            combineUp.checkComponentsByNames(flag, al);
-        }
     }
 
+
     /**
      * 刷新工具条.
      */
@@ -812,6 +582,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         this.ad.updateToolBarDef();
     }
 
+    ToolBarMenuDock getToolBarMenuDock() {
+        return this.ad;
+    }
+
     /**
      * 重置相关的工具条.
      *
@@ -823,39 +597,18 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
             plus = ToolBarMenuDock.NULLAVOID;
         }
 
-        DesignState designState = new DesignState(plus);
+        NorthRegionContainerPane.getInstance().resetToolkitByPlus(plus, ad);
-        MenuManager.getInstance().setMenus4Designer(designState);
-        if (menuBar == null) {
-            menuPane.add(menuBar = ad.createJMenuBar(plus), BorderLayout.CENTER);
-        } else {
-            ad.resetJMenuBar(menuBar, plus);
-        }
-
-        resetCombineUpTooBar(ad.resetUpToolBar(plus));
-
-        if (toolbarComponent != null) {
-            toolbarPane.remove(toolbarComponent);
-        }
 
-        // 颜色，字体那些按钮的工具栏
+        CenterRegionContainerPane.getInstance().resetToolkitByPlus(plus, ad);
-        toolbarPane.add(toolbarComponent = ad.resetToolBar(toolbarComponent, plus), BorderLayout.CENTER);
 
         this.checkToolbarMenuEnable();
         this.validate();
         layeredPane.repaint();
     }
 
-    public void refreshUIToolBar() {
-        if (toolbarComponent instanceof UIToolbar) {
-            ((UIToolbar ) toolbarComponent).refreshUIToolBar();
-        }
-        combineUp.refreshUIToolBar();
-        this.ad.updateEnable();
-    }
-
     public JComponent getToolbarComponent() {
 
-        return this.toolbarComponent;
+        return CenterRegionContainerPane.getInstance().getToolbarComponent();
     }
 
     /**
@@ -863,7 +616,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      */
     public void needToAddAuhtorityPaint() {
 
-        newWorkBookPane.setButtonGray(DesignModeContext.isAuthorityEditing());
+        CenterRegionContainerPane.getInstance().needToAddAuhtorityPaint();
 
         // 进入或退出权限编辑模式，通知插件
         Set<ShortCut> extraShortCuts = ExtraDesignClassManager.getInstance().getExtraShortCuts();
@@ -981,7 +734,43 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      */
     public JTemplate<?, ?> getSelectedJTemplate() {
 
-        return this.centerTemplateCardPane.getSelectedJTemplate();
+        return getCenterTemplateCardPane().getSelectedJTemplate();
+    }
+
+    /**
+     * 保存当前编辑的模板
+     */
+
+    public void saveCurrentEditingTemplate() {
+
+        JTemplate<?, ?> editingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        if (editingTemplate == null) {
+            return;
+        }
+        if (editingTemplate.isSaved()) {// isSaved == true表示已经保存过，或者新建的一张模板
+            if (editingTemplate.getEditingFILE().exists()) {// 表示磁盘上的某一张已经保存过的模板，要添加到历史中
+                // HistoryTemplateListPane.getInstance().addHistory();
+            }
+        } else {
+            editingTemplate.stopEditing();
+            if (!editingTemplate.getEditingFILE().exists()) {
+                int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
+                        Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + editingTemplate.getEditingFILE()
+                                + "\" ?", Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION,
+                        JOptionPane.QUESTION_MESSAGE);
+                if (returnVal == JOptionPane.YES_OPTION && editingTemplate.saveTemplate()) {
+                    editingTemplate.saveTemplate();
+                    FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved",
+                            editingTemplate.getEditingFILE().getName()));
+                }
+            } else {
+                if (editingTemplate.saveTemplate()) {
+                    editingTemplate.saveTemplate();
+                    FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved",
+                            editingTemplate.getEditingFILE().getName()));
+                }
+            }
+        }
     }
 
     /**
@@ -1010,10 +799,14 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         if (jt == null || jt.getEditingFILE() == null) {
             return;
         }
+        if (currentTemplateDeactivateFail()) {
+            return;
+        }
         jt.addJTemplateActionListener(this);
         jt.addTargetModifiedListener(this);
         jt.addJTemplateActionListener(VcsHelper.getInstance());
-        centerTemplateCardPane.showJTemplate(jt);
+        getCenterTemplateCardPane().showJTemplate(jt);
+        refreshBaseContentPane(jt);
         setTitle();
         layeredPane.repaint();
     }
@@ -1031,11 +824,57 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         if (jt == null || jt.getEditingFILE() == null) {
             return;
         }
-        centerTemplateCardPane.showJTemplate(jt);
+        if (currentTemplateDeactivateFail()) {
+            return;
+        }
+        getCenterTemplateCardPane().showJTemplate(jt);
+        refreshBaseContentPane(jt);
         setTitle();
         layeredPane.repaint();
     }
 
+    /**
+     * 当前模板 停用失败
+     *
+     * @return 是否停用失败
+     */
+    private boolean currentTemplateDeactivateFail() {
+        JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        return currentEditingTemplate != null && !currentEditingTemplate.deactivateTemplate();
+    }
+
+
+    /**
+     * 根据模板刷新 设计器整个界面
+     *
+     * @param jTemplate 当前模板
+     */
+    public void refreshBaseContentPane(JTemplate jTemplate) {
+
+        JComponent north = jTemplate.north4DesignerFrame(),
+                center = jTemplate.center4DesignerFrame(),
+                west = jTemplate.west4DesignerFrame(),
+                east = jTemplate.east4DesignerFrame();
+
+        basePane.removeAll();
+
+        if (north != null) {
+            basePane.add(north, BorderLayout.NORTH);
+        }
+        if (center != null) {
+            basePane.add(center, BorderLayout.CENTER);
+        }
+        if (west != null) {
+            basePane.add(west, BorderLayout.WEST);
+        }
+        if (east != null) {
+            basePane.add(east, BorderLayout.EAST);
+        }
+
+        layeredPane.repaint();
+        layeredPane.revalidate();
+    }
+
     /**
      * 对象侦听
      *
@@ -1107,16 +946,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
                     JOptionPane.WARNING_MESSAGE,
                     UIManager.getIcon("OptionPane.errorIcon")
             );
-            if (this.getSelectedJTemplate() == null) {
-                addAndActivateJTemplate();
-            }
-        } catch (ChartNotFoundException e) {
-            FineJOptionPane.showMessageDialog(this,
-                    Toolkit.i18nText("Fine-Design_Chart_Not_Found_Exception"),
-                    Toolkit.i18nText("Fine-Design_Basic_Error"),
-                    JOptionPane.ERROR_MESSAGE,
-                    UIManager.getIcon("OptionPane.errorIcon"));
-
             if (this.getSelectedJTemplate() == null) {
                 addAndActivateJTemplate();
             }

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

@@ -53,7 +53,7 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
         // 判断是否切换设计器状态到禁止拷贝剪切
         if (jt.getTarget().getAttrMark(DesignBanCopyAttrMark.XML_TAG) != null) {
             DesignModeContext.switchTo(DesignerMode.BAN_COPY_AND_CUT);
-        } else if (!DesignModeContext.isVcsMode() && !DesignModeContext.isAuthorityEditing()) {
+        } else if (!DesignModeContext.isVcsMode() && !DesignModeContext.isAuthorityEditing() && !DesignModeContext.isDuchampMode()) {
             DesignModeContext.switchTo(DesignerMode.NORMAL);
         }
         // 切换时
@@ -61,6 +61,11 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
             component.fireTabChange();
         }
         DesignerFrameFileDealerPane.getInstance().setCurrentEditingTemplate(jt);
+
+        refresh(jt);
+    }
+
+    protected void refresh(final JTemplate<?, ?> jt) {
         if (component != null) {
             layeredPane.remove(component);
         }

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

@@ -16,7 +16,6 @@ import com.fr.design.layout.VerticalFlowLayout;
 import com.fr.design.mainframe.reuse.ReuseGuideDialog;
 import com.fr.design.mainframe.reuse.SnapChatKeys;
 import com.fr.design.mainframe.share.collect.ComponentCollector;
-import com.fr.design.menu.SnapChatUtil;
 import com.fr.design.notification.SnapChat;
 import com.fr.design.notification.SnapChatFactory;
 import com.fr.design.ui.util.UIUtil;
@@ -114,7 +113,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         POLY_REPORT,  // 聚合报表-报表块
         POLY_CHART(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings")),  // 聚合报表-图表块
         AUTHORITY_EDITION,  // 权限编辑
-        AUTHORITY_EDITION_DISABLED; // 权限编辑
+        AUTHORITY_EDITION_DISABLED, // 权限编辑
+        DUCHAMP_REPORT;
 
         private String title;
 
@@ -280,15 +280,15 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         // 单元格元素
         PropertyItem cellElement = new PropertyItem(KEY_CELL_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Element"),
                 "cellelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
-                new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
+                new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT, PropertyMode.DUCHAMP_REPORT});
         // 单元格属性
         PropertyItem cellAttr = new PropertyItem(KEY_CELL_ATTR, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Attributes"),
                 "cellattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
-                new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
+                new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT, PropertyMode.DUCHAMP_REPORT});
         // 悬浮元素
         PropertyItem floatElement = new PropertyItem(KEY_FLOAT_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Float_Element"),
                 "floatelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
-                new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.POLY_REPORT});
+                new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.POLY_REPORT, PropertyMode.DUCHAMP_REPORT});
         // 控件设置
         PropertyItem widgetSettings = new PropertyItem(KEY_WIDGET_SETTINGS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings"),
                 "widgetsettings", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.FORM, PropertyMode.POLY},
@@ -296,11 +296,11 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         // 条件属性
         PropertyItem conditionAttr = new PropertyItem(KEY_CONDITION_ATTR, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"),
                 "conditionattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
-                new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
+                new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT, PropertyMode.DUCHAMP_REPORT});
         // 超级链接
         PropertyItem hyperlink = new PropertyItem(KEY_HYPERLINK, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hyperlink"),
                 "hyperlink", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
-                new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
+                new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT, PropertyMode.DUCHAMP_REPORT});
         // 组件库
         widgetLibSnapChat = SnapChatFactory.createSnapChat(false, SnapChatKeys.COMPONENT);
         PropertyItem widgetLib = new PropertyItem(

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

@@ -25,7 +25,6 @@ import com.fr.design.dialog.InformationWarnPane;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.file.TemplateResourceManager;
-import com.fr.design.file.TemplateTreePane;
 import com.fr.design.fun.DesignerFrameUpButtonProvider;
 import com.fr.design.fun.MenuHandler;
 import com.fr.design.fun.PreviewProvider;
@@ -35,7 +34,6 @@ import com.fr.design.gui.frpane.HyperlinkGroupPane;
 import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.imenu.UIMenuItem;
-import com.fr.design.gui.itree.filetree.TemplateFileTree;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.chart.info.ChartInfoCollector;
@@ -83,12 +81,8 @@ import javax.swing.BorderFactory;
 import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
-import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.undo.UndoManager;
 import java.awt.BorderLayout;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Callable;
 
@@ -97,6 +91,7 @@ import java.util.concurrent.Callable;
  */
 public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>> extends TargetComponent<T> implements ToolBarMenuDockPlus, DesignerProxy, JTemplateSave, TabChangeListener {
     // TODO ALEX_SEP editingFILE这个属性一定要吗?如果非要不可,有没有可能保证不为null
+
     private static final int PREFIX_NUM = 3000;
     protected FILE editingFILE = null;
     // alex:初始状态为saved,这样不管是新建模板,还是打开模板,如果未做任何操作直接关闭,不提示保存
@@ -116,7 +111,6 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     protected TemplateProcessInfo<T> processInfo;
 
     private JComponent centerPane;
-    private static short currentIndex = 0;// 此变量用于多次新建模板时，让名字不重复
     private DesignModelAdapter<T, ?> designModel;
     private PreviewProvider previewType;
     /**
@@ -142,7 +136,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     }
 
     public JTemplate(T t, String defaultFileName) {
-        this(t, new MemFILE(newTemplateNameByIndex(defaultFileName)), true);
+        this(t, new MemFILE(JTemplateNameHelper.newTemplateNameByIndex(defaultFileName)), true);
     }
 
     public JTemplate(T t, FILE file) {
@@ -163,7 +157,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         // 判断是否切换设计器状态到禁止拷贝剪切
         if (t.getAttrMark(DesignBanCopyAttrMark.XML_TAG) != null) {
             DesignModeContext.switchTo(com.fr.design.base.mode.DesignerMode.BAN_COPY_AND_CUT);
-        } else if (!DesignModeContext.isVcsMode() && !DesignModeContext.isAuthorityEditing()) {
+        } else if (!DesignModeContext.isVcsMode() && !DesignModeContext.isAuthorityEditing() && !DesignModeContext.isDuchampMode()) {
             DesignModeContext.switchTo(com.fr.design.base.mode.DesignerMode.NORMAL);
         }
         this.template = t;
@@ -654,8 +648,6 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
 
     /**
      * 添加图片到格子中
-     *
-     * @return 返回图片URI
      */
     public void setPictureElem(Elem elem, CellImage cellImage) {
         // 子类实现
@@ -865,7 +857,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             return false;
         }
         try {
-            this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(editingFILE));
+            export();
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
             JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage(), "Save Error", JOptionPane.ERROR_MESSAGE);
@@ -879,65 +871,9 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         return true;
     }
 
-    private static String newTemplateNameByIndex(String prefix) {
+    protected boolean export() throws Exception {
-        // 用于获取左侧模板的文件名，如左侧已包含"WorkBook1.cpt, WorkBook12.cpt, WorkBook177.cpt"
+        return this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(editingFILE));
-        // 那么新建的文件名将被命名为"WorkBook178.cpt",即取最大数+1
+
-        TemplateFileTree tt = TemplateTreePane.getInstance().getTemplateFileTree();
-        DefaultMutableTreeNode gen = (DefaultMutableTreeNode) tt.getModel().getRoot();
-        String[] str = new String[gen.getChildCount()];
-
-        List<Integer> reportNum = new ArrayList<>();
-        for (int j = 0; j < gen.getChildCount(); j++) {
-            str[j] = gen.getChildAt(j).toString();
-            //返回文件名中的index(算法中没有再匹配文件后缀了，因为DefaultMutableTreeNode中已经匹配过了)
-            Integer index = getFileNameIndex(prefix, str[j]);
-            if (index != null) {
-                reportNum.add(index);
-            }
-        }
-        Collections.sort(reportNum);
-        int idx = reportNum.size() > 0 ? reportNum.get(reportNum.size() - 1) + 1 : 1;
-
-        idx = idx + currentIndex;
-        currentIndex++;
-        return prefix + idx;
-    }
-
-    /**
-     * @return java.lang.Integer WorkBook11.cpt则返回11，如果没有找到index返回null
-     * @Description 返回文件名中的index
-     * @param: prefix 前缀
-     * @param: fileName 文件名称全名
-     * @Author Henry.Wang
-     * @Date 2021/4/9 11:13
-     **/
-    private static Integer getFileNameIndex(String prefix, String fileName) {
-        char[] chars = new char[fileName.length()];
-        int i = 0;
-        for (; i < fileName.length(); i++) {
-            char c = fileName.charAt(i);
-            //匹配前缀
-            if (i < prefix.length()) {
-                if (c != prefix.charAt(i)) {
-                    return null;
-                }
-            } else {
-                if (c == '.') {
-                    break;
-                } else {
-                    //匹配0~9
-                    if (c < 48 || c > 57) {
-                        return null;
-                    }
-                    chars[i - prefix.length()] = c;
-                }
-            }
-        }
-        String s = new String(chars).substring(0, i - prefix.length());
-        if (StringUtils.isBlank(s)) {
-            return null;
-        }
-        return Integer.valueOf(s);
     }
 
     // /////////////////////////////toolbarMenuDock//////////////////////////////////
@@ -1192,6 +1128,16 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         DesignerContext.getDesignerFrame().addAndActivateJTemplate(this);
     }
 
+    /**
+     * 将要激活打开其他模板，使当前模板灭活
+     * 默认 do nothing 返回true
+     *
+     * @return true：成功停用当前模板
+     */
+    public boolean deactivateTemplate() {
+        return true;
+    }
+
 
     /**
      * 返回当前支持的超链界面pane
@@ -1304,15 +1250,6 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      */
     public abstract Icon getIcon();
 
-    /**
-     * 导出菜单项
-     *
-     * @return 菜单项
-     */
-    @Override
-    public ShortCut[] shortcut4ExportMenu() {
-        return new ShortCut[0];
-    }
 
     /**
      * 复制JS代码
@@ -1430,6 +1367,46 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         return StringUtils.EMPTY;
     }
 
+    /**
+     * 指定 设计器界面 NORTH组件
+     * 默认是 菜单区域
+     *
+     * @return NORTH组件
+     */
+    public JComponent north4DesignerFrame() {
+        return NorthRegionContainerPane.getInstance();
+    }
+
+    /**
+     * 指定 设计器界面 CENTER组件
+     * 默认是 模板对应的工具栏区域+模板设计区域
+     *
+     * @return CENTER组件
+     */
+    public JComponent center4DesignerFrame() {
+        return CenterRegionContainerPane.getInstance();
+    }
+
+    /**
+     * 指定 设计器界面 WEST组件
+     * 默认是 模板目录树+数据集编辑区域
+     *
+     * @return WEST组件
+     */
+    public JComponent west4DesignerFrame() {
+        return WestRegionContainerPane.getInstance();
+    }
+
+    /**
+     * 指定 设计器界面 EAST组件
+     * 默认是 属性配置界面
+     *
+     * @return EAST组件
+     */
+    public JComponent east4DesignerFrame() {
+        return EastRegionContainerPane.getInstance();
+    }
+
     private CallbackSaveWorker save(boolean showLoc) {
         FILE editingFILE = this.getEditingFILE();
         // carl:editingFILE没有，当然不存了,虽然不会有这种情况

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

@@ -0,0 +1,83 @@
+package com.fr.design.mainframe;
+
+import com.fr.design.file.TemplateTreePane;
+import com.fr.design.gui.itree.filetree.TemplateFileTree;
+import com.fr.stable.StringUtils;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author shine
+ * @version 10.0
+ * Created by shine on 2021/5/7
+ */
+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
+        TemplateFileTree tt = TemplateTreePane.getInstance().getTemplateFileTree();
+        DefaultMutableTreeNode gen = (DefaultMutableTreeNode) tt.getModel().getRoot();
+        String[] str = new String[gen.getChildCount()];
+
+        List<Integer> reportNum = new ArrayList<>();
+        for (int j = 0; j < gen.getChildCount(); j++) {
+            str[j] = gen.getChildAt(j).toString();
+            //返回文件名中的index(算法中没有再匹配文件后缀了，因为DefaultMutableTreeNode中已经匹配过了)
+            Integer index = getFileNameIndex(prefix, str[j]);
+            if (index != null) {
+                reportNum.add(index);
+            }
+        }
+        Collections.sort(reportNum);
+        int idx = reportNum.size() > 0 ? reportNum.get(reportNum.size() - 1) + 1 : 1;
+
+        idx = idx + currentIndex;
+        currentIndex++;
+        return prefix + idx;
+    }
+
+    /**
+     * @return java.lang.Integer WorkBook11.cpt则返回11，如果没有找到index返回null
+     * @Description 返回文件名中的index
+     * @param: prefix 前缀
+     * @param: fileName 文件名称全名
+     * @Author Henry.Wang
+     * @Date 2021/4/9 11:13
+     **/
+    private static Integer getFileNameIndex(String prefix, String fileName) {
+        char[] chars = new char[fileName.length()];
+        int i = 0;
+        for (; i < fileName.length(); i++) {
+            char c = fileName.charAt(i);
+            //匹配前缀
+            if (i < prefix.length()) {
+                if (c != prefix.charAt(i)) {
+                    return null;
+                }
+            } else {
+                if (c == '.') {
+                    break;
+                } else {
+                    //匹配0~9
+                    if (c < 48 || c > 57) {
+                        return null;
+                    }
+                    chars[i - prefix.length()] = c;
+                }
+            }
+        }
+        String s = new String(chars).substring(0, i - prefix.length());
+        if (StringUtils.isBlank(s)) {
+            return null;
+        }
+        return Integer.valueOf(s);
+    }
+}

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

@@ -0,0 +1,144 @@
+package com.fr.design.mainframe;
+
+import com.fr.design.DesignState;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.fun.TitlePlaceProcessor;
+import com.fr.design.gui.imenu.UIMenuHighLight;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.loghandler.LogMessageBar;
+import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
+import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
+import com.fr.design.menu.MenuManager;
+import com.fr.design.os.impl.SupportOSImpl;
+import com.fr.general.GeneralContext;
+import com.fr.plugin.context.PluginContext;
+import com.fr.plugin.injectable.PluginModule;
+import com.fr.plugin.manage.PluginFilter;
+import com.fr.plugin.observer.PluginEvent;
+import com.fr.plugin.observer.PluginEventListener;
+import com.fr.stable.os.support.OSBasedAction;
+import com.fr.stable.os.support.OSSupportCenter;
+
+import javax.swing.JMenuBar;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.FlowLayout;
+
+/**
+ * @author shine
+ * @version 10.0
+ * Created by shine on 2021/4/6
+ */
+public class NorthRegionContainerPane extends JPanel {
+
+    private static volatile NorthRegionContainerPane THIS;
+
+    private JMenuBar menuBar;
+
+    public static NorthRegionContainerPane getInstance() {
+        if (THIS == null) {
+            synchronized (NorthRegionContainerPane.class) {
+                if (THIS == null) {
+                    THIS = new NorthRegionContainerPane();
+                }
+            }
+        }
+        return THIS;
+    }
+
+    public NorthRegionContainerPane() {
+
+        ToolBarMenuDock ad = DesignerContext.getDesignerFrame().getToolBarMenuDock();
+
+        this.setLayout(new BorderLayout());
+        this.add(new UIMenuHighLight(), BorderLayout.SOUTH);
+        this.add(initNorthEastPane(ad), BorderLayout.EAST);
+    }
+
+    /**
+     * @param ad 菜单栏
+     * @return panel
+     */
+    protected JPanel initNorthEastPane(final ToolBarMenuDock ad) {
+        //hugh: private修改为protected方便oem的时候修改右上的组件构成
+        //顶部日志+登陆按钮
+        final JPanel northEastPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        //优先级为-1，保证最后全面刷新一次
+        GeneralContext.listenPluginRunningChanged(new PluginEventListener(-1) {
+
+            @Override
+            public void on(PluginEvent event) {
+
+                refreshNorthEastPane(northEastPane, ad);
+                SwingUtilities.invokeLater(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (DesignerContext.getDesignerFrame() == null) {
+                            return;
+                        }
+                        DesignerContext.getDesignerFrame().refresh();
+                        DesignerContext.getDesignerFrame().repaint();
+                    }
+                });
+            }
+        }, new PluginFilter() {
+
+            @Override
+            public boolean accept(PluginContext context) {
+
+                return context.contain(PluginModule.ExtraDesign);
+            }
+        });
+        refreshNorthEastPane(northEastPane, ad);
+        return northEastPane;
+    }
+
+    private void refreshNorthEastPane(final JPanel northEastPane, final ToolBarMenuDock ad) {
+
+        northEastPane.removeAll();
+        northEastPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 0, 0));
+        northEastPane.add(LogMessageBar.getInstance());
+        TitlePlaceProcessor processor = ExtraDesignClassManager.getInstance().getSingle(TitlePlaceProcessor.MARK_STRING);
+        if (processor != null) {
+            final Component[] bbsLoginPane = {null};
+            OSSupportCenter.buildAction(new OSBasedAction() {
+                @Override
+                public void execute(Object... objects) {
+                    bbsLoginPane[0] = ad.createBBSLoginPane();
+                }
+            }, SupportOSImpl.USERINFOPANE);
+            processor.hold(northEastPane, LogMessageBar.getInstance(), bbsLoginPane[0]);
+        }
+        northEastPane.add(ad.createAlphaFinePane());
+        if (!DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) {
+            ad.createAlphaFinePane().setVisible(false);
+        }
+        northEastPane.add(ad.createNotificationCenterPane());
+
+        OSSupportCenter.buildAction(new OSBasedAction() {
+            @Override
+            public void execute(Object... objects) {
+                northEastPane.add(ad.createBBSLoginPane());
+            }
+        }, SupportOSImpl.USERINFOPANE);
+
+    }
+
+    /**
+     * 重置相关的工具条.
+     *
+     * @param plus 工具条中相关信息
+     */
+    void resetToolkitByPlus(ToolBarMenuDockPlus plus, ToolBarMenuDock ad) {
+        DesignState designState = new DesignState(plus);
+        MenuManager.getInstance().setMenus4Designer(designState);
+        if (menuBar == null) {
+            this.add(menuBar = ad.createJMenuBar(plus), BorderLayout.CENTER);
+        } else {
+            ad.resetJMenuBar(menuBar, plus);
+        }
+    }
+}

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

@@ -9,7 +9,19 @@ import com.fr.design.DesignState;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.UpdateAction;
-import com.fr.design.actions.community.*;
+import com.fr.design.actions.community.BBSAction;
+import com.fr.design.actions.community.BugAction;
+import com.fr.design.actions.community.BugNeedAction;
+import com.fr.design.actions.community.CenterAction;
+import com.fr.design.actions.community.FacebookFansAction;
+import com.fr.design.actions.community.NeedAction;
+import com.fr.design.actions.community.QuestionAction;
+import com.fr.design.actions.community.SignAction;
+import com.fr.design.actions.community.TechSolutionAction;
+import com.fr.design.actions.community.TechSupportAction;
+import com.fr.design.actions.community.TemplateStoreAction;
+import com.fr.design.actions.community.VideoAction;
+import com.fr.design.actions.community.WorkOrderCenterAction;
 import com.fr.design.actions.file.CloseCurrentTemplateAction;
 import com.fr.design.actions.file.ExitDesignerAction;
 import com.fr.design.actions.file.OpenRecentReportMenuDef;
@@ -64,7 +76,6 @@ import com.fr.plugin.observer.PluginEventType;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.bridge.ObjectHolder;
-import com.fr.stable.os.support.OSBasedAction;
 import com.fr.stable.os.support.OSSupportCenter;
 import com.fr.start.OemHandler;
 import com.fr.workspace.WorkContext;
@@ -141,16 +152,6 @@ public abstract class ToolBarMenuDock {
             return PANLE_HEIGNT;
         }
 
-        /**
-         * 导出菜单的子菜单 ，目前用于图表设计器
-         *
-         * @return 子菜单
-         */
-        @Override
-        public ShortCut[] shortcut4ExportMenu() {
-            return new ShortCut[0];
-        }
-
     };
     private static final int MENUBAR_HEIGHT = 22;
 

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

@@ -1,11 +1,13 @@
 package com.fr.design.mainframe.toolbar;
 
-import javax.swing.*;
+import com.fr.design.gui.itoolbar.UIToolbar;
-
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.menu.ToolBarDef;
 
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+
 public interface ToolBarMenuDockPlus {
     /**
      * 模板的工具
@@ -54,10 +56,19 @@ public interface ToolBarMenuDockPlus {
     int getToolBarHeight();
 
     /**
-     * 导出菜单的子菜单 ，目前用于图表设计器
+     * 是否含有工具栏 包含：预览按钮 复制粘贴那一行 模板标签页那一行 字体颜色那一行
      *
-     * @return 子菜单
+     * @return 默认返回true
      */
-    ShortCut[] shortcut4ExportMenu();
+    default boolean hasToolBarPane() {
+        return true;
+    }
+
+    /**
+     * 往 复制粘贴那一行工具栏 插入 工具栏按钮
+     */
+    default void insertToCombineUpToolbar(UIToolbar combineUp) {
+    }
+
 
 }

designer-base/src/main/java/com/fr/design/style/background/image/ImageFileChooser.java

@@ -3,266 +3,77 @@
  */
 package com.fr.design.style.background.image;
 
-import com.fr.base.BaseUtils;
 import com.fr.design.DesignerEnvManager;
-import com.fr.design.style.ChooseFileView;
+import com.fr.design.gui.ifilechooser.FileSelectionMode;
-
+import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
-
+import com.fr.design.gui.ilable.UILabel;
-import javax.swing.filechooser.FileFilter;
+import com.fr.design.i18n.Toolkit;
-import java.awt.Component;
+import com.fr.design.layout.FRGUIPaneFactory;
-import java.awt.event.ActionEvent;
+import com.fr.design.mainframe.share.collect.ComponentCollector;
-import java.awt.event.ActionListener;
+import com.fr.design.mainframe.toast.DesignerToastMsgUtil;
+import javafx.stage.FileChooser;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.io.File;
-import java.util.Enumeration;
-import java.util.Hashtable;
 
 
 /**
  * This class used to choose image files.
  */
-public class ImageFileChooser extends ExpandFileChooser {
+public class ImageFileChooser {
-
-    public ImageFileChooser() {
-        super(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Compress"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open"));
-        ExampleFileFilter bothFilter = new ExampleFileFilter(
-                new String[]{"jpg", "gif", "png", "bmp"},
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Image_Files"));
-        bothFilter.setExtensionListInDescription(true);
-        this.addChoosableFileFilter(bothFilter);
-        this.setAcceptAllFileFilterUsed(false);
 
-        // Create Custom FileView
+    JavaFxNativeFileChooser javaFxNativeFileChooser;
-        ChooseFileView fileView = new ChooseFileView();
-        fileView.putIcon("jpg", BaseUtils.readIcon("/com/fr/base/images/dialog/file/jpgFile.gif"));
-        fileView.putIcon("gif", BaseUtils.readIcon("/com/fr/base/images/dialog/file/gifFile.gif"));
-        fileView.putIcon("png", BaseUtils.readIcon("/com/fr/base/images/dialog/file/pngFile.png"));
-        fileView.putIcon("bmp", BaseUtils.readIcon("/com/fr/base/images/dialog/file/bmpFile.gif"));
-
-        this.setFileView(fileView);
-    }
-
-    public int showDialog(Component parent, String approveButtonText) {
-        return super.showDialog(parent, approveButtonText);
-    }
-
-    @Override
-    public ActionListener checkAction() {
-        return new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                DesignerEnvManager.getEnvManager().setImageCompress(isCheckSelected());
-                DesignerEnvManager.getEnvManager().saveXMLFile();
-            }
-        };
-
-    }
-
-    /**
-     * A convenience implementation of FileFilter that filters out
-     * all files except for those type extensions that it knows about.
-     * <p/>D:\finereport\develop\code\test\TestCase\WEB-INF\reportlets\TestCase\01903.cpt
-     * <p>
-     * Extensions are of the type ".foo", which is typically found on
-     * Windows and Unix boxes, but not on Macinthosh. Case is ignored.
-     * <p/>
-     * Example - create a new filter that filerts out all files
-     * but gif and jpg image files:
-     * <p/>
-     * JFileChooser chooser = new JFileChooser();
-     * ExampleFileFilter filter = new ExampleFileFilter(
-     * new String{"gif", "jpg"}, "JPEG & GIF Images")
-     * chooser.addChoosableFileFilter(filter);
-     * chooser.showOpenDialog(this);
-     *
-     * @author Jeff Dinkins
-     * @version 1.12 12/03/01
-     */
-    class ExampleFileFilter extends FileFilter {
-        private Hashtable filters = null;
-        private String description = null;
-        private String fullDescription = null;
-        private boolean useExtensionsInDescription = true;
 
-        /**
+    public ImageFileChooser() {
-         * Creates a file filter. If no filters are added, then all
+        javaFxNativeFileChooser =
-         * files are accepted.
+                new JavaFxNativeFileChooser.Builder().
-         *
+                        fileSelectionMode(FileSelectionMode.FILE).
-         * @see #addExtension
+                        title(Toolkit.i18nText("Fine-Design_Basic_Open")).
-         */
+                        filters(new FileChooser.ExtensionFilter[]{
-        public ExampleFileFilter() {
+                                new FileChooser.ExtensionFilter("jpg", "*.jpg"),
-            this.filters = new Hashtable();
+                                new FileChooser.ExtensionFilter("gif", "*.gif"),
-        }
+                                new FileChooser.ExtensionFilter("png", "*.png"),
-
+                                new FileChooser.ExtensionFilter("bmp", "*.bmp")}).
-        /**
+                        build();
-         * Creates a file filter that accepts files with the given extension.
-         * Example: new ExampleFileFilter("jpg");
-         *
-         * @see #addExtension
-         */
-        public ExampleFileFilter(String extension) {
-            this(extension, null);
-        }
-
-        /**
-         * Creates a file filter that accepts the given file type.
-         * Example: new ExampleFileFilter("jpg", "JPEG Image Images");
-         * <p/>
-         * Note that the "." before the extension is not needed. If
-         * provided, it will be ignored.
-         *
-         * @see #addExtension
-         */
-        public ExampleFileFilter(String extension, String description) {
-            this();
-            if (extension != null) addExtension(extension);
-            if (description != null) setDescription(description);
-        }
-
-        /**
-         * Creates a file filter from the given string array.
-         * Example: new ExampleFileFilter(String {"gif", "jpg"});
-         * <p/>
-         * Note that the "." before the extension is not needed adn
-         * will be ignored.
-         *
-         * @see #addExtension
-         */
-        public ExampleFileFilter(String[] filters) {
-            this(filters, null);
     }
 
-        /**
-         * Creates a file filter from the given string array and description.
-         * Example: new ExampleFileFilter(String {"gif", "jpg"}, "Gif and JPG Images");
-         * <p/>
-         * Note that the "." before the extension is not needed and will be ignored.
-         *
-         * @see #addExtension
-         */
-        public ExampleFileFilter(String[] filters, String description) {
-            this();
-            for (int i = 0; i < filters.length; i++) {
-                // add filters one by one
-                addExtension(filters[i]);
-            }
-            if (description != null) setDescription(description);
-        }
 
-        /**
+    public int showOpenDialog(Component parent, String approveButtonText) {
-         * Return true if this file should be shown in the directory pane,
+        return showOpenDialog(parent);
-         * false if it shouldn't.
-         * <p/>
-         * Files that begin with "." are ignored.
-         *
-         * @see #getExtension
-         */
-        public boolean accept(File f) {
-            if (f != null) {
-                if (f.isDirectory()) {
-                    return true;
-                }
-                String extension = getExtension(f);
-                if (extension != null && filters.get(getExtension(f)) != null) {
-                    return true;
-                }
-            }
-            return false;
     }
 
-        /**
+    public int showOpenDialog(Component parent) {
-         * Return the extension portion of the file's name .
+        showImageCompressMoveTip();
-         *
+        return javaFxNativeFileChooser.showDialog(parent);
-         * @see #getExtension
-         * @see javax.swing.filechooser.FileFilter#accept
-         */
-        public String getExtension(File f) {
-            if (f != null) {
-                String filename = f.getName();
-                int i = filename.lastIndexOf('.');
-                if (i > 0 && i < filename.length() - 1) {
-                    return filename.substring(i + 1).toLowerCase();
-                }
-            }
-            return null;
     }
 
-        /**
+    public void setCurrentDirectory(File file) {
-         * Adds a filetype "dot" extension to filter against.
+        javaFxNativeFileChooser.setCurrentDirectory(file);
-         * <p/>
-         * For example: the following code will create a filter that filters
-         * out all files except those that end in ".jpg" and ".tif":
-         * <p/>
-         * ExampleFileFilter filter = new ExampleFileFilter();
-         * filter.addExtension("jpg");
-         * filter.addExtension("tif");
-         * <p/>
-         * Note that the "." before the extension is not needed and will be ignored.
-         */
-        public void addExtension(String extension) {
-            if (filters == null) {
-                filters = new Hashtable(5);
-            }
-            filters.put(extension.toLowerCase(), this);
-            fullDescription = null;
     }
 
-
+    public void setMultiSelectionEnabled(boolean multiple) {
-        /**
+        if (multiple) {
-         * Returns the human readable description of this filter. For
+            javaFxNativeFileChooser.setSelectionMode(FileSelectionMode.MULTIPLE_FILE);
-         * example: "JPEG and GIF Image Files (*.jpg, *.gif)"
-         *
-         * @see javax.swing.filechooser.FileFilter#getDescription
-         */
-        public String getDescription() {
-            if (fullDescription == null) {
-                if (description == null || isExtensionListInDescription()) {
-                    fullDescription = description == null ? "(" : description + " (";
-                    // build the description from the extension list
-                    Enumeration extensions = filters.keys();
-                    if (extensions != null) {
-                        fullDescription += "." + extensions.nextElement();
-                        while (extensions.hasMoreElements()) {
-                            fullDescription += ", ." + extensions.nextElement();
-                        }
-                    }
-                    fullDescription += ")";
         } else {
-                    fullDescription = description;
+            javaFxNativeFileChooser.setSelectionMode(FileSelectionMode.FILE);
         }
     }
-            return fullDescription;
-        }
 
-        /**
+    public File getSelectedFile() {
-         * Sets the human readable description of this filter. For
+        return javaFxNativeFileChooser.getSelectedFile();
-         * example: filter.setDescription("Gif and JPG Images");
-         */
-        public void setDescription(String description) {
-            this.description = description;
-            fullDescription = null;
     }
 
-        /**
+    public boolean isCheckSelected() {
-         * Determines whether the extension list (.jpg, .gif, etc) should
+        return DesignerEnvManager.getEnvManager().isImageCompress();
-         * show up in the human readable description.
-         * <p/>
-         * Only relevent if a description was provided in the constructor
-         * or using setDescription();
-         */
-        public void setExtensionListInDescription(boolean b) {
-            useExtensionsInDescription = b;
-            fullDescription = null;
     }
 
-        /**
+    private void showImageCompressMoveTip() {
-         * Returns whether the extension list (.jpg, .gif, etc) should
+        if (DesignerEnvManager.getEnvManager().isShowImageCompressMoveTip()) {
-         * show up in the human readable description.
+            DesignerToastMsgUtil.toastWarning(Toolkit.i18nText("Fine-Design_Image_Compress_Move_Tip"));
-         * <p/>
+            DesignerEnvManager.getEnvManager().setShowImageCompressMoveTip(false);
-         * Only relevent if a description was provided in the constructor
-         * or using setDescription();
-         */
-        public boolean isExtensionListInDescription() {
-            return useExtensionsInDescription;
         }
     }
 }

designer-base/src/main/java/com/fr/design/ui/compatible/ModernUIPaneFactory.java

@@ -11,10 +11,10 @@ import com.fr.stable.os.OperatingSystem;
 public class ModernUIPaneFactory {
 
     public static <T> ModernUIPane.Builder<T> modernUIPaneBuilder() {
-        if (OperatingSystem.isWindows()) {
+//        if (OperatingSystem.isWindows()) {
-            return new NewModernUIPane.Builder<>();
+//            return new NewModernUIPane.Builder<>();
-        } else {
+//        } else {
+//        }
         return new ModernUIPane.Builder<>();
     }
 }
-}

designer-base/src/main/java/com/fr/design/upm/UpmBridge.java

@@ -14,6 +14,9 @@ import com.fr.design.extra.exe.GetPluginPrefixExecutor;
 import com.fr.design.extra.exe.PluginLoginExecutor;
 import com.fr.design.extra.exe.ReadUpdateOnlineExecutor;
 import com.fr.design.extra.exe.SearchOnlineExecutor;
+import com.fr.design.gui.ifilechooser.FileChooserProvider;
+import com.fr.design.gui.ifilechooser.FileSelectionMode;
+import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.locale.impl.BbsRegisterMark;
 import com.fr.design.locale.impl.BbsResetMark;
@@ -36,6 +39,7 @@ import com.teamdev.jxbrowser.chromium.Browser;
 import com.teamdev.jxbrowser.chromium.JSArray;
 import com.teamdev.jxbrowser.chromium.JSFunction;
 import com.teamdev.jxbrowser.chromium.JSObject;
+import javafx.stage.FileChooser;
 
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
@@ -308,16 +312,13 @@ public class UpmBridge {
         RunnableFuture<String> future = new FutureTask<>(new Callable<String>() {
             @Override
             public String call() {
-                JFileChooser fileChooser = new JFileChooser();
+                FileChooserProvider fileChooserProvider = new JavaFxNativeFileChooser.Builder().
-                fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
+                        fileSelectionMode(FileSelectionMode.FILE).
-
+                        filter(des, filter).
-                if (StringUtils.isNotEmpty(filter)) {
+                        build();
-                    fileChooser.setFileFilter(new FileNameExtensionFilter(des, UpmUtils.findMatchedExtension(filter)));
+                int result = fileChooserProvider.showDialog(UpmFinder.getDialog());
-                }
-
-                int result = fileChooser.showOpenDialog(UpmFinder.getDialog());
                 if (result == JFileChooser.APPROVE_OPTION) {
-                    return fileChooser.getSelectedFile().getAbsolutePath();
+                    return fileChooserProvider.getSelectedFile().getAbsolutePath();
                 }
                 return null;
             }

designer-base/src/main/java/com/fr/design/web/CustomIconPane.java

@@ -10,6 +10,8 @@ import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icontainer.UIScrollPane;
+import com.fr.design.gui.ifilechooser.FileChooserProvider;
+import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.iscrollbar.UIScrollBar;
 import com.fr.design.gui.itextarea.DescriptionTextArea;
@@ -28,6 +30,7 @@ import com.fr.stable.ListMap;
 import com.fr.stable.StringUtils;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.WorkerFacade;
+import javafx.stage.FileChooser;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -447,13 +450,12 @@ public class CustomIconPane extends BasicPane {
         }
 
         private void onBrowseButtonClicked() {
-            JFileChooser jf = new JFileChooser();
             // carl:不知道是否只要png格式,反正导出时全部都转成png了
-            FileNameExtensionFilter fileFilter = new FileNameExtensionFilter("Icon Image File", "jpg", "jpeg", "png", "gif");
+            FileChooserProvider fileChooserProvider = new JavaFxNativeFileChooser.Builder().
-            jf.setFileFilter(fileFilter);
+                    filter("Icon Image File", "*.jpg", "*.jpeg", "*.png", "*.gif").
-
+                    build();
-            if (JFileChooser.APPROVE_OPTION == jf.showOpenDialog(DesignerContext.getDesignerFrame())) {
+            if (JFileChooser.APPROVE_OPTION == fileChooserProvider.showDialog(DesignerContext.getDesignerFrame())) {
-                String path = jf.getSelectedFile().getAbsolutePath();
+                String path = fileChooserProvider.getSelectedFile().getAbsolutePath();
                 // 图片存储有最大值48*48限制，没有超过最大值时，按原图大小存储，超过最大值后，压缩至最大值存储
                 Image image = BaseUtils.readImage(path);
                 iconImage = ImageUtils.scale((BufferedImage) image, Math.min(image.getWidth(null), IconManager.MAXSTORAGE_ICONWIDTH), Math.min(image.getHeight(null), IconManager.MAXSTORAGE_ICONHEIGHT), true, Image.SCALE_SMOOTH);

designer-base/src/main/java/com/fr/env/RemoteEnvPane.java

@@ -9,6 +9,9 @@ import com.fr.design.fun.DesignerEnvProcessor;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icontainer.UIScrollPane;
+import com.fr.design.gui.ifilechooser.FileChooserProvider;
+import com.fr.design.gui.ifilechooser.FileSelectionMode;
+import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ipasswordfield.UIPassWordField;
 import com.fr.design.gui.ipasswordfield.UIPasswordFieldWithFixedLength;
@@ -561,11 +564,10 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
         fileChooserButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent evt) {
-                JFileChooser fileChooser = new JFileChooser();
+                FileChooserProvider fileChooserProvider = new JavaFxNativeFileChooser.Builder().fileSelectionMode(FileSelectionMode.FILE).build();
-                fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
+                int saveValue = fileChooserProvider.showDialog(SwingUtilities.getWindowAncestor(RemoteEnvPane.this));
-                int saveValue = fileChooser.showOpenDialog(SwingUtilities.getWindowAncestor(RemoteEnvPane.this));
                 if (saveValue == JFileChooser.APPROVE_OPTION) {
-                    File selectedFile = fileChooser.getSelectedFile();
+                    File selectedFile = fileChooserProvider.getSelectedFile();
                     certPathInput.setText(selectedFile.getAbsolutePath());
                 }
             }

designer-base/src/test/java/com/fr/design/mainframe/JTemplateNameHelperTest.java

@@ -0,0 +1,23 @@
+package com.fr.design.mainframe;
+
+import junit.framework.TestCase;
+
+/**
+ * @author shine
+ * @version 10.0
+ * Created by shine on 2021/5/8
+ */
+public class JTemplateNameHelperTest extends TestCase {
+
+    public void testNewTemplateNameByIndex() {
+
+        String name = JTemplateNameHelper.newTemplateNameByIndex("TEST");
+
+        assertEquals("TEST1", name);
+
+        String name1 = JTemplateNameHelper.newTemplateNameByIndex("TEST");
+
+        assertEquals("TEST2", name1);
+
+    }
+}

designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java

@@ -8,7 +8,6 @@ import com.fr.chart.fun.ChartTypeProvider;
 import com.fr.chartx.attr.ChartProvider;
 import com.fr.common.annotations.Compatible;
 import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.chart.fun.ChartTypeUIProvider;
 import com.fr.design.chart.gui.ChartWidgetOption;
 import com.fr.design.condition.ConditionAttributesPane;
@@ -46,7 +45,6 @@ import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.invoke.Reflect;
 import com.fr.locale.InterProviderFactory;
-import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.PiePlot4VanChart;
 import com.fr.plugin.chart.area.VanChartAreaPlot;
 import com.fr.plugin.chart.box.VanChartBoxPlot;
@@ -75,7 +73,6 @@ import com.fr.plugin.observer.PluginEvent;
 import com.fr.plugin.observer.PluginEventListener;
 import com.fr.plugin.solution.closeable.CloseableContainedMap;
 import com.fr.stable.ArrayUtils;
-import com.fr.stable.AssistUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
 import com.fr.van.chart.area.AreaIndependentVanChartInterface;
@@ -100,17 +97,7 @@ import com.fr.van.chart.treemap.TreeMapIndependentVanChartInterface;
 import com.fr.van.chart.wordcloud.designer.WordCloudIndependentVanChartInterface;
 
 import javax.swing.Icon;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.awt.event.ActionListener;
-
-import static com.fr.chart.charttypes.ChartTypeManager.DEFAULT_PRIORITY;
-import static com.fr.chart.charttypes.ChartTypeManager.DEPRECATED_CHART_PRIORITY;
-import static com.fr.chart.charttypes.ChartTypeManager.VAN_CHART_PRIORITY;
 
 /**
  * Created by eason on 14/12/29.
@@ -120,10 +107,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
 
     private static ChartTypeInterfaceManager classManager = new ChartTypeInterfaceManager();
 
-    private static LinkedHashMap<String, CloseableContainedMap<String, ChartTypeUIProvider, LinkedHashMap>> chartTypeInterfaces =
+    private static CloseableContainedMap<String, ChartTypeUIProvider, HashMap> chartTypeUIs = new CloseableContainedMap<>(HashMap.class);
-            new LinkedHashMap<String, CloseableContainedMap<String, ChartTypeUIProvider, LinkedHashMap>>();
-
-    private static Map<String, String> idAndPriorityMap = new HashMap<String, String>();
 
     public static final String TYPE_PANE_DEFAULT_TITLE = "DEFAULT_NAME";
 
@@ -186,127 +170,69 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
 
     private static void readVanChart() {
 
-        addChartTypeInterface(VAN_CHART_PRIORITY, PiePlot4VanChart.VAN_CHART_PIE_PLOT, new PieIndependentVanChartInterface());
+        addChartTypeInterface(PiePlot4VanChart.VAN_CHART_PIE_PLOT, new PieIndependentVanChartInterface());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartColumnPlot.VAN_CHART_COLUMN_PLOT_ID, new VanColumnChartTypeUI());
+        addChartTypeInterface(VanChartColumnPlot.VAN_CHART_COLUMN_PLOT_ID, new VanColumnChartTypeUI());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartColumnPlot.VAN_CHART_BAR_PLOT_ID, new BarIndependentVanChartInterface());
+        addChartTypeInterface(VanChartColumnPlot.VAN_CHART_BAR_PLOT_ID, new BarIndependentVanChartInterface());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartLinePlot.VAN_CHART_LINE_PLOT, new LineIndependentVanChartInterface());
+        addChartTypeInterface(VanChartLinePlot.VAN_CHART_LINE_PLOT, new LineIndependentVanChartInterface());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartAreaPlot.VAN_CHART_AREA_PLOT_ID, new AreaIndependentVanChartInterface());
+        addChartTypeInterface(VanChartAreaPlot.VAN_CHART_AREA_PLOT_ID, new AreaIndependentVanChartInterface());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartGaugePlot.VAN_CHART_GAUGE_PLOT, new GaugeIndependentVanChartInterface());
+        addChartTypeInterface(VanChartGaugePlot.VAN_CHART_GAUGE_PLOT, new GaugeIndependentVanChartInterface());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartRadarPlot.VAN_CHART_RADAR_PLOT, new RadarIndependentVanChartInterface());
+        addChartTypeInterface(VanChartRadarPlot.VAN_CHART_RADAR_PLOT, new RadarIndependentVanChartInterface());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartScatterPlot.VAN_CHART_SCATTER_PLOT_ID, new ScatterIndependentVanChartInterface());
+        addChartTypeInterface(VanChartScatterPlot.VAN_CHART_SCATTER_PLOT_ID, new ScatterIndependentVanChartInterface());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartBubblePlot.VAN_CHART_BUBBLE_PLOT_ID, new BubbleIndependentVanChartInterface());
+        addChartTypeInterface(VanChartBubblePlot.VAN_CHART_BUBBLE_PLOT_ID, new BubbleIndependentVanChartInterface());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartCustomPlot.VAN_CHART_CUSTOM_PLOT_ID, new CustomIndependentVanChartInterface());
+        addChartTypeInterface(VanChartCustomPlot.VAN_CHART_CUSTOM_PLOT_ID, new CustomIndependentVanChartInterface());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartMultiPiePlot.VAN_CHART_MULTILAYER_PLOT_ID, new MultiPieIndependentVanChartInterface());
+        addChartTypeInterface(VanChartMultiPiePlot.VAN_CHART_MULTILAYER_PLOT_ID, new MultiPieIndependentVanChartInterface());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartMapPlot.VAN_CHART_MAP_ID, new VanMapChartTypeUI());
+        addChartTypeInterface(VanChartMapPlot.VAN_CHART_MAP_ID, new VanMapChartTypeUI());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartDrillMapPlot.VAN_CHART_DRILL_MAP_ID, new VanDrillMapChartTypeUI());
+        addChartTypeInterface(VanChartDrillMapPlot.VAN_CHART_DRILL_MAP_ID, new VanDrillMapChartTypeUI());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartTreeMapPlot.VAN_CHART_TREE_MAP_PLOT_ID, new TreeMapIndependentVanChartInterface());
+        addChartTypeInterface(VanChartTreeMapPlot.VAN_CHART_TREE_MAP_PLOT_ID, new TreeMapIndependentVanChartInterface());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartFunnelPlot.VAN_CHART_FUNNEL_PLOT_ID, new FunnelIndependentVanChartInterface());
+        addChartTypeInterface(VanChartFunnelPlot.VAN_CHART_FUNNEL_PLOT_ID, new FunnelIndependentVanChartInterface());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartHeatMapPlot.VAN_CHART_HEAT_MAP_ID, new VanHeatMapChartTypeUI());
+        addChartTypeInterface(VanChartHeatMapPlot.VAN_CHART_HEAT_MAP_ID, new VanHeatMapChartTypeUI());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartWordCloudPlot.WORD_CLOUD_PLOT_ID, new WordCloudIndependentVanChartInterface());
+        addChartTypeInterface(VanChartWordCloudPlot.WORD_CLOUD_PLOT_ID, new WordCloudIndependentVanChartInterface());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartGanttPlot.VAN_CHART_GANTT_PLOT_ID, new GanttIndependentVanChartInterface());
+        addChartTypeInterface(VanChartGanttPlot.VAN_CHART_GANTT_PLOT_ID, new GanttIndependentVanChartInterface());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartStructurePlot.STRUCTURE_PLOT_ID, new VanStructureChartTypeUI());
+        addChartTypeInterface(VanChartStructurePlot.STRUCTURE_PLOT_ID, new VanStructureChartTypeUI());
-        addChartTypeInterface(VAN_CHART_PRIORITY, VanChartBoxPlot.VAN_CHART_BOX_PLOT_ID, new BoxIndependentVanChartInterface());
+        addChartTypeInterface(VanChartBoxPlot.VAN_CHART_BOX_PLOT_ID, new BoxIndependentVanChartInterface());
     }
 
 
     private static void readDefault() {
 
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.COLUMN_CHART, new ColumnChartTypeUI());
+        addChartTypeInterface(ChartConstants.COLUMN_CHART, new ColumnChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.LINE_CHART, new LineChartTypeUI());
+        addChartTypeInterface(ChartConstants.LINE_CHART, new LineChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.BAR_CHART, new BarChartTypeUI());
+        addChartTypeInterface(ChartConstants.BAR_CHART, new BarChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.PIE_CHART, new PieChartTypeUI());
+        addChartTypeInterface(ChartConstants.PIE_CHART, new PieChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.AREA_CHART, new AreaChartTypeUI());
+        addChartTypeInterface(ChartConstants.AREA_CHART, new AreaChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.SCATTER_CHART, new XYScatterChartTypeUI());
+        addChartTypeInterface(ChartConstants.SCATTER_CHART, new XYScatterChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.BUBBLE_CHART, new BubbleChartTypeUI());
+        addChartTypeInterface(ChartConstants.BUBBLE_CHART, new BubbleChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.RADAR_CHART, new RadarChartTypeUI());
+        addChartTypeInterface(ChartConstants.RADAR_CHART, new RadarChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.STOCK_CHART, new StockChartTypeUI());
+        addChartTypeInterface(ChartConstants.STOCK_CHART, new StockChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.METER_CHART, new MeterChartTypeUI());
+        addChartTypeInterface(ChartConstants.METER_CHART, new MeterChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.RANGE_CHART, new RangeChartTypeUI());
+        addChartTypeInterface(ChartConstants.RANGE_CHART, new RangeChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.CUSTOM_CHART, new CustomChartTypeUI());
+        addChartTypeInterface(ChartConstants.CUSTOM_CHART, new CustomChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GANTT_CHART, new GanttChartTypeUI());
+        addChartTypeInterface(ChartConstants.GANTT_CHART, new GanttChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.DONUT_CHART, new DonutChartTypeUI());
+        addChartTypeInterface(ChartConstants.DONUT_CHART, new DonutChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.MAP_CHART, new MapChartTypeUI());
+        addChartTypeInterface(ChartConstants.MAP_CHART, new MapChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GIS_CHAER, new GisMapChartTypeUI());
+        addChartTypeInterface(ChartConstants.GIS_CHAER, new GisMapChartTypeUI());
-        addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.FUNNEL_CHART, new FunnelChartTypeUI());
+        addChartTypeInterface(ChartConstants.FUNNEL_CHART, new FunnelChartTypeUI());
     }
 
-    private static void addChartTypeInterface(String priority, String plotID, ChartTypeUIProvider provider) {
+    private static void addChartTypeInterface(String id, ChartTypeUIProvider provider) {
 
-        if (chartTypeInterfaces != null) {
+        if (chartTypeUIs != null) {
-            if (!chartTypeInterfaces.containsKey(priority)) {
+            chartTypeUIs.put(id, provider);
-                //新建一个具体图表列表
-                CloseableContainedMap<String, ChartTypeUIProvider, LinkedHashMap> chartUIList
-                        = new CloseableContainedMap<String, ChartTypeUIProvider, LinkedHashMap>(LinkedHashMap.class);
-                chartUIList.put(plotID, provider);
-                chartTypeInterfaces.put(priority, chartUIList);
-            } else {
-                Map<String, ChartTypeUIProvider> chartUIList = chartTypeInterfaces.get(priority);
-                if (!chartUIList.containsKey(plotID)) {
-                    chartUIList.put(plotID, provider);
-                }
-            }
-            idAndPriorityMap.put(plotID, priority);
         }
     }
 
-    private ChartTypeUIProvider getChartTypeInterface(String plotID) {
+    private ChartTypeUIProvider getChartTypeInterface(String id) {
-        if (idAndPriorityMap.containsKey(plotID)) {
+        if (chartTypeUIs.containsKey(id)) {
-            String priority = idAndPriorityMap.get(plotID);
+            return chartTypeUIs.get(id);
-            if (chartTypeInterfaces.containsKey(priority)) {
-                return chartTypeInterfaces.get(priority).get(plotID);
-            }
         }
         return null;
     }
 
-    /**
+    public AbstractChartTypePane getPlotTypePane(String id) {
-     * 把所有的pane加到list里
+        if (chartTypeUIs.containsKey(id)) {
-     *
+            return chartTypeUIs.get(id).getPlotTypePane();
-     * @param paneList pane容器
-     */
-    public void addPlotTypePaneList(List<FurtherBasicBeanPane<? extends ChartProvider>> paneList,
-                                    Map<String, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>> allChartTypePane,
-                                    ActionListener autoButtonListener) {
-
-        List<Integer> priorityList = getPriorityInOrder();
-        for (Integer aPriorityList : priorityList) {
-            String priority = String.valueOf(aPriorityList);
-            addPlotTypePaneList(priority, paneList, allChartTypePane, autoButtonListener);
-        }
-    }
-
-
-    public void addPlotTypePaneList(String priority, List<FurtherBasicBeanPane<? extends ChartProvider>> paneList,
-                                    Map<String, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>> allChartTypePane,
-                                    ActionListener autoButtonListener) {
-
-        if (chartTypeInterfaces != null && chartTypeInterfaces.containsKey(priority)) {
-
-            Map<String, ChartTypeUIProvider> chartUIList = chartTypeInterfaces.get(priority);
-
-            Iterator<Map.Entry<String, ChartTypeUIProvider>> iterator = chartUIList.entrySet().iterator();
-            while (iterator.hasNext()) {
-                try {
-                    Map.Entry<String, ChartTypeUIProvider> entry = iterator.next();
-                    String plotID = entry.getKey();
-
-                    AbstractChartTypePane pane = entry.getValue().getPlotTypePane();
-                    if (AssistUtils.equals(pane.title4PopupWindow(), TYPE_PANE_DEFAULT_TITLE)) {
-                        continue;
-                    }
-                    pane.reLayout(plotID);
-                    pane.registerButtonListener(autoButtonListener);
-                    paneList.add(pane);
-
-                    if (allChartTypePane.get(priority) == null) {
-                        allChartTypePane.put(priority, new LinkedHashMap<String, FurtherBasicBeanPane<? extends ChartProvider>>());
-                    }
-                    allChartTypePane.get(priority).put(plotID, pane);
-                } catch (Throwable e) {
-                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
-                }
-            }
         }
+        return null;
     }
 
     @Compatible
@@ -314,23 +240,9 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
         return getName(plotID);
     }
 
-    private List<Integer> getPriorityInOrder() {
-
-        List<Integer> priorityList = new ArrayList<Integer>();
-        if (chartTypeInterfaces != null) {
-            Iterator iterator = chartTypeInterfaces.entrySet().iterator();
-            while (iterator.hasNext()) {
-                Map.Entry entry = (Map.Entry) iterator.next();
-                String priority = (String) entry.getKey();
-                priorityList.add(Integer.valueOf(priority));
-            }
-        }
-        return ChartTypeManager.orderInPriority(priorityList);
-    }
-
     public String getIconPath(String plotID) {
 
-        if (chartTypeInterfaces != null) {
+        if (chartTypeUIs != null) {
             ChartTypeUIProvider provider = getChartTypeInterface(plotID);
             if (provider != null) {
                 return provider.getIconPath();
@@ -341,7 +253,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
 
     public String[] getDemoImagePath(String chartID) {
 
-        if (chartTypeInterfaces != null) {
+        if (chartTypeUIs != null) {
             ChartTypeUIProvider provider = getChartTypeInterface(chartID);
             if (provider != null) {
                 String[] result = null;
@@ -397,7 +309,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
     }
 
     public String[] getSubName(String chartID) {
-        if (chartTypeInterfaces != null) {
+        if (chartTypeUIs != null) {
             ChartTypeUIProvider provider = getChartTypeInterface(chartID);
             if (provider != null) {
                 String[] subNames = null;
@@ -430,7 +342,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
     }
 
     public String getName(String chartID) {
-        if (chartTypeInterfaces != null) {
+        if (chartTypeUIs != null) {
             ChartTypeUIProvider provider = getChartTypeInterface(chartID);
             if (provider != null) {
                 String name = null;
@@ -575,9 +487,8 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
             if (StringUtils.isEmpty(id)) {
                 id = injection.getAttribute("plotID");
             }
-            String priority = injection.getAttribute("priority", DEFAULT_PRIORITY);
             ChartTypeUIProvider instance = (ChartTypeUIProvider) injection.getObject();
-            addChartTypeInterface(priority, id, instance);
+            addChartTypeInterface(id, instance);
         }
     }
 
@@ -586,22 +497,18 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
     public void demount(PluginSingleInjection injection) {
 
         if (isChartTypeUIProvider(injection)) {
-            String priority = injection.getAttribute("priority", DEFAULT_PRIORITY);
             String id = injection.getAttribute("chartID");
             if (StringUtils.isEmpty(id)) {
                 id = injection.getAttribute("plotID");
             }
-            removeChartTypeInterface(priority, id);
+            removeChartTypeInterface(id);
         }
     }
 
-    private void removeChartTypeInterface(String priority, String plotID) {
+    private void removeChartTypeInterface(String id) {
 
-        if (chartTypeInterfaces != null) {
+        if (chartTypeUIs != null) {
-            if (chartTypeInterfaces.containsKey(priority)) {
+            chartTypeUIs.remove(id);
-                Map<String, ChartTypeUIProvider> chartUIList = chartTypeInterfaces.get(priority);
-                chartUIList.remove(plotID);
-            }
         }
     }
 

designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java

@@ -90,7 +90,9 @@ public interface ChartTypeUIProvider extends Level {
 
     //todo:把下面这些接口删除
     @Deprecated
-    boolean needChartChangePane();
+    default boolean needChartChangePane() {
+        return false;
+    }
 
     /**
      * 数据集数据源的界面
@@ -98,7 +100,9 @@ public interface ChartTypeUIProvider extends Level {
      * @return 数据集数据源的界面
      */
     @Deprecated
-    AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent);
+    default AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
+        return null;
+    }
 
 
     /**
@@ -107,7 +111,9 @@ public interface ChartTypeUIProvider extends Level {
      * @return 单元格数据源的界面
      */
     @Deprecated
-    AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent);
+    default AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
+        return null;
+    }
 
     /**
      * 条件属性界面
@@ -115,7 +121,9 @@ public interface ChartTypeUIProvider extends Level {
      * @return 条件属性界面
      */
     @Deprecated
-    ConditionAttributesPane getPlotConditionPane(Plot plot);
+    default ConditionAttributesPane getPlotConditionPane(Plot plot) {
+        return null;
+    }
 
     /**
      * 系列界面
@@ -123,7 +131,9 @@ public interface ChartTypeUIProvider extends Level {
      * @return 系列界面
      */
     @Deprecated
-    BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot);
+    default BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
+        return null;
+    }
 
     /**
      * 是否使用默认的界面，为了避免界面来回切换
@@ -131,12 +141,18 @@ public interface ChartTypeUIProvider extends Level {
      * @return 是否使用默认的界面
      */
     @Deprecated
-    boolean isUseDefaultPane();
+    default boolean isUseDefaultPane() {
+        return false;
+    }
 
     @Deprecated
-    ChartEditPane getChartEditPane(String plotID);
+    default ChartEditPane getChartEditPane(String plotID) {
+        return new ChartEditPane();
+    }
 
     @Deprecated
-    ChartsConfigPane getChartConfigPane(String plotID);
+    default ChartsConfigPane getChartConfigPane(String plotID) {
+        return null;
+    }
 
 }

designer-chart/src/main/java/com/fr/design/chart/fun/IndependentChartUIProvider.java

@@ -6,6 +6,7 @@ import com.fr.common.annotations.Compatible;
  * Created by shine on 2019/09/05.
  */
 @Compatible
+@Deprecated
 public interface IndependentChartUIProvider extends ChartTypeUIProvider {
 
 }

designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractChartTypeUI.java

@@ -1,19 +1,11 @@
 package com.fr.design.chart.fun.impl;
 
-import com.fr.chart.chartattr.Plot;
-import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.chart.fun.ChartTypeUIProvider;
 import com.fr.design.chartx.impl.AbstractDataPane;
-import com.fr.design.chartx.impl.AbstractOtherPane;
-import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
-import com.fr.design.mainframe.chart.ChartEditPane;
+import com.fr.design.mainframe.chart.AbstractChartAttrPane;
-import com.fr.design.mainframe.chart.ChartsConfigPane;
-import com.fr.design.mainframe.chart.gui.ChartDataPane;
-import com.fr.design.mainframe.chart.gui.ChartStylePane;
-import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
-import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.stable.fun.impl.AbstractProvider;
 import com.fr.stable.fun.mark.API;
 
@@ -24,13 +16,15 @@ import com.fr.stable.fun.mark.API;
 public abstract class AbstractChartTypeUI extends AbstractProvider implements ChartTypeUIProvider {
 
     @Override
-    public abstract AbstractChartTypePane getPlotTypePane();
+    public AbstractChartTypePane getPlotTypePane() {
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new DefaultChartTypePane();
+    }
 
     @Override
     public abstract AbstractDataPane getChartDataPane(AttributeChangeListener listener);
 
     @Override
-    public abstract AbstractOtherPane[] getAttrPaneArray(AttributeChangeListener listener);
+    public abstract AbstractChartAttrPane[] getAttrPaneArray(AttributeChangeListener listener);
 
     @Override
     public String[] getSubName() {
@@ -46,45 +40,4 @@ public abstract class AbstractChartTypeUI extends AbstractProvider implements Ch
     public String mark4Provider() {
         return getClass().getName();
     }
-
-    @Override
-    public boolean needChartChangePane() {
-        return false;
-    }
-
-    @Override
-    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
-        return null;
-    }
-
-    @Override
-    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
-        return null;
-    }
-
-    @Override
-    public boolean isUseDefaultPane() {
-        return false;
-    }
-
-    @Override
-    public ChartEditPane getChartEditPane(String plotID) {
-        return new ChartEditPane();
-    }
-
-    @Override
-    public ConditionAttributesPane getPlotConditionPane(Plot plot) {
-        return null;
-    }
-
-    @Override
-    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
-        return null;
-    }
-
-    @Override
-    public ChartsConfigPane getChartConfigPane(String plotID) {
-        return null;
-    }
-
 }

designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java

@@ -17,6 +17,7 @@ import com.fr.stable.StableUtils;
 /**
  * Created by Mitisky on 16/3/7.
  */
+@Deprecated
 public abstract class AbstractIndependentChartUIWithAPILevel implements ChartTypeUIProvider {
     //这个不能改,是做兼容用的
     //2016.10.14-11.24号的8.0jar因为改了这个为3,不会提示5.26号之前的插件更新

designer-chart/src/main/java/com/fr/design/chart/fun/impl/DefaultChartTypePane.java

@@ -0,0 +1,38 @@
+package com.fr.design.chart.fun.impl;
+
+import com.fr.chart.charttypes.ChartTypeManager;
+import com.fr.chartx.attr.ChartProvider;
+import com.fr.design.ChartTypeInterfaceManager;
+import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+
+/**
+ * @author shine
+ * @version 10.0
+ * Created by shine on 2020/7/8
+ */
+public class DefaultChartTypePane<T extends ChartProvider> extends AbstractChartTypePane<T> {
+
+    @Override
+    protected String[] getTypeIconPath() {
+        return ChartTypeInterfaceManager.getInstance().getDemoImagePath(this.getPlotID());
+    }
+
+    @Override
+    protected String[] getTypeTipName() {
+        return ChartTypeInterfaceManager.getInstance().getSubName(this.getPlotID());
+    }
+
+    public ChartProvider getDefaultChart() {
+        return ChartTypeManager.getInstance().getChartTypes(this.getPlotID())[0];
+    }
+
+    public String title4PopupWindow() {
+        return ChartTypeInterfaceManager.getInstance().getName(this.getPlotID());
+    }
+
+    @Override
+    public void populateBean(T ob) {
+    }
+
+
+}

designer-chart/src/main/java/com/fr/design/chart/fun/impl/InvisibleChartTypePane.java

@@ -0,0 +1,15 @@
+package com.fr.design.chart.fun.impl;
+
+import com.fr.design.ChartTypeInterfaceManager;
+
+/**
+ * @author shine
+ * @version 10.0
+ * Created by shine on 2021/6/25
+ */
+public class InvisibleChartTypePane extends DefaultChartTypePane {
+    @Override
+    public String title4PopupWindow() {
+        return ChartTypeInterfaceManager.TYPE_PANE_DEFAULT_TITLE;
+    }
+}

designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapCustomPane.java

@@ -9,6 +9,8 @@ import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.FilterComboBox;
+import com.fr.design.gui.ifilechooser.FileChooserProvider;
+import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
 import com.fr.design.gui.ilable.BoldFontTextLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.mainframe.DesignerContext;
@@ -109,14 +111,12 @@ refreshAreaNameBox();
     private ActionListener selectPictureActionListener = new ActionListener() {
 
         public void actionPerformed(ActionEvent evt) {
-            JFileChooser svgFileChooser = new JFileChooser();
+            FileChooserProvider fileChooserProvider = new JavaFxNativeFileChooser.Builder().
-            svgFileChooser.addChoosableFileFilter(new SVGFileFilter());
+                    filter(".svg, .svgz", "*.svg", "*.svgz").
-			if (StringUtils.isNotBlank(lastSelectPath)) {
+					currentDirectory(lastSelectPath).build();
-				svgFileChooser.setSelectedFile(new File(lastSelectPath));
+            int returnVal = fileChooserProvider.showDialog(DesignerContext.getDesignerFrame());
-			}
-			int returnVal = svgFileChooser.showOpenDialog(DesignerContext.getDesignerFrame());
             if (returnVal != JFileChooser.CANCEL_OPTION) {
-				File selectedFile = svgFileChooser.getSelectedFile();
+                File selectedFile = fileChooserProvider.getSelectedFile();
                 try {
                     lastSelectPath = selectedFile.getCanonicalPath();
                 } catch (Exception ex) {

designer-chart/src/main/java/com/fr/design/chartx/data/map/LineMapAreaLngLatPaneWithComboBox.java

@@ -2,7 +2,7 @@ package com.fr.design.chartx.data.map;
 
 import com.fr.chartx.data.field.diff.LineMapColumnFieldCollection;
 import com.fr.design.chartx.fields.AbstractDataSetFieldsPane;
-import com.fr.design.chartx.fields.diff.LineMapDataSetFieldsPane;
+import com.fr.design.chartx.fields.diff.MapDataSetFieldsPane;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.i18n.Toolkit;
 
@@ -24,15 +24,15 @@ public class LineMapAreaLngLatPaneWithComboBox extends LineMapAreaLngLatPaneWith
     private UIComboBox toLng_tab1;
     private UIComboBox toLat_tab1;
 
-    private LineMapDataSetFieldsPane lineMapDataSetFieldsPane;
+    private MapDataSetFieldsPane mapDataSetFieldsPane;
 
-    public LineMapAreaLngLatPaneWithComboBox(LineMapDataSetFieldsPane lineMapDataSetFieldsPane) {
+    public LineMapAreaLngLatPaneWithComboBox(MapDataSetFieldsPane mapDataSetFieldsPane) {
-        this.lineMapDataSetFieldsPane = lineMapDataSetFieldsPane;
+        this.mapDataSetFieldsPane = mapDataSetFieldsPane;
         initComponents();
     }
 
     protected void initComponents() {
-        if (lineMapDataSetFieldsPane == null) {
+        if (mapDataSetFieldsPane == null) {
             return;
         }
         super.initComponents();
@@ -48,7 +48,7 @@ public class LineMapAreaLngLatPaneWithComboBox extends LineMapAreaLngLatPaneWith
         return createPane(
                 new String[]{Toolkit.i18nText("Fine-Design_Chart_Start_Area_Name"),
                         Toolkit.i18nText("Fine-Design_Chart_End_Area_Name")},
-                lineMapDataSetFieldsPane.createAreaPanel(fromArea_tab0), lineMapDataSetFieldsPane.createAreaPanel(toArea_tab0)
+                mapDataSetFieldsPane.createAreaPanel(fromArea_tab0), mapDataSetFieldsPane.createAreaPanel(toArea_tab0)
         );
     }
 
@@ -64,18 +64,19 @@ public class LineMapAreaLngLatPaneWithComboBox extends LineMapAreaLngLatPaneWith
         }
         return createPane(
                 new String[]{
-                        Toolkit.i18nText("Fine-Design_Chart_Start_Area_Name"),
                         Toolkit.i18nText("Fine-Design_Chart_Start_Longitude"),
                         Toolkit.i18nText("Fine-Design_Chart_Start_Latitude"),
-                        Toolkit.i18nText("Fine-Design_Chart_End_Area_Name"),
+                        Toolkit.i18nText("Fine-Design_Chart_Start_Area_Name"),
                         Toolkit.i18nText("Fine-Design_Chart_End_Longitude"),
-                        Toolkit.i18nText("Fine-Design_Chart_End_Latitude")},
+                        Toolkit.i18nText("Fine-Design_Chart_End_Latitude"),
-                lineMapDataSetFieldsPane.createAreaPanel(fromArea_tab1),
+                        Toolkit.i18nText("Fine-Design_Chart_End_Area_Name")
+                },
                 fromLng_tab1,
                 fromLat_tab1,
-                lineMapDataSetFieldsPane.createAreaPanel(toArea_tab1),
+                fromArea_tab1,
                 toLng_tab1,
-                toLat_tab1);
+                toLat_tab1,
+                toArea_tab1);
     }
 
     protected void populateTab0(LineMapColumnFieldCollection fieldCollection) {

designer-chart/src/main/java/com/fr/design/chartx/data/map/PointMapAreaLngLatPaneWithComboBox.java

@@ -2,7 +2,7 @@ package com.fr.design.chartx.data.map;
 
 import com.fr.chartx.data.field.diff.PointMapColumnFieldCollection;
 import com.fr.design.chartx.fields.AbstractDataSetFieldsPane;
-import com.fr.design.chartx.fields.diff.PointMapDataSetFieldsPane;
+import com.fr.design.chartx.fields.diff.MapDataSetFieldsPane;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.i18n.Toolkit;
 
@@ -20,15 +20,15 @@ public class PointMapAreaLngLatPaneWithComboBox extends PointMapAreaLngLatPaneWi
     private UIComboBox lng_tab1;
     private UIComboBox lat_tab1;
 
-    private PointMapDataSetFieldsPane pointMapDataSetFieldsPane;
+    private MapDataSetFieldsPane mapDataSetFieldsPane;
 
-    public PointMapAreaLngLatPaneWithComboBox(PointMapDataSetFieldsPane pointMapDataSetFieldsPane) {
+    public PointMapAreaLngLatPaneWithComboBox(MapDataSetFieldsPane pointMapDataSetFieldsPane) {
-        this.pointMapDataSetFieldsPane = pointMapDataSetFieldsPane;
+        this.mapDataSetFieldsPane = pointMapDataSetFieldsPane;
         initComponents();
     }
 
     protected void initComponents() {
-        if (pointMapDataSetFieldsPane == null) {
+        if (mapDataSetFieldsPane == null) {
             return;
         }
         super.initComponents();
@@ -41,7 +41,7 @@ public class PointMapAreaLngLatPaneWithComboBox extends PointMapAreaLngLatPaneWi
         }
         return createPane(
                 new String[]{Toolkit.i18nText("Fine-Design_Chart_Area_Name")},
-                pointMapDataSetFieldsPane.createAreaPanel(area_tab0)
+                mapDataSetFieldsPane.createAreaPanel(area_tab0)
         );
     }
 
@@ -53,8 +53,8 @@ public class PointMapAreaLngLatPaneWithComboBox extends PointMapAreaLngLatPaneWi
             lat_tab1 = new UIComboBox();
         }
         return createPane(
-                new String[]{Toolkit.i18nText("Fine-Design_Chart_Area_Name"), Toolkit.i18nText("Fine-Design_Chart_Longitude"), Toolkit.i18nText("Fine-Design_Chart_Latitude")},
+                new String[]{Toolkit.i18nText("Fine-Design_Chart_Longitude"), Toolkit.i18nText("Fine-Design_Chart_Latitude"), Toolkit.i18nText("Fine-Design_Chart_Area_Name")},
-                pointMapDataSetFieldsPane.createAreaPanel(area_tab1), lng_tab1, lat_tab1
+                lng_tab1, lat_tab1, area_tab1
         );
     }
 

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/AbstractDataSetFieldsWithSeriesValuePane.java

@@ -5,8 +5,8 @@ import com.fr.design.chartx.component.SeriesValueFieldComboBoxPane;
 import com.fr.design.chartx.fields.AbstractDataSetFieldsPane;
 
 import javax.swing.JPanel;
-import java.util.List;
 import java.awt.BorderLayout;
+import java.util.List;
 
 /**
  * Created by shine on 2019/5/16.
@@ -20,7 +20,7 @@ public abstract class AbstractDataSetFieldsWithSeriesValuePane<T extends ColumnF
     @Override
     protected JPanel createCenterPane() {
         JPanel normalCenter = super.createCenterPane();
-        seriesValueFieldComboBoxPane = new SeriesValueFieldComboBoxPane();
+        getSeriesValueFieldComboBoxPane();
 
         if (normalCenter != null) {
             JPanel panel = new JPanel(new BorderLayout(0, 6));
@@ -34,7 +34,14 @@ public abstract class AbstractDataSetFieldsWithSeriesValuePane<T extends ColumnF
 
     public SeriesValueFieldComboBoxPane getSeriesValueFieldComboBoxPane() {
         if (seriesValueFieldComboBoxPane == null) {
-            seriesValueFieldComboBoxPane = new SeriesValueFieldComboBoxPane();
+            seriesValueFieldComboBoxPane = new SeriesValueFieldComboBoxPane() {
+
+                protected boolean seriesComboBoxHasNone() {
+                    return true;
+                }
+
+            };
+
         }
         return seriesValueFieldComboBoxPane;
     }

designer-chart/src/main/java/com/fr/design/chartx/impl/AbstractDataPane.java

@@ -45,12 +45,16 @@ public abstract class AbstractDataPane extends ChartDataPane {
 
         ChartDataDefinitionProvider dataDefinition = chart.getChartDataDefinition();
 
-        singleDataPane.populateBean((AbstractDataDefinition) dataDefinition);
+        populate(dataDefinition);
 
         this.initAllListeners();
         this.validate();
     }
 
+    protected void populate(ChartDataDefinitionProvider dataDefinition) {
+        singleDataPane.populateBean((AbstractDataDefinition) dataDefinition);
+    }
+
 
     @Override
     public void update(ChartCollection collection) {
@@ -62,6 +66,11 @@ public abstract class AbstractDataPane extends ChartDataPane {
             return;
         }
 
-        chart.setChartDataDefinition(singleDataPane.updateBean());
+        chart.setChartDataDefinition(update());
     }
+
+    protected ChartDataDefinitionProvider update() {
+        return singleDataPane.updateBean();
+    }
+
 }

designer-chart/src/main/java/com/fr/design/chartx/impl/AbstractOtherPane.java

@@ -3,6 +3,7 @@ package com.fr.design.chartx.impl;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.impl.AbstractChartWithData;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
+import com.fr.design.mainframe.chart.PaneTitleConstants;
 
 /**
  * Created by shine on 2019/09/04.
@@ -13,6 +14,10 @@ public abstract class AbstractOtherPane<T extends AbstractChartWithData> extends
 
     protected abstract void update(T chart);
 
+    public String title4PopupWindow() {
+        return PaneTitleConstants.CHART_OTHER_TITLE;
+    }
+
     @Override
     public void populate(ChartCollection collection) {
         if (collection == null) {

designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java

@@ -16,6 +16,7 @@ import com.fr.design.gui.chart.ChartEditPaneProvider;
 import com.fr.design.gui.frpane.UITitlePanel;
 import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.stable.AssistUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
@@ -35,6 +36,9 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
 
     protected ChartEditPane chartEditPane;
 
+    //ID一样的话 不用新建chartEditPane
+    private String currentID;
+
     private ChartPropertyPane() {
         initComponent();
     }
@@ -46,10 +50,13 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
 
     @Override
     public void updateChartEditPane(String plotID) {
+        if (!AssistUtils.equals(currentID, plotID)) {
             chartEditPane = ChartTypeInterfaceManager.getInstance().getChartEditPane(plotID);
             chartEditPane.setContainer(container);
+            currentID = plotID;
             resetChartEditPane();
         }
+    }
 
     @Override
     public ChartEditPaneProvider getChartEditPane() {

designer-chart/src/main/java/com/fr/design/mainframe/MapEditPane.java

@@ -1,112 +0,0 @@
-package com.fr.design.mainframe;
-
-import com.fr.chart.base.MapSvgAttr;
-import com.fr.chart.base.MapSvgXMLHelper;
-import com.fr.chart.chartglyph.MapShapeValue;
-import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.chart.series.PlotSeries.AbstrctMapAttrEditPane;
-import com.fr.design.chart.series.PlotSeries.MapCustomPane;
-import com.fr.design.chart.series.PlotSeries.MapDefiAreaNamePane;
-import com.fr.design.gui.frpane.UITabbedPane;
-
-import com.fr.stable.CoreConstants;
-import com.fr.stable.StringUtils;
-
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import java.awt.*;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : daisy
- * Version: 7.1.1
- * Date: 14/12/2
- * Time: 下午7:17
- */
-public class MapEditPane extends BasicBeanPane<MapSvgAttr>{
-
-    private UITabbedPane tabbedPane;
-    private MapCustomPane areaPane ;
-//    private MapCustomPane pointPane;
-    private MapDefiAreaNamePane namedPane;
-    private String currentMapName;
-    private AbstrctMapAttrEditPane editingPane;
-
-    private ChangeListener tabbedChangeListener = new ChangeListener() {
-        @Override
-        public void stateChanged(ChangeEvent e) {
-            switch ( tabbedPane.getSelectedIndex()){
-                case 1:
-                    namedPane.populateMapAttr(editingPane.updateCurrentAttr());
-                    editingPane = namedPane;
-                    break;
-                default:
-                    areaPane.populateMapAttr(editingPane.updateCurrentAttr());
-                    editingPane = areaPane;
-            }
-        }
-    } ;
-
-    public MapEditPane(){
-        initTabbedPane();
-        this.setLayout(new BorderLayout());
-        this.add(tabbedPane,BorderLayout.CENTER);
-    }
-
-    private void initTabbedPane(){
-        tabbedPane = new UITabbedPane();
-        areaPane = new MapCustomPane(false);
-//        pointPane = new MapCustomPane(false);
-        namedPane= new MapDefiAreaNamePane(false);
-        areaPane.setImageSelectType(MapShapeValue.AREA);
-//        pointPane.setImageSelectType(MapShapeValue.POINT);
-        tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Image_Area"),areaPane);
-//        tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_ImagePoint"),pointPane);
-        tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Corresponding_Fields"),namedPane);
-        editingPane = areaPane;
-    }
-
-    @Override
-    protected String title4PopupWindow() {
-        return null;
-    }
-
-    @Override
-    public void populateBean(MapSvgAttr ob) {
-        if(!StringUtils.isEmpty(ob.getName()) && !MapSvgXMLHelper.getInstance().containsMapName(ob.getName())){
-            MapSvgAttr mapSvgAttr = new MapSvgAttr();
-            mapSvgAttr.setFilePath(MapSvgXMLHelper.customMapPath()+ CoreConstants.SEPARATOR+ob.getName()+".svg");
-            MapSvgXMLHelper.getInstance().addNewSvgMaps(ob.getName(), mapSvgAttr);
-        }
-
-        currentMapName = ob.getName();
-        if(editingPane == null){
-            editingPane = areaPane;
-        }
-        editingPane.populateMapAttr(ob);
-        tabbedPane.addChangeListener(tabbedChangeListener);
-    }
-
-    public String getCurrentMapName(){
-        return currentMapName;
-    }
-
-    public void setCurrentMapName(String currentMapName){
-        this.currentMapName = currentMapName;
-
-    }
-
-    @Override
-    public MapSvgAttr updateBean() {
-        MapSvgAttr currentAttr = editingPane.updateCurrentAttr();
-        currentMapName =currentAttr != null ? currentAttr.getName() : currentMapName;
-        MapSvgAttr attr =  MapSvgXMLHelper.getInstance().getMapAttr(currentMapName);
-        if(attr != null ){
-            MapSvgXMLHelper.getInstance().removeNewMapAttr(currentMapName);
-            MapSvgXMLHelper.getInstance().pushMapAttr(currentMapName,currentAttr);
-            return currentAttr;
-        }else{
-            return  MapSvgXMLHelper.getInstance().getNewMapAttr(currentMapName);
-        }
-    }
-}

designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java

@@ -9,6 +9,7 @@ import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.tabledata.Prepare4DataSourceChange;
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.gui.chart.ChartEditPaneActionListener;
 import com.fr.design.gui.chart.ChartEditPaneProvider;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.gui.ibutton.UIHeadGroup;
@@ -19,6 +20,7 @@ import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartOtherPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.ChartTypePane;
+import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.design.mainframe.chart.info.ChartInfoCollector;
 import com.fr.form.main.Form;
 import com.fr.general.ComparatorUtils;
@@ -28,11 +30,11 @@ import com.fr.plugin.chart.vanchart.VanChart;
 import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
-import java.awt.BorderLayout;
-import java.awt.CardLayout;
 
 public class ChartEditPane extends BasicPane implements AttributeChange, Prepare4DataSourceChange, ChartEditPaneProvider {
 
@@ -102,6 +104,33 @@ public class ChartEditPane extends BasicPane implements AttributeChange, Prepare
         this.add(center, BorderLayout.CENTER);
     }
 
+    /**
+     * 增加面板Listener
+     */
+    public void addChartEditPaneActionListener(ChartEditPaneActionListener l) {
+        this.listenerList.add(ChartEditPaneActionListener.class, l);
+    }
+
+    /**
+     * 移除面板Listener
+     */
+    public void removeChartEditPaneActionListener(ChartEditPaneActionListener l) {
+        this.listenerList.remove(ChartEditPaneActionListener.class, l);
+    }
+
+    private void fireAttributeChange(ChartCollection chartCollection) {
+        // Guaranteed to return a non-null array
+        Object[] listeners = listenerList.getListenerList();
+
+        // Process the listeners last to first, notifying
+        // those that are interested in this event
+        for (int i = listeners.length - 1; i >= 0; i -= 1) {
+            if (listeners[i] == ChartEditPaneActionListener.class) {
+                ((ChartEditPaneActionListener) listeners[i + 1]).attributeChange(chartCollection);
+            }
+        }
+    }
+
     AttributeChangeListener listener = new AttributeChangeListener() {
         @Override
         public void attributeChange() {
@@ -131,6 +160,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange, Prepare
                 }
 
                 fire();
+                fireAttributeChange(collection);
             }
         }
     };
@@ -147,13 +177,13 @@ public class ChartEditPane extends BasicPane implements AttributeChange, Prepare
      */
     public void reLayout(ChartProvider currentChart) {
         if (currentChart != null) {
-            int chartIndex = getSelectedChartIndex(currentChart);
             this.removeAll();
             this.setLayout(new BorderLayout());
             paneList = new ArrayList<AbstractChartAttrPane>();
-            addTypePane();
-
             String chartID = currentChart.getID();
+
+            addTypePane(currentChart);
+
             boolean isDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(chartID);
 
             if (isDefault) {
@@ -187,9 +217,18 @@ public class ChartEditPane extends BasicPane implements AttributeChange, Prepare
         return chartDataPane;
     }
 
-    protected void addTypePane() {
+    protected void addTypePane(ChartProvider chart) {
+        if (visibleTypePane(chart)) {
             paneList.add(typePane);
         }
+    }
+
+    private boolean visibleTypePane(ChartProvider chart) {
+        AbstractChartTypePane pane = ChartTypeInterfaceManager.getInstance().getPlotTypePane(chart.getID());
+        return pane != null
+                && !ChartTypeInterfaceManager.TYPE_PANE_DEFAULT_TITLE.equals(pane.title4PopupWindow())
+                && pane.visible(chart);
+    }
 
     protected void setSelectedTab() {
     }

designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartHyperEditPane.java

@@ -2,6 +2,7 @@ package com.fr.design.mainframe.chart;
 
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.web.ChartHyperPoplink;
+import com.fr.chartx.attr.ChartProvider;
 import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.chart.gui.ChartComponent;
 import com.fr.design.chart.series.SeriesCondition.impl.ChartHyperPopAttrPane;
@@ -48,7 +49,7 @@ public class ChartHyperEditPane  extends ChartEditPane {
 		return dataPane;
 	}
 
-    protected void addTypePane() {
+    protected void addTypePane(ChartProvider chart) {
         paneList.add(attrPane);
         paneList.add(typePane);
     }

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java

@@ -27,9 +27,6 @@ import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -46,6 +43,9 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * 图表 类型 增删 控制按钮界面.
@@ -252,7 +252,7 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
     public ChartProvider getChangeStateNewChart() {
         ChartProvider chart = editingCollection.getSelectedChartProvider(ChartProvider.class);
         String chartID = chart.getID();
-        String priority = ChartTypeManager.getInstanceWithCheck().getPriority(chartID);
+        int priority = ChartTypeManager.getInstanceWithCheck().getPriority(chartID);
         ChartProvider firstChart = ChartTypeManager.getInstanceWithCheck().getFirstChart(priority);
         try {
             return (ChartProvider) firstChart.clone();

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java

@@ -17,23 +17,25 @@ import com.fr.design.mainframe.chart.PaneTitleConstants;
 import com.fr.design.mainframe.chart.gui.item.FlexibleComboBox;
 import com.fr.design.mainframe.chart.gui.item.ItemEventType;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
+import com.fr.stable.AssistUtils;
 import com.fr.stable.StringUtils;
 
 import javax.swing.JPanel;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 图表 属性表, 类型选择 界面.
@@ -61,7 +63,14 @@ public class ChartTypePane extends AbstractChartAttrPane {
         if (editingCollection != null) {
             relayoutChartTypePane(editingCollection);
         } else {
-            chartTypeComBox = new ComboBoxPane();
+            chartTypeComBox = new ComboBoxPane() {
+                @Override
+                protected void initLayout() {
+                    super.initLayout();
+                    jcb.setVisible(ChartEditContext.normalMode());
+                }
+            };
+
         }
 
         BasicScrollPane scrollPane = new BasicScrollPane() {
@@ -140,14 +149,45 @@ public class ChartTypePane extends AbstractChartAttrPane {
         }
     }
 
+    /**
+     * 把所有的pane加到list里
+     *
+     * @param paneList pane容器
+     */
+    private static void addPlotTypePaneList(List<FurtherBasicBeanPane<? extends ChartProvider>> paneList,
+                                            Map<Integer, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>> allChartTypePane,
+                                            ActionListener autoButtonListener) {
+
+
+        String[] chartIDs = ChartTypeManager.getInstance().getAllChartIDs();
+
+        for (String id : chartIDs) {
+
+            AbstractChartTypePane pane = ChartTypeInterfaceManager.getInstance().getPlotTypePane(id);
+            if (pane == null || AssistUtils.equals(pane.title4PopupWindow(), ChartTypeInterfaceManager.TYPE_PANE_DEFAULT_TITLE)) {
+                continue;
+            }
+            pane.reLayout(id);
+            pane.registerButtonListener(autoButtonListener);
+            paneList.add(pane);
+
+            Integer priority = ChartTypeManager.getInstance().getPriority(id);
+            if (allChartTypePane.get(priority) == null) {
+                allChartTypePane.put(priority, new LinkedHashMap<String, FurtherBasicBeanPane<? extends ChartProvider>>());
+            }
+            allChartTypePane.get(priority).put(id, pane);
+        }
+    }
+
     class ComboBoxPane extends UIComboBoxPane<ChartProvider> {
-        private Map<String, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>> allChartTypePane;
+        //todo:refactor 图表切换过滤不应该根据优先级priority，应该给旧版本图表和新特性图表的图表类型信息分别增加一个switchID之类的
+        private Map<Integer, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>> allChartTypePane;
 
         @Override
         protected List<FurtherBasicBeanPane<? extends ChartProvider>> initPaneList() {
             List<FurtherBasicBeanPane<? extends ChartProvider>> paneList = new ArrayList<FurtherBasicBeanPane<? extends ChartProvider>>();
-            allChartTypePane = new LinkedHashMap<String, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>>();
+            allChartTypePane = new LinkedHashMap<Integer, Map<String, FurtherBasicBeanPane<? extends ChartProvider>>>();
-            ChartTypeInterfaceManager.getInstance().addPlotTypePaneList(paneList, allChartTypePane, autoButtonListener);
+            addPlotTypePaneList(paneList, allChartTypePane, autoButtonListener);
             return paneList;
         }
 
@@ -209,18 +249,18 @@ public class ChartTypePane extends AbstractChartAttrPane {
         }
 
         private void addAllCards() {
-            Iterator<String> iterator = allChartTypePane.keySet().iterator();
+            Iterator<Integer> iterator = allChartTypePane.keySet().iterator();
 
             while (iterator.hasNext()) {
                 addOnePriorityCards(iterator.next(), false);
             }
         }
 
-        private void addOnePriorityCards(String priority) {
+        private void addOnePriorityCards(int priority) {
             addOnePriorityCards(priority, true);
         }
 
-        private void addOnePriorityCards(String priority, boolean ignore) {
+        private void addOnePriorityCards(int priority, boolean ignore) {
 
             Map<String, FurtherBasicBeanPane<? extends ChartProvider>> map = allChartTypePane.get(priority);
 
@@ -236,7 +276,7 @@ public class ChartTypePane extends AbstractChartAttrPane {
 
         }
 
-        private void addOnePlotIDCards(String priority, String plotID) {
+        private void addOnePlotIDCards(int priority, String plotID) {
             cards.add(allChartTypePane.get(priority).get(plotID));
         }
 
@@ -246,7 +286,7 @@ public class ChartTypePane extends AbstractChartAttrPane {
             //重构需要重构下拉框选项和cardNames
             ChartProvider chart = collection.getSelectedChartProvider(ChartProvider.class);
             String chartID = chart.getID();
-            String priority = ChartTypeManager.getInstanceWithCheck().getPriority(chartID);
+            int priority = ChartTypeManager.getInstanceWithCheck().getPriority(chartID);
             boolean enabledChart = ChartTypeManager.enabledChart(chartID);
             String item = ChartTypeInterfaceManager.getInstance().getName(chartID);
 
@@ -360,7 +400,7 @@ public class ChartTypePane extends AbstractChartAttrPane {
         buttonPane.populateBean(collection);
         chartTypeComBox.populateBean(chart);
 
-        buttonPane.setVisible(ChartTypeInterfaceManager.getInstance().needChartChangePane(chart));
+        buttonPane.setVisible(ChartTypeInterfaceManager.getInstance().needChartChangePane(chart) && ChartEditContext.normalMode());
 
         this.initAllListeners();
     }

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java

@@ -7,16 +7,17 @@ import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.gui.frpane.UIComboBoxPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.van.chart.designer.AbstractVanChartScrollPane;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
-import java.util.ArrayList;
-import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 一般数据界面
@@ -67,7 +68,9 @@ public class NormalChartDataPane extends DataContentsPane {
                         label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT));
                         northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null}));
 						northPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,8));
+						if (ChartEditContext.normalMode()) {
 							this.add(northPane, BorderLayout.NORTH);
+						}
 						this.add(cardPane, BorderLayout.CENTER);
 
 					}

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java

@@ -217,6 +217,10 @@ public abstract class AbstractChartTypePane<T extends ChartProvider> extends Fur
         return plotID;
     }
 
+    public boolean visible(ChartProvider chart) {
+        return true;
+    }
+
     /**
      * @param ob 对象
      * @return

designer-chart/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditContext.java

@@ -0,0 +1,26 @@
+package com.fr.design.mainframe.chart.mode;
+
+import com.fr.common.annotations.Open;
+
+/**
+ * @author shine
+ * @version 10.0
+ * Created by shine on 2021/6/4
+ */
+@Open
+public class ChartEditContext {
+
+    private static ChartEditMode current = ChartEditMode.NORMAL;
+
+    public static void switchTo(ChartEditMode mode) {
+        current = mode;
+    }
+
+    public static boolean duchampMode() {
+        return current == ChartEditMode.DUCHAMP;
+    }
+
+    public static boolean normalMode() {
+        return current == ChartEditMode.NORMAL;
+    }
+}

designer-chart/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditMode.java

@@ -0,0 +1,12 @@
+package com.fr.design.mainframe.chart.mode;
+
+/**
+ * @author shine
+ * @version 10.0
+ * Created by shine on 2021/6/4
+ */
+//todo:refactor 弹出框图表没有单元格数据源,就不用一层层传下去了
+public enum ChartEditMode {
+    NORMAL,
+    DUCHAMP
+}

designer-chart/src/main/java/com/fr/design/module/ChartHyperlinkGroup.java

@@ -3,6 +3,7 @@ package com.fr.design.module;
 import com.fr.chart.web.ChartHyperPoplink;
 import com.fr.chart.web.ChartHyperRelateCellLink;
 import com.fr.chart.web.ChartHyperRelateFloatLink;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.chart.series.SeriesCondition.impl.ChartHyperPoplinkPane;
 import com.fr.design.chart.series.SeriesCondition.impl.ChartHyperRelateCellLinkPane;
 import com.fr.design.chart.series.SeriesCondition.impl.ChartHyperRelateFloatLinkPane;
@@ -58,7 +59,7 @@ public class ChartHyperlinkGroup extends BaseHyperlinkGroup {
                     return false;
                 }
 
-                if (template.isJWorkBook()) {
+                if (template.isJWorkBook() || DesignModeContext.isDuchampMode()) {
                     // 如果是普通报表单元格，那么没有 FormHyperlink 选项
                     FormHyperlinkProvider formHyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class);
                     //返回true表示可用，返回false表示不可用
@@ -93,7 +94,7 @@ public class ChartHyperlinkGroup extends BaseHyperlinkGroup {
                 if (template == null) {
                     return false;
                 }
-                if (template.isJWorkBook()) {
+                if (template.isJWorkBook() || DesignModeContext.isDuchampMode()) {
                     // 如果是普通报表单元格，那么没有 FormHyperlink 选项
                     FormHyperlinkProvider formHyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class);
                     //返回true表示可用，返回false表示不可用

designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartUIProvider.java

@@ -14,10 +14,14 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.stable.fun.impl.AbstractProvider;
+import com.fr.stable.fun.mark.API;
+
+import static com.fr.design.chart.fun.ChartTypeUIProvider.CURRENT_API_LEVEL;
 
 /**
  * Created by shine on 2018/3/2.
  */
+@API(level = CURRENT_API_LEVEL)
 public abstract class AbstractExtendedChartUIProvider extends AbstractProvider implements ChartTypeUIProvider {
 
     protected abstract AbstractExtendedChartTableDataPane getTableDataSourcePane();

designer-chart/src/main/java/com/fr/van/chart/area/AreaIndependentVanChartInterface.java

@@ -2,10 +2,12 @@ package com.fr.van.chart.area;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.vanchart.AbstractMultiCategoryVanChartUI;
 
 /**
@@ -47,7 +49,7 @@ public class AreaIndependentVanChartInterface extends AbstractMultiCategoryVanCh
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartAreaPlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartAreaPlotPane();
     }
 
     public ConditionAttributesPane getPlotConditionPane(Plot plot){

designer-chart/src/main/java/com/fr/van/chart/bar/BarIndependentVanChartInterface.java

@@ -3,12 +3,14 @@ package com.fr.van.chart.bar;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.column.VanChartColumnConditionPane;
 import com.fr.van.chart.column.VanChartColumnSeriesPane;
 import com.fr.van.chart.designer.other.VanChartInteractivePane;
@@ -57,7 +59,7 @@ public class BarIndependentVanChartInterface extends AbstractMultiCategoryVanCha
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartBarPlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartBarPlotPane();
     }
 
     public ConditionAttributesPane getPlotConditionPane(Plot plot) {

designer-chart/src/main/java/com/fr/van/chart/box/BoxIndependentVanChartInterface.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.box;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
@@ -12,6 +13,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.van.chart.box.data.report.BoxPlotReportDataContentPane;
 import com.fr.van.chart.box.data.table.BoxPlotTableDataContentPane;
@@ -56,7 +58,7 @@ public class BoxIndependentVanChartInterface extends AbstractIndependentVanChart
     }
 
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartBoxPlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartBoxPlotPane();
     }
 
     public ConditionAttributesPane getPlotConditionPane(Plot plot) {

designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.bubble;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
@@ -13,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa
 import com.fr.design.mainframe.chart.gui.data.report.BubblePlotReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.plugin.chart.base.VanChartConstants;
 import com.fr.plugin.chart.bubble.VanChartBubblePlot;
 import com.fr.van.chart.bubble.data.VanChartBubblePlotTableDataContentPane;
@@ -54,7 +56,7 @@ public class BubbleIndependentVanChartInterface extends AbstractIndependentVanCh
      */
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartBubblePlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartBubblePlotPane();
     }
 
     /**

designer-chart/src/main/java/com/fr/van/chart/column/VanColumnChartTypeUI.java

@@ -2,10 +2,12 @@ package com.fr.van.chart.column;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.vanchart.AbstractMultiCategoryVanChartUI;
 
 /**
@@ -48,7 +50,7 @@ public class VanColumnChartTypeUI extends AbstractMultiCategoryVanChartUI {
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartColumnPlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartColumnPlotPane();
     }
 
 

designer-chart/src/main/java/com/fr/van/chart/custom/VanChartCustomDataPane.java

@@ -60,8 +60,10 @@ public class VanChartCustomDataPane extends ChartDataPane {
      */
     public void addAttributeChangeListener(AttributeChangeListener listener) {
         super.addAttributeChangeListener(listener);
+        if (contentsTabPane != null) {
             contentsTabPane.addAttributeChangeListener(listener);
         }
+    }
 
     @Override
     /**

designer-chart/src/main/java/com/fr/van/chart/custom/VanChartCustomPlotPane.java

@@ -3,15 +3,19 @@ package com.fr.van.chart.custom;
 import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.chart.base.DataSeriesCondition;
 import com.fr.chart.chartattr.Chart;
+import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartglyph.ConditionAttr;
 import com.fr.chart.chartglyph.ConditionCollection;
+import com.fr.chartx.attr.ChartProvider;
 import com.fr.chartx.data.AbstractDataDefinition;
 import com.fr.chartx.data.ChartDataDefinitionProvider;
 import com.fr.chartx.data.CustomChartDataDefinition;
+import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.base.VanChartAttrLine;
@@ -28,12 +32,12 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
 
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
 import java.awt.CardLayout;
 import java.awt.Component;
 import java.awt.Dimension;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * Created by Mitisky on 16/2/16.
@@ -54,11 +58,27 @@ public class VanChartCustomPlotPane extends AbstractVanChartTypePane {
     //自定义和自动版面的容器，cardLayOut布局
     private JPanel contentPane;
 
+    @Override
+    public boolean visible(ChartProvider chart) {
+        if (ChartEditContext.duchampMode() && chart instanceof VanChart) {
+            Plot plot = ((VanChart) chart).getPlot();
+
+            if (plot instanceof VanChartCustomPlot) {
+               CustomStyle customStyle = ((VanChartCustomPlot) plot).getCustomStyle();
+               return customStyle == CustomStyle.CUSTOM;
+            }
+        }
+        return super.visible(chart);
+    }
+
     protected Component[][] getPaneComponents(JPanel typePane) {
 
         initContent();
 
-        return new Component[][]{
+        return ChartEditContext.duchampMode() ? new Component[][]{
+                new Component[]{contentPane},
+                new Component[]{buttonPane},
+        }:  new Component[][]{
                 new Component[]{typePane},
                 new Component[]{stylePane},
                 new Component[]{contentPane},

designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java

@@ -1,7 +1,6 @@
 package com.fr.van.chart.custom.other;
 
 import com.fr.chart.chartattr.Plot;
-
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.custom.VanChartCustomPlot;
 import com.fr.plugin.chart.custom.type.CustomStyle;
@@ -37,6 +36,9 @@ public class VanChartCustomInteractivePane extends VanChartInteractivePane {
 
     @Override
     protected void populateHyperlink(Plot plot) {
+        if (hyperlinkPane == null) {
+            return;
+        }
         hyperlinkPane.populateBean(chart);
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java

@@ -20,6 +20,7 @@ import com.fr.design.gui.ispinner.UnsignedIntUISpinner;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.plugin.chart.attr.axis.VanChartAxis;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
@@ -132,7 +133,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
         double[] rowSize = {p, p, p, p, p, p, p};
 
 
-        Component[][] components = new Component[][]{
+        Component[][] components = ChartEditContext.normalMode() ? new Component[][]{
                 new Component[]{createToolBarPane(getToolBarRowSize(), columnSize), null},
                 //大数据模式 恢复用注释。取消注释。
                 //new Component[]{createLargeDataModePane(), null},
@@ -141,6 +142,11 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
                 new Component[]{createZoomPane(plot), null},
                 new Component[]{createAutoRefreshPane(plot), null},
                 new Component[]{createHyperlinkPane(), null}
+        } : new Component[][]{
+                new Component[]{createToolBarPane(getToolBarRowSize(), columnSize), null},
+                new Component[]{createAnimationPane(), null},
+                new Component[]{createAxisRotationPane(new double[]{p, p}, columnSize, plot), null},
+                new Component[]{createZoomPane(plot), null}
         };
 
         return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
@@ -595,6 +601,9 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
 
 
     protected void populateHyperlink(Plot plot) {
+        if (superLink == null) {
+            return;
+        }
         superLink.populate(plot);
     }
 
@@ -634,7 +643,9 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
     }
 
     protected void populateAutoRefresh(VanChart chart) {
-        VanChartPlot plot = chart.getPlot();
+        if (autoRefreshPane == null) {
+            return;
+        }
 
         RefreshMoreLabel refreshMoreLabel = chart.getRefreshMoreLabel();
         if (refreshMoreLabel == null) {

designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java

@@ -7,6 +7,7 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.drillmap.VanChartDrillMapPlot;
 import com.fr.plugin.chart.vanchart.VanChart;
@@ -39,13 +40,18 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
         double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
         double[] columnSize = {f, e};
         double[] rowSize = {p, p, p, p, p, p, p, p, p, p, p};
-        Component[][] components = new Component[][]{
+        Component[][] components = ChartEditContext.normalMode() ? new Component[][]{
                 new Component[]{createToolBarPane(new double[]{p, p, p}, columnSize), null},
                 new Component[]{createAnimationPane(), null},
                 new Component[]{createZoomPane(plot), null},
                 new Component[]{createDrillToolsPane(), null},
                 new Component[]{createAutoRefreshPane(plot), null},
                 new Component[]{createHyperlinkPane(), null}
+        } : new Component[][]{
+                new Component[]{createToolBarPane(new double[]{p, p, p}, columnSize), null},
+                new Component[]{createAnimationPane(), null},
+                new Component[]{createZoomPane(plot), null},
+                new Component[]{createDrillToolsPane(), null}
         };
 
         return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);

designer-chart/src/main/java/com/fr/van/chart/funnel/designer/FunnelIndependentVanChartInterface.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.funnel.designer;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
@@ -13,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.PiePlotTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.designer.data.OneDimensionalPlotReportDataContentPane;
 import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
@@ -45,7 +47,7 @@ public class FunnelIndependentVanChartInterface extends AbstractIndependentVanCh
      */
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartFunnelTypePane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartFunnelTypePane();
     }
 
     public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/GanttIndependentVanChartInterface.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.gantt.designer;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
@@ -12,6 +13,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 import com.fr.van.chart.gantt.designer.data.VanChartGanttDataPane;
@@ -42,7 +44,7 @@ public class GanttIndependentVanChartInterface extends AbstractIndependentVanCha
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartGanttPlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartGanttPlotPane();
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/gauge/GaugeIndependentVanChartInterface.java

@@ -2,6 +2,7 @@ package com.fr.van.chart.gauge;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
@@ -14,6 +15,7 @@ import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane
 import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.MeterPlotTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.plugin.chart.gauge.VanChartGaugePlot;
 import com.fr.van.chart.custom.component.CategoryCustomPlotTableDataContentPane;
 import com.fr.van.chart.custom.component.MeterCustomPlotReportDataContentPane;
@@ -61,7 +63,7 @@ public class GaugeIndependentVanChartInterface extends AbstractIndependentVanCha
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartGaugePlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartGaugePlotPane();
     }
 
     public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {

designer-chart/src/main/java/com/fr/van/chart/line/LineIndependentVanChartInterface.java

@@ -2,10 +2,12 @@ package com.fr.van.chart.line;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.vanchart.AbstractMultiCategoryVanChartUI;
 
 /**
@@ -42,7 +44,7 @@ public class LineIndependentVanChartInterface extends AbstractMultiCategoryVanCh
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartLinePlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartLinePlotPane();
     }
 
     public ConditionAttributesPane getPlotConditionPane(Plot plot){

designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java

@@ -27,6 +27,9 @@ public class VanChartMapInteractivePane extends VanChartInteractivePaneWithMapZo
 
     @Override
     protected void populateHyperlink(Plot plot) {
+        if (hyperlinkPane == null) {
+            return;
+        }
         hyperlinkPane.populateBean(plot);
     }
 

designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java

@@ -7,6 +7,7 @@ import com.fr.chartx.data.ChartDataDefinitionProvider;
 import com.fr.chartx.data.MapChartDataDefinition;
 import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
 import com.fr.design.mainframe.chart.info.ChartInfoCollector;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
@@ -21,9 +22,9 @@ import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
 
 import javax.swing.JPanel;
+import java.awt.Component;
 import java.util.HashSet;
 import java.util.Set;
-import java.awt.Component;
 
 /**
  * Created by Mitisky on 16/5/4.
@@ -55,7 +56,9 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane {
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
-        return new Component[][]{
+        return ChartEditContext.duchampMode() ? new Component[][]{
+                new Component[]{sourceChoosePane}
+        } : new Component[][]{
                 new Component[]{typePane},
                 new Component[]{buttonPane},
                 new Component[]{sourceChoosePane}

designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java

@@ -2,6 +2,7 @@ package com.fr.van.chart.multilayer;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
@@ -9,6 +10,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.multilayer.data.MultiPiePlotReportDataContentPane;
 import com.fr.van.chart.multilayer.data.MultiPiePlotTableDataContentPane;
 import com.fr.van.chart.multilayer.other.VanChartMultiPieConditionPane;
@@ -21,7 +23,7 @@ import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
 public class MultiPieIndependentVanChartInterface extends AbstractIndependentVanChartUI {
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartMultiPiePlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartMultiPiePlotPane();
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/pie/PieIndependentVanChartInterface.java

@@ -2,6 +2,7 @@ package com.fr.van.chart.pie;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
@@ -9,6 +10,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.custom.component.CategoryCustomPlotTableDataContentPane;
 import com.fr.van.chart.custom.component.VanChartDataPane;
 import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
@@ -50,7 +52,7 @@ public class PieIndependentVanChartInterface extends AbstractIndependentVanChart
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartPiePlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartPiePlotPane();
     }
 
     public ConditionAttributesPane getPlotConditionPane(Plot plot){

designer-chart/src/main/java/com/fr/van/chart/radar/RadarIndependentVanChartInterface.java

@@ -2,10 +2,12 @@ package com.fr.van.chart.radar;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
 
 /**
@@ -40,7 +42,7 @@ public class RadarIndependentVanChartInterface extends AbstractIndependentVanCha
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartRadarPlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartRadarPlotPane();
     }
 
     public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){

designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java

@@ -4,6 +4,7 @@ package com.fr.van.chart.scatter;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
@@ -14,6 +15,7 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa
 import com.fr.design.mainframe.chart.gui.data.report.BubblePlotReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
 import com.fr.van.chart.designer.other.zoom.ZoomPane;
@@ -33,7 +35,7 @@ public class ScatterIndependentVanChartInterface extends AbstractIndependentVanC
      */
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartScatterPlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartScatterPlotPane();
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/VanStructureChartTypeUI.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.structure.desinger;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
@@ -12,6 +13,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.plugin.chart.base.VanChartConstants;
 import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
@@ -31,7 +33,7 @@ import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
 public class VanStructureChartTypeUI extends AbstractIndependentVanChartUI {
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartStructureTypePane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartStructureTypePane();
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/treemap/TreeMapIndependentVanChartInterface.java

@@ -3,11 +3,13 @@ package com.fr.van.chart.treemap;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
@@ -20,7 +22,7 @@ import com.fr.van.chart.treemap.style.VanChartTreeMapSeriesPane;
 public class TreeMapIndependentVanChartInterface extends MultiPieIndependentVanChartInterface {
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartTreeMapPlotPane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartTreeMapPlotPane();
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.wordcloud.designer;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.impl.InvisibleChartTypePane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
@@ -13,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.plugin.chart.base.VanChartConstants;
 import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort;
 import com.fr.van.chart.designer.other.VanChartOtherPane;
@@ -39,7 +41,7 @@ public class WordCloudIndependentVanChartInterface extends AbstractIndependentVa
      */
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new VanChartWordCloudTypePane();
+        return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartWordCloudTypePane();
     }
 
     @Override

designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java

@@ -85,13 +85,14 @@ public class SelectionModel {
         if (e.getButton() == MouseEvent.BUTTON3 || (!InputEventBaseOnOS.isControlDown(e) && !e.isShiftDown())) {
             // 如果Ctrl或者Shift键盘没有按下，则清除已经选择的组件
             XCreator selectXCreator = selection.getSelectedCreator();
-            if (selectXCreator != null && comp != null) {
+            boolean clickOnce = e.getClickCount() == 1;
+            boolean hasCom = selectXCreator != null && comp != null;
+            if (clickOnce && hasCom) {
                 if (StringUtils.equals(selectXCreator.toData().getWidgetName(), comp.toData().getWidgetName())) {
                     return;
                 }
             }
             selection.reset();
-
         } else {
             //按下Ctrl或者shift键时鼠标可以进行多选,两次点击同一控件就取消选中
             XLayoutContainer topLayout = XCreatorUtils.getHotspotContainer(comp).getTopLayout();

designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java

@@ -862,4 +862,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		}
 	}
 
+	public boolean isParentAbsolute() {
+		return ((XCreator) this.getParent()).acceptType(XWAbsoluteLayout.class);
+	}
 }

designer-form/src/main/java/com/fr/design/mainframe/AbstractFormParallelLine.java

@@ -0,0 +1,70 @@
+package com.fr.design.mainframe;
+
+import java.awt.Point;
+
+public abstract class AbstractFormParallelLine {
+    protected int parallelValue;
+    protected int startPosition;
+    protected int endPosition;
+
+    public AbstractFormParallelLine(int parallelValue, int startPosition, int endPosition) {
+        this.parallelValue = parallelValue;
+        this.startPosition = startPosition;
+        this.endPosition = endPosition;
+    }
+
+    public int getCenterPosition() {
+        return (startPosition + endPosition) / 2;
+    }
+
+    /**
+     * 获取当前直线的中垂线起点位置
+     * @return 中垂线起点位置
+     */
+    abstract public Point getStartPointOnVerticalCenterLine();
+
+    /**
+     * 获取当前直线的中垂线的重点位置，重点位置即为重垂线与另一条平行线相交的点
+     * @param parallelValue 平行线
+     * @return 中垂线重点位置
+     */
+    abstract public Point getEndPointOnVerticalCenterLine(int parallelValue);
+
+    public boolean isVerticalCenterLineBeforeTheParallelLine(AbstractFormParallelLine parallelLine) {
+        return this.getCenterPosition() < parallelLine.getStartPosition();
+    }
+
+    public boolean isVerticalCenterLineBehindTheParallelLine(AbstractFormParallelLine parallelLine) {
+        return this.getCenterPosition() > parallelLine.getEndPosition();
+    }
+
+    /**
+     * 传一个平行线，当 当前直线和平行线中心点位置无平行相交的部分的时候，需要绘制一条延长线，一直延长到平行线边界位置
+     * @param parallelLine 平行线
+     * @return 延长线的起点位置
+     */
+    abstract public Point getExtendedLineStartPoint(AbstractFormParallelLine parallelLine);
+
+    /**
+     * 传一个平行线，当 当前直线和平行线中心点位置无平行相交的部分的时候，需要绘制一条延长线，一直延长到平行线边界位置
+     * @param parallelLine 平行线
+     * @return 延长线的重点位置
+     */
+    abstract public Point getExtendedLineEndPoint(AbstractFormParallelLine parallelLine);
+
+    public int getDistanceWithLine(AbstractFormParallelLine parallelLine) {
+        return Math.abs(this.getParallelValue() - parallelLine.getParallelValue());
+    }
+
+    public int getParallelValue() {
+        return parallelValue;
+    }
+
+    public int getStartPosition() {
+        return startPosition;
+    }
+
+    public int getEndPosition() {
+        return endPosition;
+    }
+}

designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java

@@ -36,7 +36,6 @@ import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.stable.Constants;
 
-import java.util.LinkedList;
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JPopupMenu;
@@ -49,6 +48,7 @@ import java.awt.Cursor;
 import java.awt.Insets;
 import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
+import java.util.LinkedList;
 
 /**
  * 普通模式下的鼠标点击、位置处理器
@@ -353,6 +353,7 @@ public class EditingMouseListener extends MouseInputAdapter {
             return;
         }
 
+        designer.getSpacingLineDrawer().updateMouseEvent(e, true);
         processChartEditorMouseMove(component, e);
         e.translatePoint(oldX - e.getX(), oldY - e.getY());
         designer.repaint();

designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

@@ -38,7 +38,6 @@ import com.fr.design.designer.creator.XWAbsoluteLayout;
 import com.fr.design.designer.creator.XWBorderLayout;
 import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout;
-import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
 import com.fr.design.designer.properties.FormWidgetAuthorityEditPane;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.event.DesignerOpenedListener;
@@ -126,6 +125,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
     private ConnectorHelper connectorHelper;
     private boolean isReportBlockEditing = false;
     private TopXCreators topXCreators;
+    private FormSpacingLineDrawer spacingLineDrawer;
 
     //组件重叠
     private boolean isWidgetsIntersect = false;
@@ -194,6 +194,8 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
 
         // 必须刷新"参数/控件树"面板，否则，若最近一次打开模版为 cpt，重启设计器，打开 frm，控件树消失
         populateParameterPropertyPane();
+
+        spacingLineDrawer = new FormSpacingLineDrawer(this);
     }
 
 
@@ -1764,4 +1766,20 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         }
     }
 
+    public boolean isMultiSelection() {
+        XCreator[] creators = this.getSelectionModel().getSelection().getSelectedCreators();
+        if (creators != null && creators.length > 1) {
+            for (int i = 0; i < creators.length - 1; i++) {
+                if (creators[i].getParent() != creators[i + 1].getParent() || !creators[i].isParentAbsolute()) {
+                    return false;
+                }
+            }
+            return creators[creators.length - 1].isParentAbsolute();
+        }
+        return false;
+    }
+
+    public FormSpacingLineDrawer getSpacingLineDrawer() {
+        return spacingLineDrawer;
+    }
 }

designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java

@@ -17,15 +17,15 @@ import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.roleAuthority.ReportAndFSManagePane;
 import com.fr.design.utils.ComponentUtils;
-
 import com.fr.form.main.parameter.FormParameterUI;
 import com.fr.page.WatermarkPainter;
 import com.fr.report.core.ReportUtils;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
 
-import java.awt.dnd.DropTarget;
+import javax.swing.JComponent;
-import javax.swing.*;
+import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
 import javax.swing.plaf.ComponentUI;
 import java.awt.AlphaComposite;
 import java.awt.Color;
@@ -33,6 +33,7 @@ import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
+import java.awt.dnd.DropTarget;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Area;
 import java.awt.geom.Rectangle2D;
@@ -128,6 +129,8 @@ public class FormDesignerUI extends ComponentUI {
             // 当前正在添加的组件
             paintAddingBean(g, addingModel);
         }
+
+        designer.getSpacingLineDrawer().draw(g);
     }
 
     // 绘制水印
@@ -518,4 +521,8 @@ public class FormDesignerUI extends ComponentUI {
         designer.paintTopCreators(g);
     }
 
+    private void paintSpacingLine() {
+
+    }
+
 }

designer-form/src/main/java/com/fr/design/mainframe/FormHorizontalParallelLine.java

@@ -0,0 +1,45 @@
+package com.fr.design.mainframe;
+
+import java.awt.Point;
+
+public class FormHorizontalParallelLine extends AbstractFormParallelLine {
+    public FormHorizontalParallelLine(int parallelValue, int startPosition, int endPosition) {
+        super(parallelValue, startPosition, endPosition);
+    }
+
+    @Override
+    public Point getStartPointOnVerticalCenterLine() {
+        Point point = new Point();
+        point.setLocation(getCenterPosition(), parallelValue);
+        return point;
+    }
+
+    @Override
+    public Point getEndPointOnVerticalCenterLine(int parallelValue) {
+        Point point = new Point();
+        point.setLocation(getCenterPosition(), parallelValue);
+        return point;
+    }
+
+    @Override
+    public Point getExtendedLineStartPoint(AbstractFormParallelLine parallelLine) {
+        Point point = new Point();
+        if (parallelLine.isVerticalCenterLineBeforeTheParallelLine(this)) {
+            point.setLocation(getStartPosition(), getParallelValue());
+        } else if (parallelLine.isVerticalCenterLineBehindTheParallelLine(this)) {
+            point.setLocation(getEndPosition(), getParallelValue());
+        }
+        return point;
+    }
+
+    @Override
+    public Point getExtendedLineEndPoint(AbstractFormParallelLine parallelLine) {
+        Point point = new Point();
+        if (parallelLine.isVerticalCenterLineBeforeTheParallelLine(this)) {
+            point.setLocation(parallelLine.getStartPosition(), getParallelValue());
+        } else if (parallelLine.isVerticalCenterLineBehindTheParallelLine(this)) {
+            point.setLocation(parallelLine.getEndPosition(), getParallelValue());
+        }
+        return point;
+    }
+}