Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~kerry/design_10.0 into release/10.0

build.gradle

@@ -64,7 +64,7 @@ allprojects {
         implementation 'org.swingexplorer:swexpl:2.0.1'
         implementation 'org.swingexplorer:swag:1.0'
         implementation 'net.java.dev.jna:jna:5.4.0'
-        implementation 'org.apache.tomcat:tomcat-catalina:8.5.32'
+        implementation 'org.apache.tomcat:tomcat-catalina:8.5.57'
         implementation 'io.socket:socket.io-client:0.7.0'
         implementation 'com.fr.third:fine-third:' + frVersion
         implementation 'com.fr.core:fine-core:' + frDevVersion
@@ -73,6 +73,7 @@ allprojects {
         implementation 'com.fr.decision:fine-decision:' + frVersion
         implementation 'com.fr.schedule:fine-schedule:' + frVersion
         implementation 'com.fr.report:fine-report-engine:' + frDevVersion
+        implementation 'com.fr.design:design-i18n:' + frDevVersion
         testImplementation 'org.easymock:easymock:3.5.1'
         testImplementation 'org.powermock:powermock-module-junit4:1.7.1'
         testImplementation 'org.powermock:powermock-api-easymock:1.7.1'

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

@@ -218,14 +218,9 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
             if (needCheckEnv) {
                 checkNameEnvMap();
             }
-
-            GeneralContext.addEnvChangedListener(new EnvChangedListener() {
-                @Override
-                public void envChanged() {
-
+            GeneralContext.addEnvChangedListener(() -> {
                 designerEnvManager.setCurrentDirectoryPrefix(FILEFactory.ENV_PREFIX);
                 designerEnvManager.setDialogCurrentDirectory(ProjectConstants.REPORTLETS_NAME);
-                }
             });
 
         }
@@ -1424,7 +1419,9 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
      * @return
      */
     private Locale checkLocale(Locale locale) {
-        return SupportLocale.getInstance().isSupport(locale) ? locale : Locale.US;
+        // Yvan: REPORT-39341，有一些情况下，获取到的是zh-Hans-CN这种，需要找到项目中最匹配的Locale
+        return SupportLocale.getInstance().isSupport(locale) ?
+                locale : SupportLocale.getInstance().getSuitableLocale(locale);
     }
 
     private void readReportLengthUnit(XMLableReader reader) {
@@ -1475,7 +1472,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
     }
 
     public String getUUID() {
-        return StringUtils.isEmpty(uuid) ? UUID.randomUUID().toString() : uuid;
+        if (StringUtils.isEmpty(uuid)) {
+            uuid = UUID.randomUUID().toString();
+        }
+        return uuid;
     }
 
     public int getActiveKeyStatus() {

designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

@@ -50,6 +50,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
@@ -74,7 +75,7 @@ public abstract class DesignTableDataManager {
     private static java.util.Map<String, String> dsNameChangedMap = new HashMap<String, String>();
     private static List<ChangeListener> globalDsListeners = new ArrayList<>();
 
-    private static Map<String, List<ChangeListener>> dsListenersMap = new HashMap<String, List<ChangeListener>>();
+    private static Map<String, List<ChangeListener>> dsListenersMap = new ConcurrentHashMap<>();
 
 
     public static String NO_PARAMETER = "no_paramater_pane";
@@ -96,8 +97,8 @@ public abstract class DesignTableDataManager {
      */
     private static void fireDsChanged() {
         fireDsChanged(globalDsListeners);
-        for (Entry<String, List<ChangeListener>> listenerEntry : dsListenersMap.entrySet()) {
-            List<ChangeListener> dsListeners = listenerEntry.getValue();
+        for (Iterator<Entry<String, List<ChangeListener>>> entryIterator = dsListenersMap.entrySet().iterator(); entryIterator.hasNext();) {
+            List<ChangeListener> dsListeners = entryIterator.next().getValue();
             fireDsChanged(dsListeners);
         }
     }

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

@@ -72,24 +72,18 @@ public class TableDataCreatorProducer {
 
     public TableDataNameObjectCreator[] createServerTableDataCreator() {
         TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Database_Query"),
-                "ds",
                 "/com/fr/design/images/data/dock/serverdatabase.png", DBTableData.class,
                 DBTableDataPane.class);
         TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"),
-                "Class",
                 "/com/fr/design/images/data/dock/serverclasstabledata.png", ClassTableData.class,
                 ClassTableDataPane.class);
         TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Embedded"),
-                "Embedded",
                 "/com/fr/design/images/data/dock/serverdatatable.png", EmbeddedTableData.class,
                 EmbeddedTableDataPane.class);
         TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_File"),
-                "File",
                 "/com/fr/design/images/data/file.png", FileTableData.class,
                 FileTableDataSmallPane.class);
-
         TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Tree"),
-                "Tree",
                 "/com/fr/design/images/data/tree.png",
                 RecursionTableData.class, GlobalTreeTableDataPane.class) {
             public boolean isNeedParameterWhenPopulateJControlPane() {
@@ -97,7 +91,6 @@ public class TableDataCreatorProducer {
             }
         };
         TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Relation"),
-                "Multi",
                 "/com/fr/design/images/data/multi.png",
                 ConditionTableData.class, GlobalMultiTDTableDataPane.class) {
             public boolean isNeedParameterWhenPopulateJControlPane() {
@@ -105,7 +98,6 @@ public class TableDataCreatorProducer {
             }
         };
         TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Stored_Procedure"),
-                "Proc",
                 "/com/fr/design/images/data/store_procedure.png",
                 StoreProcedure.class, ProcedureDataPane.class) {
             @Override
@@ -113,9 +105,7 @@ public class TableDataCreatorProducer {
                 return true;
             }
         };
-
         TableDataNameObjectCreator[] creators = new TableDataNameObjectCreator[]{dataBase, ds_Class, table, fileTable, storeProcedure, multiTable, treeTable};
-
         return merge(creators, ExtraDesignClassManager.getInstance().getServerTableDataCreators());
     }
 
@@ -141,6 +131,6 @@ public class TableDataCreatorProducer {
         for (int i = 0; i < coverIndexList.size(); i ++) {
             creators[coverIndexList.get(i)] = coverCreators.get(i);
         }
-        return (TableDataNameObjectCreator[])ArrayUtils.addAll(creators, list.toArray(new TableDataNameObjectCreator[list.size()]));
+        return ArrayUtils.addAll(creators, list.toArray(new TableDataNameObjectCreator[0]));
     }
 }

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

@@ -1,21 +1,22 @@
 package com.fr.design.data.datapane;
 
 import com.fr.base.BaseUtils;
-import com.fr.general.NameObject;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.gui.itree.refreshabletree.UserObjectRefreshJTree;
 import com.fr.design.icon.IconPathConstants;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.NameObject;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JTree;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Component;
 
 /**
  * TableData Tree
@@ -31,6 +32,7 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
         this.setCellRenderer(tableDataTreeCellRenderer);
         this.setEditable(false);
     }
+
     // CellRenderer
     private DefaultTreeCellRenderer tableDataTreeCellRenderer = new DefaultTreeCellRenderer() {
         private static final long serialVersionUID = 1L;
@@ -66,14 +68,7 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
                 this.setIcon(null);
                 this.setText(PENDING.toString());
             }
-            // 这里新建一个Label作为render是因为JTree在动态刷新的时候，节点上render画布的的宽度不会变，会使得一部分比较长的数据显示为"..."
-            UILabel label = new UILabel();
-            label.setText(getText());
-            label.setIcon(getIcon());
-            Dimension dim = label.getPreferredSize();
-            dim.height += 2;
-            this.setSize(dim);
-            this.setPreferredSize(dim);
+            this.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0));
             this.setBackgroundNonSelectionColor(UIConstants.TREE_BACKGROUND);
             this.setTextSelectionColor(Color.WHITE);
             this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE);

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

@@ -70,6 +70,15 @@ public class TreeTableDataComboBox extends UIComboBox {
 		}
 	}
 
+	/**
+	 * 带参刷新方法
+	 * @param source 数据源数据集
+	 */
+	public void refresh(TableDataSource source) {
+		this.source = source;
+		refresh();
+	}
+
 	public void setSelectedTableDataByName(String name) {
 		TableDataWrapper tableDataWrapper;
 		if (res_map.get(name) != null) {

designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java

@@ -8,7 +8,7 @@ import com.fr.design.border.UITitledBorder;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.ipasswordfield.UIPassWordField;
+import com.fr.design.gui.ipasswordfield.UIPasswordFieldWithFixedLength;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -24,8 +24,18 @@ import com.fr.general.ComparatorUtils;
 
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.JDialog;
+import javax.swing.JFileChooser;
+import javax.swing.JPanel;
+import javax.swing.JPasswordField;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Graphics;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
@@ -108,7 +118,7 @@ public class JDBCDefPane extends JPanel {
         urlTextField = new UITextField(15);
         userNameTextField = new UITextField(15);
         userNameTextField.setName(USER_NAME);
-        passwordTextField = new UIPassWordField(15);
+        passwordTextField = new UIPasswordFieldWithFixedLength(15);
         dbtypeButton = new UIButton(".");
         dbtypeButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Click_Get_Default_URL"));
         dbtypeButton.addActionListener(dbtypeButtonActionListener);

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@@ -218,7 +218,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
         paramTexts[0] = SqlUtils.tryPureSqlText(sqlTextPane.getText());
         paramTexts[1] = SqlUtils.tryPureSqlText(pageQuery);
         List<ParameterProvider> existParameterList = editorPane.update();
-        Parameter[] ps = existParameterList == null ? new Parameter[0] : existParameterList.toArray(new Parameter[existParameterList.size()]);
+        Parameter[] ps = existParameterList == null ? new Parameter[0] : existParameterList.toArray(new Parameter[0]);
         editorPane.populate(ParameterUtils.analyzeAndUnionParameters(paramTexts, ps));
     }
 

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java

@@ -73,6 +73,7 @@ public class MaxMemRowCountPanel extends UIToolbar {
 		switchCache = new UIComboBox(CACHE_LIST);
 		switchCache.addActionListener(switchStateL);
 		numberSpinner = new UISpinner(0, Integer.MAX_VALUE, 1);
+		numberSpinner.setNumberFieldColumns(4);
 	}
 
 	private void showAllPanel() {

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

@@ -35,7 +35,7 @@ public abstract class ErrorDialog extends JDialog implements ActionListener {
         JPanel messagePane = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true);
         UILabel boldFontLabel = new UILabel(message);
         UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Send_Report_To_Us"));
-        Font font = FRFont.getInstance("Dialog", Font.BOLD, 20);
+        Font font = FRFont.getInstance(label.getFont().getFontName(), Font.BOLD, 20);
         boldFontLabel.setFont(font);
         messagePane.add(boldFontLabel);
         messagePane.add(label);

designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java

@@ -40,6 +40,12 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
 
     private WorkspaceConnectionInfo connection;
 
+    /**
+     * 标记下新创建的远程工作目录 兼容存留的远程目录客户升级后再回退 读取为密文
+     * 仅保证当前新增是加密的
+     */
+    private boolean newCreated;
+
     public static RemoteDesignerWorkspaceInfo create(WorkspaceConnectionInfo connection) {
         RemoteDesignerWorkspaceInfo info = new RemoteDesignerWorkspaceInfo();
         info.connection = connection;
@@ -79,12 +85,21 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
         return remindTime;
     }
 
+    public boolean isNewCreated() {
+        return newCreated;
+    }
+
+    public void setNewCreated(boolean newCreated) {
+        this.newCreated = newCreated;
+    }
+
     @Override
     public void readXML(XMLableReader reader) {
 
         if (reader.isAttr()) {
             this.name = reader.getAttrAsString("name", StringUtils.EMPTY);
             this.remindTime = reader.getAttrAsString("remindTime", StringUtils.EMPTY);
+            this.newCreated = reader.getAttrAsBoolean("newCreated", false);
         }
         if (reader.isChildNode()) {
             String tagName = reader.getTagName();
@@ -92,32 +107,49 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
                 String url = reader.getAttrAsString("url", StringUtils.EMPTY);
                 String username = reader.getAttrAsString("username", StringUtils.EMPTY);
                 //密码解密
-                String password = SecurityToolbox.defaultDecrypt(reader.getAttrAsString("password", StringUtils.EMPTY).replaceAll(" ", "\r\n"));
+                String password = SecurityToolbox.defaultDecrypt(reader.getAttrAsString("password", StringUtils.EMPTY).replaceAll(StringUtils.BLANK, "\r\n"));
                 String certPath = reader.getAttrAsString("certPath", StringUtils.EMPTY);
-                String certSecretKey = reader.getAttrAsString("certSecretKey", StringUtils.EMPTY);
+                String certSecretKey = readCertSecretKey(reader);
                 boolean rememberPwd = reader.getAttrAsBoolean("rememberPwd", true);
                 this.connection = new WorkspaceConnectionInfo(url, username, password, certPath, certSecretKey, rememberPwd);
             }
         }
     }
 
+    private String readCertSecretKey(XMLableReader reader) {
+        if (isNewCreated()) {
+            return SecurityToolbox.defaultDecrypt(reader.getAttrAsString("certSecretKey", StringUtils.EMPTY).replaceAll(StringUtils.BLANK, "\r\n"));
+        } else {
+            return reader.getAttrAsString("certSecretKey", StringUtils.EMPTY);
+        }
+    }
+
     @Override
     public void writeXML(XMLPrintWriter writer) {
 
         writer.attr("name", name);
         writer.attr("remindTime", remindTime);
+        writer.attr("newCreated", isNewCreated());
         if (this.connection != null) {
             writer.startTAG("Connection");
             writer.attr("url", connection.getUrl());
             writer.attr("username", connection.getUserName());
             writer.attr("password", SecurityToolbox.defaultEncrypt(connection.getPassword()));
             writer.attr("certPath", connection.getCertPath());
-            writer.attr("certSecretKey", connection.getCertSecretKey());
+            writeCertSecretKey(writer);
             writer.attr("rememberPwd", connection.isRememberPwd());
             writer.end();
         }
     }
 
+    private void writeCertSecretKey(XMLPrintWriter writer) {
+        if (isNewCreated()) {
+            writer.attr("certSecretKey", SecurityToolbox.defaultEncrypt(connection.getCertSecretKey()));
+        } else {
+            writer.attr("certSecretKey", connection.getCertSecretKey());
+        }
+    }
+
     @Override
     @SuppressWarnings("squid:S2975")
     public Object clone() throws CloneNotSupportedException {

designer-base/src/main/java/com/fr/design/extra/LoginDialog.java

@@ -24,7 +24,7 @@ public class LoginDialog extends UIDialog {
     }
 
     private void init(Component pane) {
-        if (StableUtils.getMajorJavaVersion() == 8) {
+        if (StableUtils.getMajorJavaVersion() >= 8) {
             setUndecorated(true);
         }
         JPanel panel = (JPanel) getContentPane();

designer-base/src/main/java/com/fr/design/extra/ShopDialog.java

@@ -16,7 +16,7 @@ public class ShopDialog extends UIDialog {
 
     public ShopDialog(Frame frame, BasicPane pane) {
         super(frame);
-        if (StableUtils.getMajorJavaVersion() == 8) {
+        if (StableUtils.getMajorJavaVersion() >= 8) {
             setUndecorated(true);
         }
         JPanel panel = (JPanel) getContentPane();

designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java

@@ -159,7 +159,7 @@ public class WebViewDlgHelper {
     }
 
     public static void createLoginDialog() {
-        if (StableUtils.getMajorJavaVersion() == VERSION_8) {
+        if (StableUtils.getMajorJavaVersion() >= VERSION_8) {
             File file = new File(StableUtils.pathJoin(installHome, "scripts"));
             if (!file.exists()) {
                 confirmDownLoadShopJS();
@@ -172,7 +172,7 @@ public class WebViewDlgHelper {
 
 
     public static void createLoginDialog(Window parent) {
-        if (StableUtils.getMajorJavaVersion() == VERSION_8) {
+        if (StableUtils.getMajorJavaVersion() >= VERSION_8) {
             File file = new File(StableUtils.pathJoin(installHome, "scripts"));
             if (!file.exists()) {
                 confirmDownLoadShopJS();

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

@@ -17,14 +17,31 @@ import com.fr.file.FILE;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.Constants;
-import com.fr.stable.ProductConstants;
 import com.fr.third.javax.annotation.Nonnull;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.lock.TplOperator;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.ButtonModel;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.SwingConstants;
 import javax.swing.plaf.basic.BasicMenuItemUI;
-import java.awt.*;
+import java.awt.AWTEvent;
+import java.awt.AlphaComposite;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.GradientPaint;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
 import java.awt.event.AWTEventListener;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -171,6 +188,8 @@ public class MutilTempalteTabPane extends JComponent {
 
     private UIMenuItem initCloseOther() {
         UIMenuItem closeOther = new UIMenuItem(Toolkit.i18nText("Fine-Design_Basic_FS_Close_Other_Templates"));
+        // Yvan: 英文下文本显示不全，后续发现如果将模板名设置的比较短，其它语言也会出现显示不全的问题，所以设置一下文本水平居中
+        closeOther.setHorizontalAlignment(SwingConstants.CENTER);
         setListDownItemPreferredSize(closeOther);
         closeOther.addActionListener(new ActionListener() {
             @Override

designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowPane.java

@@ -200,13 +200,17 @@ public class ColumnRowPane extends JPanel implements UIObserver {
             column = 0;
         }
         removeDocumentListener(d);
-        columnSpinner.setValue(StableUtils.convertIntToABC(column + 1));
+        String colValue = StableUtils.convertIntToABC(column + 1);
+        columnSpinner.setValue(colValue);
+        ((DefaultEditor) columnSpinner.getEditor()).getTextField().setText(colValue);
         int row = columnRow.getRow();
         // shoc 小于0就蹦了
         if (row < 0) {
             row = 0;
         }
-        rowSpinner.setValue("" + (row + 1));
+        String rowValue = Integer.toString(row + 1);
+        rowSpinner.setValue(rowValue);
+        ((DefaultEditor) rowSpinner.getEditor()).getTextField().setText(rowValue);
         addDocumentListener(d);
         fireChanged();
     }

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

@@ -26,14 +26,14 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-
 import com.fr.stable.StringUtils;
-
-import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.List;
+import javax.swing.*;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
 
 public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previewable, EditOrNewLabel.Editable {
     private TreeTableDataComboBox treeTableDataComboBox;
@@ -61,6 +61,23 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
                 tdChange();
             }
         });
+        // REPORT-38762 加一个展开监听事件，下拉框展开时刷新一下数据集
+        treeTableDataComboBox.addPopupMenuListener(new PopupMenuListener() {
+            @Override
+            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+                treeTableDataComboBox.refresh(DesignTableDataManager.getEditingTableDataSource());
+            }
+
+            @Override
+            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+
+            }
+
+            @Override
+            public void popupMenuCanceled(PopupMenuEvent e) {
+
+            }
+        });
         selectTreeDataPanel.add(treeTableDataComboBox);
         treeTableDataComboBox.setPreferredSize(new Dimension(200, 25));
         treeTableDataComboBox.setSelectedIndex(-1);

designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBoxTest.java

@@ -3,10 +3,10 @@
  */
 package com.fr.design.gui.icombobox;
 
+import com.fr.design.gui.UILookAndFeel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.log.FineLoggerFactory;
-import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
@@ -23,7 +23,7 @@ import java.awt.event.ItemListener;
 public class LazyComboBoxTest {
 	public static void main(String[] args) {
 		try {
-			UIManager.setLookAndFeel(new WindowsLookAndFeel());
+			UIManager.setLookAndFeel(new UILookAndFeel());
 		} catch (UnsupportedLookAndFeelException e1) {
             FineLoggerFactory.getLogger().error(e1.getMessage(), e1);
 		}

designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java

@@ -19,7 +19,7 @@ import java.awt.event.MouseMotionListener;
 public class UIEastResizableContainer extends JPanel {
     private static final long serialVersionUID = 1854340560790476907L;
 
-    public static final int MAX_CONTAINER_WIDTH = 500;
+    public static final int MAX_CONTAINER_WIDTH = 340;
     public static final int MIN_CONTAINER_WIDTH = 286;
 
     private int containerWidth = 240;
@@ -266,13 +266,7 @@ public class UIEastResizableContainer extends JPanel {
 
                 @Override
                 public void mouseDragged(MouseEvent e) {
-                    containerWidth = UIEastResizableContainer.this.getWidth() + (UIEastResizableContainer.this.getLocationOnScreen().x - e.getXOnScreen());
-                    containerWidth = Math.min(containerWidth, MAX_CONTAINER_WIDTH);
-                    containerWidth = Math.max(containerWidth, MIN_CONTAINER_WIDTH);
-                    refreshContainer();
-                    if ( DesignModeContext.isAuthorityEditing()) {
-                        DesignerContext.getDesignerFrame().doResize();
-                    }
+                    // do noting
                 }
             });
             addMouseListener(new MouseAdapter() {

designer-base/src/main/java/com/fr/design/gui/ipasswordfield/UIPasswordFieldWithFixedLength.java

@@ -0,0 +1,106 @@
+package com.fr.design.gui.ipasswordfield;
+
+import com.fr.stable.StringUtils;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.text.Document;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+/**
+ * @author Yvan
+ * @version 10.0
+ * Created by Yvan on 2020-08-11
+ * 有固定长度的"*"回显的密码框，避免泄露密码长度
+ */
+public class UIPasswordFieldWithFixedLength extends UIPassWordField {
+    /**
+     * 展示密码，为固定8位长度的特殊字符"*"组成
+     */
+    private static final String DISPLAY_PASSWORD = "********";
+
+    /**
+     * 实际密码
+     */
+    private String realPassword;
+
+    /**
+     * 用于判断是否清空密码
+     */
+    private boolean clearPassword;
+
+    public UIPasswordFieldWithFixedLength() {
+        this(null, null, 0);
+    }
+
+    public UIPasswordFieldWithFixedLength(String text) {
+        this(null, text, 0);
+    }
+
+    public UIPasswordFieldWithFixedLength(int columns) {
+        this(null, null, columns);
+    }
+
+    public UIPasswordFieldWithFixedLength(String text, int columns) {
+        this(null, text, columns);
+    }
+
+    public UIPasswordFieldWithFixedLength(Document doc, String txt, int columns) {
+        super(doc, txt, columns);
+        initRealPassword(txt);
+    }
+
+    /**
+     * 为realPassword赋初值并添加一个鼠标单击事件
+     */
+    public void initRealPassword(String text) {
+        this.realPassword = text == null ? StringUtils.EMPTY : text;
+        this.clearPassword = true;
+        addShowFixedLengthPasswordListener();
+    }
+
+    /**
+     * 当鼠标点击密码框，第一次做出键入动作时，清空显示密码与实际密码，用户需要重新输入密码
+     */
+    private void addShowFixedLengthPasswordListener() {
+        this.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+               UIPasswordFieldWithFixedLength.this.clearPassword = true;
+            }
+        });
+        this.addKeyListener(new KeyAdapter() {
+            @Override
+            public void keyPressed(KeyEvent e) {
+                if (clearPassword) {
+                    UIPasswordFieldWithFixedLength.this.setText(StringUtils.EMPTY);
+                    UIPasswordFieldWithFixedLength.this.clearPassword = false;
+                    UIPasswordFieldWithFixedLength.this.updateUI();
+                }
+            }
+        });
+    }
+
+    @Override
+    public void setText(@NotNull String t) {
+        this.realPassword = t;
+        // 看到代码中有些场景是将密码置为空字符串的，所以在这里加个判断
+        if (StringUtils.isEmpty(t)) {
+            super.setText(t);
+        } else {
+            super.setText(DISPLAY_PASSWORD);
+        }
+    }
+
+    @Override
+    public char[] getPassword() {
+        //如果用户刚清空密码框，并输入了新密码，则返回输入内容，否则返回realPassword
+        String text = new String(super.getPassword());
+        if (!StringUtils.isEmpty(text) && StringUtils.isEmpty(realPassword)) {
+            return text.toCharArray();
+        }
+        return realPassword.toCharArray();
+    }
+}

designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java

@@ -30,6 +30,7 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
     private static final int LEN = 13;
     private static final int WIDTH = 13;
     private static final int HEIGHT = 10;
+    private static final int DEFAULT_NUMBERFIELD_COLUMNS = 2;
     private UINumberField textField;
     private UIButton preButton;
     private UIButton nextButton;
@@ -40,9 +41,22 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
     private UIObserverListener uiObserverListener;
     private GlobalNameListener globalNameListener = null;
     private boolean lessMinValue = false;
+    /**
+     * Spinner内的数字文本框长度
+     */
+    private int numberFieldColumns;
 
 
     public UISpinner(double minValue, double maxValue, double dierta) {
+        init(minValue, maxValue, dierta);
+    }
+
+    public UISpinner(double minValue, double maxValue, double dierta, double defaultValue) {
+        init(minValue, maxValue, dierta);
+        textField.setValue(defaultValue);
+    }
+
+    private void init(double minValue, double maxValue, double dierta) {
         this.minValue = minValue;
         this.maxValue = maxValue;
         this.dierta = dierta;
@@ -50,11 +64,6 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
         iniListener();
     }
 
-    public UISpinner(double minValue, double maxValue, double dierta, double defaultValue) {
-        this(minValue, maxValue, dierta);
-        textField.setValue(defaultValue);
-    }
-
     private void iniListener() {
         if (shouldResponseChangeListener()) {
             this.addChangeListener(new ChangeListener() {
@@ -156,6 +165,13 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
         fireStateChanged();
     }
 
+    /**
+     * 设置Spinner内的数字输入框列数
+     * @param numberFieldColumns    输入框列数
+     */
+    public void setNumberFieldColumns(int numberFieldColumns) {
+        textField.setColumns(numberFieldColumns);
+    }
 
     public void setEnabled(boolean flag) {
         super.setEnabled(flag);
@@ -308,7 +324,8 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
     }
 
     protected UINumberField initNumberField() {
-        return new UINumberField(2) {
+        int columns = this.numberFieldColumns == 0 ? DEFAULT_NUMBERFIELD_COLUMNS : this.numberFieldColumns;
+        return new UINumberField(columns) {
             public boolean shouldResponseChangeListener() {
                 return false;
             }

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

@@ -2,7 +2,6 @@ package com.fr.design.gui.itree.filetree;
 
 import com.fr.base.FRContext;
 import com.fr.design.constants.UIConstants;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.gui.itree.refreshabletree.RefreshableJTree;
 import com.fr.design.i18n.Toolkit;
@@ -14,13 +13,13 @@ import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
 import com.fr.workspace.WorkContext;
 
+import javax.swing.BorderFactory;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -79,14 +78,7 @@ public class EnvFileTree extends RefreshableJTree {
                     this.setIcon(null);
                     this.setText(PENDING.toString());
                 }
-                // 这里新建一个Label作为render是因为JTree在动态刷新的时候，节点上render画布的的宽度不会变，会使得一部分比较长的数据显示为"..."
-                UILabel label = new UILabel();
-                label.setText(getText());
-                label.setIcon(getIcon());
-                this.setSize(label.getPreferredSize());
-                Dimension dim = label.getPreferredSize();
-                dim.height += 2;
-                this.setPreferredSize(dim);
+                this.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0));
                 this.setBackgroundNonSelectionColor(UIConstants.TREE_BACKGROUND);
                 this.setTextSelectionColor(Color.WHITE);
                 this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE);

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

@@ -257,8 +257,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         }
     };
 
-    private ProgressDialog progressDialog;
-
     public DesignerFrame(ToolBarMenuDock ad) {
 
         setName(DESIGNER_FRAME_NAME);
@@ -338,7 +336,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         this.setDropTarget(new DropTarget(this, DnDConstants.ACTION_MOVE, new FileDropTargetListener(), true));
         closeMode = UIConstants.CLOSE_OF_AUTHORITY;
         initMenuPane();
-        this.progressDialog = new ProgressDialog(this);
     }
 
     public void resizeFrame() {
@@ -748,9 +745,15 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      * @param al   组件名称
      */
     public 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);
-
+        }
     }
 
     /**
@@ -1262,23 +1265,15 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         }
     }
 
+    @Deprecated
     public ProgressDialog getProgressDialog() {
 
-        return progressDialog;
+        return new ProgressDialog(this);
     }
 
-    public void showProgressDialog() {
-
-        progressDialog.setVisible(true);
-
-    }
-
-    /**
-     * 隐藏进度框
-     */
-    public void hideProgressDialog() {
+    @Deprecated
+    public void openProgressDialog() {
 
-        progressDialog.setVisible(false);
     }
 
     /**
@@ -1286,17 +1281,17 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      *
      * @param progress 进度值
      */
+    @Deprecated
     public void updateProgress(int progress) {
 
-        progressDialog.setProgressValue(progress);
     }
 
     /**
      * 释放进度框
      */
+    @Deprecated
     public void disposeProgressDialog() {
 
-        progressDialog.dispose();
     }
 
     /**
@@ -1307,4 +1302,5 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
     public boolean isDesignerOpened() {
         return designerOpened;
     }
+
 }

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

@@ -556,7 +556,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
             );
             newNameLabel.setHorizontalAlignment(SwingConstants.RIGHT);
             newNameLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10));
-            newNameLabel.setPreferredSize(new Dimension(118, 15));
+            //newNameLabel.setPreferredSize(new Dimension(118, 15));
 
             // 重命名输入框
             nameField = new UITextField(oldName);
@@ -856,7 +856,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
                     BorderLayout.CENTER);
 
 
-            this.setSize(340, 180);
+            this.setSize(380, 180);
             this.setTitle(Toolkit.i18nText("Fine-Design_Basic_Mkdir"));
             this.setResizable(false);
             this.setAlwaysOnTop(true);

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

@@ -511,7 +511,10 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         UIUtil.invokeLaterIfNeeded(new Runnable() {
             @Override
             public void run() {
-                propertyItemMap.get(key).replaceContentPane(pane);
+                PropertyItem item = propertyItemMap.get(key);
+                if (item != null) {
+                    item.replaceContentPane(pane);
+                }
             }
         });
     }

designer-base/src/main/java/com/fr/design/os/impl/PMDialogAction.java

@@ -17,11 +17,11 @@ public class PMDialogAction implements OSBasedAction {
     private static String PLUGIN_MANAGER_ROUTE = "#management/plugin";
     @Override
     public void execute(Object... objects) {
-         if(Arch.getArch() == Arch.ARM){
+         if(Arch.getArch() == Arch.ARM || OperatingSystem.isLinux()){
              DesignUtils.visitEnvServerByParameters( PLUGIN_MANAGER_ROUTE,null,null);
              return;
          }
-        if (ServerPreferenceConfig.getInstance().isUseOptimizedUPM() && !OperatingSystem.isLinux()) {
+        if (ServerPreferenceConfig.getInstance().isUseOptimizedUPM()) {
             UpmFinder.showUPMDialog();
         } else {
             WebViewDlgHelper.createPluginDialog();

designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java

@@ -20,14 +20,18 @@ import com.fr.design.editor.editor.TextEditor;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
-
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
@@ -37,6 +41,7 @@ import java.util.Map.Entry;
 
 /**
  * The dialog used to input parameter.
+ *
  * @editor zhou
  * @since 2012-3-26上午11:09:45
  */
@@ -51,6 +56,8 @@ public class ParameterInputPane extends BasicPane {
 
     private boolean allowBlank = true;
 
+    private FlowTableLayoutHelper flowTableLayoutHelper;
+
     /**
      * Constructor.
      */
@@ -71,7 +78,7 @@ public class ParameterInputPane extends BasicPane {
         this.add(new JScrollPane(contentPane), BorderLayout.CENTER);
         contentPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameters") + ":"));
 
-        FlowTableLayoutHelper flowTableLayoutHelper = new FlowTableLayoutHelper();
+        flowTableLayoutHelper = new FlowTableLayoutHelper();
 
         editorNameMap = new java.util.HashMap<ValueEditorPane, String>();
 
@@ -112,7 +119,12 @@ public class ParameterInputPane extends BasicPane {
                 nameAddedList.add(parameter.getName());
             }
         }
+    }
 
+    @Override
+    public void addNotify() {
+        super.addNotify();
+        // windows 高DPI下，使用getPreferredSize必须在添加到容器之后，否则得到的数值不准确，因此先放到这调整大小
         flowTableLayoutHelper.adjustLabelWidth();
     }
 

designer-base/src/main/java/com/fr/design/style/color/NewColorSelectBox.java

@@ -30,11 +30,18 @@ public class NewColorSelectBox extends AbstractSelectBox<Color> implements UIObs
         iniListener();
     }
 
-    private void iniListener(){
+    protected void iniListener(){
         if(shouldResponseChangeListener()){
             this.addSelectChangeListener(new ChangeListener() {
                 @Override
                 public void stateChanged(ChangeEvent e) {
+                    attributeChange();
+                }
+            });
+        }
+    }
+
+    protected void attributeChange() {
         if(uiObserverListener == null){
             return;
         }
@@ -43,9 +50,6 @@ public class NewColorSelectBox extends AbstractSelectBox<Color> implements UIObs
         }
         uiObserverListener.doChange();
     }
-            });
-        }
-    }
 
     /**
      * 初始化下拉面板

designer-base/src/main/java/com/fr/design/utils/DesignUtils.java

@@ -19,10 +19,10 @@ import com.fr.stable.ArrayUtils;
 import com.fr.stable.CommonCodeUtils;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
+import com.fr.stable.os.OperatingSystem;
 import com.fr.start.ServerStarter;
 import com.fr.workspace.WorkContext;
 
-import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import java.awt.Desktop;
@@ -31,7 +31,6 @@ import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
@@ -83,6 +82,7 @@ public class DesignUtils {
     /**
      * 判断设计器端口是否被其他程序占用
      * 尝试去通信，无回应就是其他程序占用端口，否则需要继续判断是否为设计器进程未关闭
+     *
      * @return
      */
     public static boolean isPortOccupied() {
@@ -191,8 +191,8 @@ public class DesignUtils {
                                 } else if ("check".equals(line)) {
                                     clientSend(new String[]{"response"}, socket);
                                 } else if ("end".equals(line)) {
-                                    DesignerExiter.getInstance().execute();                                }
-                                else if (StringUtils.isNotEmpty(line)) {
+                                    DesignerExiter.getInstance().execute();
+                                } else if (StringUtils.isNotEmpty(line)) {
                                     File f = new File(line);
                                     String path = f.getAbsolutePath();
 
@@ -285,11 +285,18 @@ public class DesignUtils {
         return key.startsWith("TextField.") || key.startsWith("PasswordField.");
     }
 
+    /**
+     * 获取当前系统语言下设计器用的默认字体
+     *
+     * @return 默认字体
+     */
     private static FRFont getCurrentLocaleFont() {
         FRFont guiFRFont;
         Locale defaultLocale = Locale.getDefault();
-
-        if (isDisplaySimSun(defaultLocale)) {
+        // JDK9 之后宋体在计算label中字母的空间上出现问题，暂时先用雅黑兼容，以后再统一字体
+        if (StableUtils.getMajorJavaVersion() >= 9 && OperatingSystem.isWindows()) {
+            guiFRFont = getNamedFont("Microsoft YaHei");
+        } else if (isDisplaySimSun(defaultLocale)) {
             guiFRFont = getNamedFont("SimSun");
         } else {
             guiFRFont = getNamedFont("Dialog");

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

@@ -3,6 +3,7 @@ package com.fr.env;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.env.DesignerWorkspaceInfo;
+import com.fr.design.env.DesignerWorkspaceType;
 import com.fr.design.env.LocalDesignerWorkspaceInfo;
 import com.fr.design.env.RemoteDesignerWorkspaceInfo;
 import com.fr.design.gui.controlpane.JListControlPane;
@@ -17,8 +18,10 @@ import com.fr.stable.core.PropertyChangeAdapter;
 import javax.swing.*;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 /**
  * @author yaohwu
@@ -98,11 +101,30 @@ public class EnvListPane extends JListControlPane {
         DesignerEnvManager mgr = DesignerEnvManager.getEnvManager();
         //这里代码时序换一下，因为update中需要借助mgr来获取提醒时间，已确认mgr对res无依赖
         Nameable[] res = this.update();
+        Set<Nameable> set = findNewWorkSpaceInfo(res);
         mgr.clearAllEnv();
         for (Nameable re : res) {
             NameObject nameObject = (NameObject) re;
-            mgr.putEnv(nameObject.getName(), (DesignerWorkspaceInfo) nameObject.getObject());
+            DesignerWorkspaceInfo info = (DesignerWorkspaceInfo) nameObject.getObject();
+            if (set.contains(re) && info.getType() == DesignerWorkspaceType.Remote) {
+                RemoteDesignerWorkspaceInfo newInfo = (RemoteDesignerWorkspaceInfo) info;
+                newInfo.setNewCreated(true);
+                mgr.putEnv(nameObject.getName(), newInfo);
+            } else {
+                mgr.putEnv(nameObject.getName(), info);
+            }
         }
         return this.getSelectedName();
     }
+
+    private Set<Nameable> findNewWorkSpaceInfo(Nameable[] res) {
+        Set<Nameable> set = new HashSet<>();
+        for (Nameable val : res) {
+            NameObject nameObject = (NameObject) val;
+            if (DesignerEnvManager.getEnvManager().getWorkspaceInfo(nameObject.getName()) == null) {
+                set.add(val);
+            }
+        }
+        return set;
+    }
 }

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

@@ -13,6 +13,7 @@ import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ipasswordfield.UIPassWordField;
+import com.fr.design.gui.ipasswordfield.UIPasswordFieldWithFixedLength;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -26,7 +27,17 @@ import com.fr.workspace.WorkContext;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
 import com.fr.workspace.engine.exception.WorkspaceAuthException;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+import javax.swing.JDialog;
+import javax.swing.JFileChooser;
+import javax.swing.JPanel;
+import javax.swing.JTextPane;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
+import javax.swing.ToolTipManager;
+import javax.swing.UIManager;
 import javax.swing.border.EmptyBorder;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
@@ -96,7 +107,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
     /**
      * 密码
      */
-    private UIPassWordField passwordInput = new UIPassWordField();
+    private UIPassWordField passwordInput = new UIPasswordFieldWithFixedLength();
     /**
      * 是否记住密码
      */
@@ -108,7 +119,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
     /**
      * https密钥
      */
-    private UIPassWordField certSecretKeyInput = new UIPassWordField();
+    private UIPassWordField certSecretKeyInput = new UIPasswordFieldWithFixedLength();
     /**
      * 选择证书文件按钮
      */

designer-base/src/main/java/com/fr/start/BaseDesigner.java

@@ -64,14 +64,11 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
             @Override
             public void on(Event event, Null param) {
                 EventDispatcher.stopListen(this);
-                UIUtil.invokeLaterIfNeeded(new Runnable() {
-                    @Override
-                    public void run() {
+                UIUtil.invokeLaterIfNeeded(() -> {
 
                     // 打开上次的文件
                     showDesignerFrame(false);
                     DesignerLaunchStatus.setStatus(DesignerLaunchStatus.OPEN_LAST_FILE_COMPLETE);
-                    }
                 });
             }
         });
@@ -90,12 +87,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
     }
 
     public void show() {
-        UIUtil.invokeLaterIfNeeded(new Runnable() {
-            @Override
-            public void run() {
-                refreshTemplateTree();
-            }
-        });
+        UIUtil.invokeLaterIfNeeded(this::refreshTemplateTree);
     }
 
     private void refreshTemplateTree() {

designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java

@@ -32,7 +32,7 @@ public class FineEmbedServerMonitor {
      */
     private static final int STEP_HEARTBEAT = 40;
     private static volatile FineEmbedServerMonitor monitor;
-    private static ProgressDialog progressBar = DesignerContext.getDesignerFrame().getProgressDialog();
+    private static ProgressDialog progressDialog = new ProgressDialog(DesignerContext.getDesignerFrame());
     //由于默认值的字体不支持韩文，所以要对韩文单独生成字体
     private FRFont font = null;
     private static final int FONT_RGB = 333334;
@@ -47,7 +47,7 @@ public class FineEmbedServerMonitor {
             @Override
             public void on(Event event, Null aNull) {
                 getInstance().reset();
-                DesignerContext.getDesignerFrame().hideProgressDialog();
+                progressDialog.dispose();
             }
         });
     }
@@ -64,7 +64,7 @@ public class FineEmbedServerMonitor {
     }
 
     public int getProgress() {
-        if (progress == progressBar.getProgressMaximum()) {
+        if (progress == progressDialog.getProgressMaximum()) {
             return progress;
         } else {
             progress += STEP;
@@ -73,7 +73,7 @@ public class FineEmbedServerMonitor {
     }
 
     public void setComplete() {
-        this.progress = progressBar.getProgressMaximum();
+        this.progress = progressDialog.getProgressMaximum();
     }
 
     public void reset() {
@@ -81,7 +81,7 @@ public class FineEmbedServerMonitor {
     }
 
     public boolean isComplete() {
-        return this.progress >= progressBar.getProgressMaximum();
+        return this.progress >= progressDialog.getProgressMaximum();
     }
 
     public void monitor() {
@@ -92,11 +92,12 @@ public class FineEmbedServerMonitor {
             public void run() {
                 if (isComplete()) {
                     scheduler.shutdown();
-                    DesignerContext.getDesignerFrame().hideProgressDialog();
+                    progressDialog.dispose();
                     return;
                 }
-                if (!DesignerContext.getDesignerFrame().getProgressDialog().isVisible()) {
-                    DesignerContext.getDesignerFrame().showProgressDialog();
+                if (!progressDialog.isVisible()) {
+                    progressDialog = new ProgressDialog(DesignerContext.getDesignerFrame());
+                    progressDialog.setVisible(true);
                     //如果为韩文则改变字体
                     LocaleCenter.buildAction(new LocaleAction() {
                         @Override
@@ -105,9 +106,9 @@ public class FineEmbedServerMonitor {
                         }
                     }, SupportLocaleImpl.SUPPORT_KOREA);
                     String text = Toolkit.i18nText("Fine-Design_Basic_Loading_Embed_Server");
-                    DesignerContext.getDesignerFrame().getProgressDialog().updateLoadingText(text, font);
+                    progressDialog.updateLoadingText(text, font);
                 }
-                DesignerContext.getDesignerFrame().updateProgress(getProgress());
+                progressDialog.setProgressValue(getProgress());
             }
         }, 0, STEP_HEARTBEAT, TimeUnit.MILLISECONDS);
 

designer-base/src/main/java/com/fr/start/server/ServerTray.java

@@ -29,9 +29,9 @@ public class ServerTray {
 
     private MenuItem stopMenu;
 
-    private Image trayStartedImage = BaseUtils.readImage("/com/fr/base/images/oem/trayStarted.png");
+    private Image trayStartedImage = BaseUtils.readImage("/com/fr/base/images/oem/trayStarted@2x.png");
 
-    private Image trayStoppedImage = BaseUtils.readImage("/com/fr/base/images/oem/trayStopped.png");
+    private Image trayStoppedImage = BaseUtils.readImage("/com/fr/base/images/oem/trayStopped@2x.png");
 
     private ServerManageFrame serverManageFrame;
 

designer-base/src/test/java/com/fr/design/DesignerEnvManagerTest.java

@@ -3,6 +3,7 @@ package com.fr.design;
 import junit.framework.TestCase;
 
 import java.util.Locale;
+import org.junit.Assert;
 
 public class DesignerEnvManagerTest extends TestCase{
 
@@ -17,4 +18,11 @@ public class DesignerEnvManagerTest extends TestCase{
         assertEquals("下边界", envManager.getLanguage(), Locale.SIMPLIFIED_CHINESE);
 
     }
+
+    public void testGetUUID() {
+        DesignerEnvManager envManager = new DesignerEnvManager();
+        String uuid0 = envManager.getUUID();
+        String uuid1 = envManager.getUUID();
+        Assert.assertEquals(uuid0, uuid1);
+    }
 }

designer-base/src/test/java/com/fr/design/env/RemoteDesignerWorkspaceInfoTest.java

@@ -1,9 +1,16 @@
 package com.fr.design.env;
 
+import com.fr.invoke.Reflect;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLReaderHelper;
+import com.fr.stable.xml.XMLableReader;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
 import junit.framework.TestCase;
 import org.junit.Assert;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
 /**
  * @author hades
  * @version 10.0
@@ -22,4 +29,64 @@ public class RemoteDesignerWorkspaceInfoTest extends TestCase {
         Assert.assertFalse(workspaceInfo3.checkValid());
     }
 
+    public void testReadXml() {
+        String xml0 = "<Connection url=\"https://192.168.101.171:8075/webroot/decision\" username=\"1\" password=\"EclFl2zl5ti32lqQIh9r/7iCd0Vmhm5uuLol+zs+oi4JWN8F6JA2Ym4PYeQOAR5cjvIdzhUgwoG/\n" +
+                "AJF1Ht1CFLfZqrztuJsWpP8GlMvqZb/Gi3TT2idJC/qHU6Am1jFe0qJoytyWUi5zGnZicTfVgDir\n" +
+                "gE0kuw1ONOzFCkVfNbLrC+DXIIbVa7ramqbsVa6/LDEqOJvfAE36cBYJjWGHjOT91ixldaCyEX8m\n" +
+                "0xmw5xvEuEiTgRUHufbKCEG0FOR1xvS3D3C9vlauoqDI1INOyUOawQvpuQ552AjZi/FH1v+eNt+q\n" +
+                "eU7iCzsKb6P5KomaKUTZ8EPlSR/+Ihzg5VjAyg==\" certPath=\"\" certSecretKey=\"bofKLt/G93T2NudGR71Npb1GCPSUVeC34dtFGa+DHRl2GfP3WM4Nitb/LwdA/mml5BNl/S5f4txt\n" +
+                "0jxK4r08BoWoleKt5r7C0Fapj6Ccm+qVP6ywaxN1PSC0ML8Fowo3VYhv2BVzdodMLLliIVngostk\n" +
+                "76gqsiatzJb0XiPnzb0UpjWs7lpgCw+XDBk2Qfpv/U8fyPmLkAxA+085w55vzLluu7o2ilaveOUk\n" +
+                "hmT3NfZinTTZd+dQJxfVfUgjKJdZ9C+EM/IkzY1gVYXYuZ8gl5wd5RkjC3VUOu36akmB09gXJ4S8\n" +
+                "z8ZdHilA5L9tneuS5C05DMRJ6CdO+avGJgJAtw==\" rememberPwd=\"true\"/>";
+        String xml1 = "<Connection url=\"https://192.168.101.171:8075/webroot/decision\" username=\"1\" password=\"EclFl2zl5ti32lqQIh9r/7iCd0Vmhm5uuLol+zs+oi4JWN8F6JA2Ym4PYeQOAR5cjvIdzhUgwoG/\n" +
+                "AJF1Ht1CFLfZqrztuJsWpP8GlMvqZb/Gi3TT2idJC/qHU6Am1jFe0qJoytyWUi5zGnZicTfVgDir\n" +
+                "gE0kuw1ONOzFCkVfNbLrC+DXIIbVa7ramqbsVa6/LDEqOJvfAE36cBYJjWGHjOT91ixldaCyEX8m\n" +
+                "0xmw5xvEuEiTgRUHufbKCEG0FOR1xvS3D3C9vlauoqDI1INOyUOawQvpuQ552AjZi/FH1v+eNt+q\n" +
+                "eU7iCzsKb6P5KomaKUTZ8EPlSR/+Ihzg5VjAyg==\" certPath=\"\" certSecretKey=\"xxxxxxx\" rememberPwd=\"true\"/>";
+        byte[] bytes0 = xml0.getBytes();
+        byte[] bytes1 = xml1.getBytes();
+        RemoteDesignerWorkspaceInfo info = new RemoteDesignerWorkspaceInfo();
+        ByteArrayInputStream in0 = new ByteArrayInputStream(bytes0);
+        ByteArrayInputStream in1 = new ByteArrayInputStream(bytes1);
+
+        try {
+            XMLableReader reader0 = XMLReaderHelper.createXMLableReader(in0, XMLPrintWriter.XML_ENCODER);
+            Reflect.on(reader0).set("state", 1);
+            info.setNewCreated(true);
+            info.readXML(reader0);
+            Assert.assertEquals("xxxxxxx", info.getConnection().getCertSecretKey());
+
+            XMLableReader reader1 = XMLReaderHelper.createXMLableReader(in1, XMLPrintWriter.XML_ENCODER);
+            Reflect.on(reader1).set("state", 1);
+            info.setNewCreated(false);
+            info.readXML(reader1);
+            Assert.assertEquals("xxxxxxx", info.getConnection().getCertSecretKey());
+        } catch (Exception ignore) {
+
+        }
+    }
+
+    public void testWriteXml() {
+        ByteArrayOutputStream out0 = new ByteArrayOutputStream();
+        XMLPrintWriter writer0 = XMLPrintWriter.create(out0);
+        RemoteDesignerWorkspaceInfo info0 = RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("127.0.0.1", "1", "1", "/xxx", "xxxxx", true));
+        info0.setNewCreated(true);
+        info0.writeXML(writer0);
+        writer0.close();
+        String result0 = new String(out0.toByteArray());
+        Assert.assertTrue(result0.contains("certSecretKey"));
+        Assert.assertFalse(result0.contains("certSecretKey=\"xxxxx\""));
+
+        ByteArrayOutputStream out1 = new ByteArrayOutputStream();
+        XMLPrintWriter writer1 = XMLPrintWriter.create(out1);
+        RemoteDesignerWorkspaceInfo info1 = RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("127.0.0.1", "1", "1", "/xxx", "xxxxx", true));
+        info1.writeXML(writer1);
+        writer1.close();
+        String result1 = new String(out1.toByteArray());
+        Assert.assertTrue(result1.contains("certSecretKey"));
+        Assert.assertTrue(result1.contains("certSecretKey=\"xxxxx\""));
+
+    }
+
 }

designer-chart/src/main/java/com/fr/design/chartx/component/AbstractCustomFieldComboBoxPane.java

@@ -82,6 +82,10 @@ public abstract class AbstractCustomFieldComboBoxPane<T> extends BasicBeanPane<T
         return false;
     }
 
+    protected boolean seriesComboBoxHasNone() {
+        return false;
+    }
+
     public void checkBoxUse(boolean hasUse) {
         nameOrValue.setEnabled(hasUse);
         useFieldValuePane.checkBoxUse(hasUse);
@@ -147,8 +151,7 @@ public abstract class AbstractCustomFieldComboBoxPane<T> extends BasicBeanPane<T
 
         private void initComponents() {
 
-            series = new UIComboBox();
-
+            series = seriesComboBoxHasNone() ? new UIComboBoxWithNone() : new UIComboBox();
             value = valueComboBoxHasNone() ? new UIComboBoxWithNone() : new UIComboBox();
             value.addItemListener(new ItemListener() {
                 @Override

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

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.chart.gui.data;
 
+import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.Plot;
@@ -8,6 +9,7 @@ import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
+import com.fr.plugin.chart.custom.CustomDefinition;
 
 
 import java.awt.*;
@@ -45,7 +47,8 @@ public class ReportDataPane extends FurtherBasicBeanPane<ChartCollection>{
      * @return 界面是否接受对象
      */
 	public boolean accept(Object ob) {
-		return ob instanceof ChartCollection && ((ChartCollection)ob).getSelectedChart().getFilterDefinition() instanceof ReportDataDefinition;
+		TopDefinitionProvider filterDefinition = ((ChartCollection) ob).getSelectedChartProvider(Chart.class).getFilterDefinition();
+		return ob instanceof ChartCollection && filterDefinition instanceof ReportDataDefinition && !(filterDefinition instanceof CustomDefinition);
 	}
 
     /**

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

@@ -22,6 +22,10 @@ public class ExtendedCustomFieldComboBoxPane extends AbstractCustomFieldComboBox
         return new ExtendedCustomFieldNamePane();
     }
 
+    @Override
+    protected boolean seriesComboBoxHasNone() {
+        return true;
+    }
 
     @Override
     public void populateBean(AbstractDataConfig ob) {

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

@@ -41,7 +41,9 @@ public class UIComboBoxWithNone extends UIComboBox {
     public void setSelectedItem(Object anObject) {
         super.setSelectedItem(anObject);
 
-        if (getSelectedIndex() == -1) {//找不到的都选中无。中文的无 英文下是none。
+        //找不到的都选中无。中文的无 英文下是none。
+        //改正：找不到的且anObject不是null的 全部选中无。
+        if (getSelectedIndex() == -1 && anObject != null) {
             super.setSelectedItem(getDefaultLocaleString());
         }
     }

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

@@ -5,12 +5,12 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.area.AreaIndependentVanChart;
 import com.fr.plugin.chart.area.VanChartAreaPlot;
-import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
+import com.fr.van.chart.designer.type.AbstractRectanglePlotPane;
 
 /**
  * Created by Mitisky on 15/11/18.
  */
-public class VanChartAreaPlotPane extends AbstractVanChartTypePane {
+public class VanChartAreaPlotPane extends AbstractRectanglePlotPane {
 
     @Override
     protected String[] getTypeIconPath() {

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

@@ -5,12 +5,12 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.bar.BarIndependentVanChart;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
-import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
+import com.fr.van.chart.designer.type.AbstractRectanglePlotPane;
 
 /**
  * Created by Mitisky on 15/10/20.
  */
-public class VanChartBarPlotPane extends AbstractVanChartTypePane {
+public class VanChartBarPlotPane extends AbstractRectanglePlotPane {
 
     @Override
     protected String[] getTypeIconPath() {

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

@@ -1,19 +1,28 @@
 package com.fr.van.chart.box;
 
+import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.plugin.chart.base.AttrTooltipContent;
+import com.fr.plugin.chart.base.format.AttrTooltipCategoryFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipSeriesFormat;
 import com.fr.plugin.chart.box.attr.AttrBoxTooltipContent;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.util.Map;
 
 public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
 
@@ -27,6 +36,14 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     private VanChartFormatPaneWithCheckBox min;
     private VanChartFormatPaneWithCheckBox outlier;
 
+    private VanChartFormatPaneWithoutCheckBox richTextNumber;
+    private VanChartFormatPaneWithoutCheckBox richTextMax;
+    private VanChartFormatPaneWithoutCheckBox richTextQ3;
+    private VanChartFormatPaneWithoutCheckBox richTextMedian;
+    private VanChartFormatPaneWithoutCheckBox richTextQ1;
+    private VanChartFormatPaneWithoutCheckBox richTextMin;
+    private VanChartFormatPaneWithoutCheckBox richTextOutlier;
+
     private JPanel dataNumberPane;
     private JPanel dataOutlierPane;
 
@@ -36,8 +53,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     }
 
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane);
-        seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane);
+        setCategoryNameFormatPane(new CategoryNameFormatPaneWithCheckBox(parent, showOnPane));
+        setSeriesNameFormatPane(new SeriesNameFormatPaneWithCheckBox(parent, showOnPane));
 
         number = new VanChartFormatPaneWithCheckBox(parent, showOnPane) {
             protected String getCheckBoxText() {
@@ -76,7 +93,48 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         };
     }
 
-    protected JPanel createCommonPanel() {
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        setRichTextCategoryNameFormatPane(new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
+
+        richTextNumber = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Data_Number");
+            }
+        };
+        richTextMax = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Max_Value");
+            }
+        };
+        richTextQ3 = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Data_Q3");
+            }
+        };
+        richTextMedian = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Data_Median");
+            }
+        };
+        richTextQ1 = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Data_Q1");
+            }
+        };
+        richTextMin = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Min_Value");
+            }
+        };
+        richTextOutlier = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Outlier_Value");
+            }
+        };
+    }
+
+    protected JPanel createCommonFormatPanel() {
         JPanel commonPanel = new JPanel(new BorderLayout());
 
         commonPanel.add(createCateAndSeriesPane(), BorderLayout.NORTH);
@@ -86,6 +144,20 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         return commonPanel;
     }
 
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextCategoryNameFormatPane(), null},
+                new Component[]{getRichTextSeriesNameFormatPane(), null},
+                new Component[]{richTextNumber, null},
+                new Component[]{richTextMax, null},
+                new Component[]{richTextQ3, null},
+                new Component[]{richTextMedian, null},
+                new Component[]{richTextQ1, null},
+                new Component[]{richTextMin, null},
+                new Component[]{richTextOutlier, null}
+        };
+    }
+
     protected double[] getRowSize(double p) {
         return new double[]{p, p, p, p, p, p, p, p, p, p, p, p};
     }
@@ -93,13 +165,15 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     private JPanel createCateAndSeriesPane() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
 
-        double[] columnSize = {f, p};
-        double[] rowSize = {p, p};
+        double[] columnSize = {f, e};
+        double[] rowSize = {p, p, p};
 
         Component[][] cateAndSeries = new Component[][]{
-                new Component[]{categoryNameFormatPane, null},
-                new Component[]{seriesNameFormatPane, null}
+                new Component[]{null, null},
+                new Component[]{null, getCategoryNameFormatPane()},
+                new Component[]{null, getSeriesNameFormatPane()}
         };
 
         return TableLayoutHelper.createTableLayoutPane(cateAndSeries, rowSize, columnSize);
@@ -108,13 +182,14 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     private JPanel createDataNumberPane() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
 
-        double[] columnSize = {f, p};
+        double[] columnSize = {f, e};
         double[] rowSize = {p, p};
 
         Component[][] dataNumber = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{number, null},
+                new Component[]{null, number},
         };
 
         dataNumberPane = TableLayoutHelper.createTableLayoutPane(dataNumber, rowSize, columnSize);
@@ -125,22 +200,24 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     private JPanel createDataDetailPane() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
-        double[] columnSize = {f, p};
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+
+        double[] columnSize = {f, e};
 
         JPanel detailPane = new JPanel(new BorderLayout());
 
         Component[][] dataDetail = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{max, null},
-                new Component[]{q3, null},
-                new Component[]{median, null},
-                new Component[]{q1, null},
-                new Component[]{min, null}
+                new Component[]{null, max},
+                new Component[]{new UILabel(getLabelContentTitle()), q3},
+                new Component[]{null, median},
+                new Component[]{null, q1},
+                new Component[]{null, min}
         };
 
         Component[][] dataOutlier = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{outlier, null},
+                new Component[]{null, outlier},
         };
 
         dataOutlierPane = TableLayoutHelper.createTableLayoutPane(dataOutlier, new double[]{p, p}, columnSize);
@@ -152,8 +229,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     }
 
     public boolean isDirty() {
-        return categoryNameFormatPane.isDirty()
-                || seriesNameFormatPane.isDirty()
+        return getCategoryNameFormatPane().isDirty()
+                || getSeriesNameFormatPane().isDirty()
                 || number.isDirty()
                 || max.isDirty()
                 || q3.isDirty()
@@ -164,8 +241,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     }
 
     public void setDirty(boolean isDirty) {
-        categoryNameFormatPane.setDirty(isDirty);
-        seriesNameFormatPane.setDirty(isDirty);
+        getCategoryNameFormatPane().setDirty(isDirty);
+        getSeriesNameFormatPane().setDirty(isDirty);
         number.setDirty(isDirty);
         max.setDirty(isDirty);
         q3.setDirty(isDirty);
@@ -180,8 +257,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     }
 
     protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
-        categoryNameFormatPane.populate(attrTooltipContent.getCategoryFormat());
-        seriesNameFormatPane.populate(attrTooltipContent.getSeriesFormat());
+        getCategoryNameFormatPane().populate(attrTooltipContent.getCategoryFormat());
+        getSeriesNameFormatPane().populate(attrTooltipContent.getSeriesFormat());
 
         if (attrTooltipContent instanceof AttrBoxTooltipContent) {
             AttrBoxTooltipContent boxTooltipContent = (AttrBoxTooltipContent) attrTooltipContent;
@@ -198,9 +275,43 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         }
     }
 
+    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+        Map<String, String> params = getRichTextAttr().getParams();
+
+        AttrTooltipCategoryFormat categoryFormat = attrTooltipContent.getRichTextCategoryFormat();
+        getRichTextCategoryNameFormatPane().populate(categoryFormat);
+        getRichTextCategoryNameFormatPane().updateFormatParams(params, categoryFormat.getJs());
+
+        AttrTooltipSeriesFormat seriesFormat = attrTooltipContent.getRichTextSeriesFormat();
+        getRichTextSeriesNameFormatPane().populate(seriesFormat);
+        getRichTextSeriesNameFormatPane().updateFormatParams(params, seriesFormat.getJs());
+
+        if (attrTooltipContent instanceof AttrBoxTooltipContent) {
+            AttrBoxTooltipContent boxTooltipContent = (AttrBoxTooltipContent) attrTooltipContent;
+
+            VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
+                    richTextNumber, richTextMax, richTextQ3, richTextMedian,
+                    richTextQ1, richTextMin, richTextOutlier
+            };
+
+            AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
+                    boxTooltipContent.getRichTextNumber(),
+                    boxTooltipContent.getRichTextMax(),
+                    boxTooltipContent.getRichTextQ3(),
+                    boxTooltipContent.getRichTextMedian(),
+                    boxTooltipContent.getRichTextQ1(),
+                    boxTooltipContent.getRichTextMin(),
+                    boxTooltipContent.getRichTextOutlier()
+            };
+
+            populateRichTextFormat(formatPaneGroup, formatGroup);
+            populateRichText(attrTooltipContent.getRichTextAttr());
+        }
+    }
+
     protected void updateFormatPane(AttrTooltipContent attrTooltipContent) {
-        categoryNameFormatPane.update(attrTooltipContent.getCategoryFormat());
-        seriesNameFormatPane.update(attrTooltipContent.getSeriesFormat());
+        getCategoryNameFormatPane().update(attrTooltipContent.getCategoryFormat());
+        getSeriesNameFormatPane().update(attrTooltipContent.getSeriesFormat());
 
         if (attrTooltipContent instanceof AttrBoxTooltipContent) {
             AttrBoxTooltipContent boxTooltipContent = (AttrBoxTooltipContent) attrTooltipContent;
@@ -217,6 +328,23 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         }
     }
 
+    protected void updateRichEditor(AttrTooltipContent attrTooltipContent) {
+        getRichTextCategoryNameFormatPane().update(attrTooltipContent.getRichTextCategoryFormat());
+        getRichTextSeriesNameFormatPane().update(attrTooltipContent.getRichTextSeriesFormat());
+
+        if (attrTooltipContent instanceof AttrBoxTooltipContent) {
+            AttrBoxTooltipContent boxTooltipContent = (AttrBoxTooltipContent) attrTooltipContent;
+
+            richTextNumber.update(boxTooltipContent.getRichTextNumber());
+            richTextMax.update(boxTooltipContent.getRichTextMax());
+            richTextQ3.update(boxTooltipContent.getRichTextQ3());
+            richTextMedian.update(boxTooltipContent.getRichTextMedian());
+            richTextQ1.update(boxTooltipContent.getRichTextQ1());
+            richTextMin.update(boxTooltipContent.getRichTextMin());
+            richTextOutlier.update(boxTooltipContent.getRichTextOutlier());
+        }
+    }
+
     public void checkFormatVisible(boolean detailed) {
         this.detailed = detailed;
 

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

@@ -12,15 +12,22 @@ import com.fr.chartx.data.field.AbstractColumnFieldCollection;
 import com.fr.chartx.data.field.diff.BubbleColumnFieldCollection;
 import com.fr.chartx.data.field.diff.MultiCategoryColumnFieldCollection;
 import com.fr.log.FineLoggerFactory;
+import com.fr.plugin.chart.area.VanChartAreaPlot;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.base.VanChartZoom;
 import com.fr.plugin.chart.bubble.BubbleIndependentVanChart;
 import com.fr.plugin.chart.bubble.VanChartBubblePlot;
+import com.fr.plugin.chart.column.VanChartColumnPlot;
+import com.fr.plugin.chart.line.VanChartLinePlot;
+import com.fr.plugin.chart.scatter.VanChartScatterPlot;
 import com.fr.plugin.chart.scatter.attr.ScatterAttrLabel;
 import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
 
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Created by Mitisky on 16/3/31.
  */
@@ -32,6 +39,20 @@ public class VanChartBubblePlotPane extends AbstractVanChartTypePane {
 
     private static final float ALPHA = 0.7f;
 
+    private static Set<String> forceExtendPlotIds = new HashSet<>();
+
+    private static Set<String> extendPlotIds = new HashSet<>();
+
+    static {
+        extendPlotIds.add(VanChartColumnPlot.VAN_CHART_COLUMN_PLOT_ID);
+        extendPlotIds.add(VanChartColumnPlot.VAN_CHART_BAR_PLOT_ID);
+        extendPlotIds.add(VanChartLinePlot.VAN_CHART_LINE_PLOT);
+        extendPlotIds.add(VanChartAreaPlot.VAN_CHART_AREA_PLOT_ID);
+        extendPlotIds.add(VanChartScatterPlot.VAN_CHART_SCATTER_PLOT_ID);
+
+        forceExtendPlotIds.add(VanChartScatterPlot.VAN_CHART_SCATTER_PLOT_ID);
+    }
+
     @Override
     protected String[] getTypeIconPath() {
         return new String[]{"/com/fr/van/chart/bubble/images/bubble.png",
@@ -122,16 +143,16 @@ public class VanChartBubblePlotPane extends AbstractVanChartTypePane {
      * @param chart
      */
     @Override
-    protected void resetChartAttr4SamePlot(Chart chart) {
+    protected void resetChartAttr4SamePlot(VanChart chart) {
         //图表缩放新设计 恢复用注释。下面2行删除。
         VanChartZoom vanChartZoom = new VanChartZoom();
-        ((VanChart) chart).setVanChartZoom(vanChartZoom);
+        chart.setVanChartZoom(vanChartZoom);
 
         //图表缩放新设计 恢复用注释。下面一行取消注释。
         //((VanChart) chart).setZoomAttribute(new ZoomAttribute());
 
         //重置监控刷新选项
-        resetRefreshMoreLabelAttr((VanChart) chart);
+        resetRefreshMoreLabelAttr(chart);
     }
 
     @Override
@@ -147,4 +168,12 @@ public class VanChartBubblePlotPane extends AbstractVanChartTypePane {
         }
         return false;
     }
+
+    //是否支持属性的继承
+    @Override
+    protected boolean supportExtendAttr(VanChart chart) {
+        VanChartBubblePlot selectedClonedPlot = (VanChartBubblePlot) getSelectedClonedPlot();
+        return selectedClonedPlot.isForceBubble() ? forceExtendPlotIds.contains(chart.getID()) :
+                extendPlotIds.contains(chart.getID());
+    }
 }

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

@@ -0,0 +1,17 @@
+package com.fr.van.chart.column;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.plugin.chart.column.VanChartColumnPlot;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+import com.fr.van.chart.designer.style.label.VanChartPlotLabelDetailPane;
+
+public class VanChartColumnPlotLabelDetailPane extends VanChartPlotLabelDetailPane {
+
+    public VanChartColumnPlotLabelDetailPane(Plot plot, VanChartStylePane parent) {
+        super(plot, parent);
+    }
+
+    protected boolean hasLabelOrientationPane() {
+        return !((VanChartColumnPlot) this.getPlot()).isBar();
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.fr.van.chart.column;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane;
+
+import java.awt.BorderLayout;
+
+public class VanChartColumnPlotLabelPane extends VanChartPlotLabelPane {
+
+    public VanChartColumnPlotLabelPane(Plot plot, VanChartStylePane parent) {
+        super(plot, parent);
+    }
+
+    protected void createLabelPane() {
+        VanChartColumnPlotLabelDetailPane labelDetailPane = new VanChartColumnPlotLabelDetailPane(getPlot(), getParentPane());
+        setLabelDetailPane(labelDetailPane);
+        getLabelPane().add(labelDetailPane, BorderLayout.CENTER);
+    }
+}

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

@@ -5,12 +5,12 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.column.ColumnIndependentVanChart;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
-import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
+import com.fr.van.chart.designer.type.AbstractRectanglePlotPane;
 
 /**
  * Created by Mitisky on 15/9/24.
  */
-public class VanChartColumnPlotPane extends AbstractVanChartTypePane {
+public class VanChartColumnPlotPane extends AbstractRectanglePlotPane {
 
     @Override
     protected String[] getTypeIconPath() {

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

@@ -6,18 +6,19 @@ import com.fr.data.condition.ListCondition;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.LiteConditionPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.utils.gui.GUICoreUtils;
-
 import com.fr.plugin.chart.base.AttrSeriesStackAndAxis;
 import com.fr.van.chart.designer.style.series.VanChartSeriesConditionPane;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.JPanel;
+import javax.swing.ScrollPaneConstants;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -46,10 +47,13 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane<Condi
 
         //配置界面
         JPanel deployPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
-        this.add(deployPane);
 
         deployPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Deploy") + ":", null));
         deployPane.add(createDeployPane());
+        UIScrollPane scrollPane = new UIScrollPane(deployPane);
+        scrollPane.setBorder(BorderFactory.createEmptyBorder());
+        scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
+        this.add(scrollPane);
 
         //条件界面
         JPanel conditionPane = FRGUIPaneFactory.createBorderLayout_L_Pane();

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

@@ -119,7 +119,7 @@ public class VanChartCustomPlotPane extends AbstractVanChartTypePane {
     }
 
     @Override
-    public void updateBean(Chart chart) {
+    public void updateBean(VanChart chart) {
 
         //保存上次选中的值，其会在super中更新
         int lastState = chart.getPlot().getDetailType();
@@ -129,7 +129,7 @@ public class VanChartCustomPlotPane extends AbstractVanChartTypePane {
         //如果上次的状态和这次的装填不在同一个页面，说明同一个图表內切换了，需要情況数据配置
         if (lastState != chart.getPlot().getDetailType()) {
             chart.setFilterDefinition(null);
-            ((VanChart) chart).setChartDataDefinition(null);
+            chart.setChartDataDefinition(null);
         }
 
         Chart[] customChart = CustomIndependentVanChart.CustomVanChartTypes;
@@ -214,12 +214,12 @@ public class VanChartCustomPlotPane extends AbstractVanChartTypePane {
      * @param newPlot
      */
     @Override
-    protected void resetChartAttr(Chart chart, Plot newPlot) {
+    protected void resetChartAttr(VanChart chart, VanChartPlot newPlot) {
         super.resetChartAttr(chart, newPlot);
         //切换图表清空数据配置
         chart.setFilterDefinition(null);
         //设置默认不排序
-        VanChartTools tools = ((VanChart) chart).getVanChartTools();
+        VanChartTools tools = chart.getVanChartTools();
         if (tools != null) {
             tools.setSort(false);
         }
@@ -228,7 +228,7 @@ public class VanChartCustomPlotPane extends AbstractVanChartTypePane {
     /**
      * 更新界面内容
      */
-    public void populateBean(Chart chart) {
+    public void populateBean(VanChart chart) {
         for (ChartImagePane imagePane : typeDemo) {
             imagePane.isPressing = false;
         }

designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java

@@ -7,6 +7,7 @@ import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.design.gui.style.FormatPane;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
+import com.fr.plugin.chart.PiePlot4VanChart;
 import com.fr.plugin.chart.area.VanChartAreaPlot;
 import com.fr.plugin.chart.bubble.VanChartBubblePlot;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
@@ -23,6 +24,7 @@ import com.fr.plugin.chart.structure.VanChartStructurePlot;
 import com.fr.plugin.chart.treemap.VanChartTreeMapPlot;
 import com.fr.plugin.chart.wordcloud.VanChartWordCloudPlot;
 import com.fr.van.chart.bubble.force.VanChartBubbleRefreshTooltipPane;
+import com.fr.van.chart.column.VanChartColumnPlotLabelPane;
 import com.fr.van.chart.designer.component.VanChartLabelContentPane;
 import com.fr.van.chart.designer.component.VanChartRefreshTooltipContentPane;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
@@ -38,7 +40,7 @@ import com.fr.van.chart.designer.style.tooltip.VanChartPlotTooltipPane;
 import com.fr.van.chart.funnel.designer.style.VanChartFunnelLabelContentPane;
 import com.fr.van.chart.funnel.designer.style.VanChartFunnelRefreshTooltipContentPane;
 import com.fr.van.chart.funnel.designer.style.VanChartFunnelTooltipContentPane;
-import com.fr.van.chart.gantt.designer.style.VanChartGanttLabelContentPane;
+import com.fr.van.chart.gantt.designer.style.label.VanChartGanttPlotLabelPane;
 import com.fr.van.chart.gantt.designer.style.tooltip.VanChartGanttPlotTooltipPane;
 import com.fr.van.chart.gantt.designer.style.tooltip.VanChartGanttTooltipContentPane;
 import com.fr.van.chart.gauge.VanChartGaugePlotRefreshTooltipPane;
@@ -53,10 +55,10 @@ import com.fr.van.chart.multilayer.style.VanChartMutiPieRefreshTooltipContentPan
 import com.fr.van.chart.scatter.VanChartScatterPlotTooltipPane;
 import com.fr.van.chart.scatter.VanChartScatterRefreshTooltipContentPane;
 import com.fr.van.chart.scatter.component.label.VanChartScatterPlotLabelPane;
-import com.fr.van.chart.structure.desinger.style.VanChartStructureLabelContentPane;
+import com.fr.van.chart.structure.desinger.style.VanChartStructurePlotLabelPane;
 import com.fr.van.chart.structure.desinger.style.VanChartStructureRefreshTooltipContentPane;
 import com.fr.van.chart.structure.desinger.style.VanChartStructureTooltipContentPane;
-import com.fr.van.chart.wordcloud.designer.style.VanChartWordCloudRefreshTootipContentPane;
+import com.fr.van.chart.wordcloud.designer.style.VanChartWordCloudRefreshTooltipContentPane;
 import com.fr.van.chart.wordcloud.designer.style.VanChartWordCloudTooltipContentPane;
 
 import javax.swing.BorderFactory;
@@ -76,7 +78,7 @@ import java.util.Set;
  */
 public class PlotFactory {
 
-    private static Set<Class<? extends Plot>> autoAdjustLabelPlots = new HashSet<Class<? extends Plot>>();
+    private static Set<Class<? extends Plot>> autoAdjustLabelPlots = new HashSet<>();
 
     static {
         autoAdjustLabelPlots.add(VanChartColumnPlot.class);
@@ -89,15 +91,31 @@ public class PlotFactory {
         return autoAdjustLabelPlots.contains(plot.getClass());
     }
 
+    private static Set<Class<? extends Plot>> borderAndBackgroundLabelPlots = new HashSet<>();
+
+    static {
+        borderAndBackgroundLabelPlots.add(PiePlot4VanChart.class);
+        borderAndBackgroundLabelPlots.add(VanChartColumnPlot.class);
+        borderAndBackgroundLabelPlots.add(VanChartLinePlot.class);
+        borderAndBackgroundLabelPlots.add(VanChartAreaPlot.class);
+    }
+
+    public static boolean hasBorderAndBackgroundPlotLabel(Plot plot) {
+        return borderAndBackgroundLabelPlots.contains(plot.getClass());
+    }
+
     /**
      * 标签Map
      */
-    private static Map<Class<? extends Plot>, Class<? extends VanChartPlotLabelPane>> labelMap = new HashMap<Class<? extends Plot>, Class<? extends VanChartPlotLabelPane>>();
+    private static Map<Class<? extends Plot>, Class<? extends VanChartPlotLabelPane>> labelMap = new HashMap<>();
 
     static {
+        labelMap.put(VanChartColumnPlot.class, VanChartColumnPlotLabelPane.class);
         labelMap.put(VanChartGaugePlot.class, VanChartGaugePlotLabelPane.class);
         labelMap.put(VanChartScatterPlot.class, VanChartScatterPlotLabelPane.class);
         labelMap.put(VanChartBubblePlot.class, VanChartScatterPlotLabelPane.class);
+        labelMap.put(VanChartGanttPlot.class, VanChartGanttPlotLabelPane.class);
+        labelMap.put(VanChartStructurePlot.class, VanChartStructurePlotLabelPane.class);
     }
 
     /**
@@ -139,8 +157,6 @@ public class PlotFactory {
         labelContentMap.put(VanChartTreeMapPlot.class, VanChartMultiPieLabelContentPane.class);
         labelContentMap.put(VanChartFunnelPlot.class, VanChartFunnelLabelContentPane.class);
         labelContentMap.put(VanChartHeatMapPlot.class, VanChartMapLabelContentPane.class);
-        labelContentMap.put(VanChartGanttPlot.class, VanChartGanttLabelContentPane.class);
-        labelContentMap.put(VanChartStructurePlot.class, VanChartStructureLabelContentPane.class);
     }
 
     private static Map<Class<? extends Plot>, Class<? extends VanChartTooltipContentPane>> tooltipContentMap = new HashMap<Class<? extends Plot>, Class<? extends VanChartTooltipContentPane>>();
@@ -182,7 +198,7 @@ public class PlotFactory {
         refreshTooltipContentMap.put(VanChartMultiPiePlot.class, VanChartMutiPieRefreshTooltipContentPane.class);
         refreshTooltipContentMap.put(VanChartTreeMapPlot.class, VanChartMutiPieRefreshTooltipContentPane.class);
         refreshTooltipContentMap.put(VanChartFunnelPlot.class, VanChartFunnelRefreshTooltipContentPane.class);
-        refreshTooltipContentMap.put(VanChartWordCloudPlot.class, VanChartWordCloudRefreshTootipContentPane.class);
+        refreshTooltipContentMap.put(VanChartWordCloudPlot.class, VanChartWordCloudRefreshTooltipContentPane.class);
         refreshTooltipContentMap.put(VanChartStructurePlot.class, VanChartStructureRefreshTooltipContentPane.class);
 
     }

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPaneWithoutRichText.java

@@ -0,0 +1,361 @@
+package com.fr.van.chart.designer.component;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.ilable.UILabel;
+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.plugin.chart.base.AttrTooltipContent;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class VanChartLabelContentPaneWithoutRichText extends BasicBeanPane<AttrTooltipContent> {
+
+    private UIButtonGroup<Integer> content;
+
+    private ValueFormatPaneWithCheckBox valueFormatPane;
+    private PercentFormatPaneWithCheckBox percentFormatPane;
+    private CategoryNameFormatPaneWithCheckBox categoryNameFormatPane;
+    private SeriesNameFormatPaneWithCheckBox seriesNameFormatPane;
+
+    //监控刷新时，自动数据点提示使用
+    private ChangedValueFormatPaneWithCheckBox changedValueFormatPane;
+    private ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane;
+    private UIButtonGroup<Integer> styleButton;
+    private ChartTextAttrPane textAttrPane;
+    private JPanel centerPane;
+    private JPanel commonPanel;
+    private JPanel stylePanel;
+    private VanChartHtmlLabelPane htmlLabelPane;
+
+    private VanChartStylePane parent;
+    private JPanel showOnPane;
+
+    public VanChartLabelContentPaneWithoutRichText(VanChartStylePane parent, JPanel showOnPane) {
+        this.parent = parent;
+        this.showOnPane = showOnPane;
+
+        this.setLayout(new BorderLayout());
+        this.add(createLabelContentPane(), BorderLayout.CENTER);
+    }
+
+    public ValueFormatPaneWithCheckBox getValueFormatPane() {
+        return valueFormatPane;
+    }
+
+    public void setValueFormatPane(ValueFormatPaneWithCheckBox valueFormatPane) {
+        this.valueFormatPane = valueFormatPane;
+    }
+
+    public PercentFormatPaneWithCheckBox getPercentFormatPane() {
+        return percentFormatPane;
+    }
+
+    public void setPercentFormatPane(PercentFormatPaneWithCheckBox percentFormatPane) {
+        this.percentFormatPane = percentFormatPane;
+    }
+
+    public CategoryNameFormatPaneWithCheckBox getCategoryNameFormatPane() {
+        return categoryNameFormatPane;
+    }
+
+    public void setCategoryNameFormatPane(CategoryNameFormatPaneWithCheckBox categoryNameFormatPane) {
+        this.categoryNameFormatPane = categoryNameFormatPane;
+    }
+
+    public SeriesNameFormatPaneWithCheckBox getSeriesNameFormatPane() {
+        return seriesNameFormatPane;
+    }
+
+    public void setSeriesNameFormatPane(SeriesNameFormatPaneWithCheckBox seriesNameFormatPane) {
+        this.seriesNameFormatPane = seriesNameFormatPane;
+    }
+
+    private JPanel createLabelContentPane() {
+        content = new UIButtonGroup<>(new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Common"),
+                Toolkit.i18nText("Fine-Design_Chart_Custom")
+        });
+
+        initFormatPane(parent, showOnPane);
+
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+
+        commonPanel = createCommonPanel();
+        htmlLabelPane = createHtmlLabelPane();
+        htmlLabelPane.setParent(parent);
+        stylePanel = createTextStylePane();
+        centerPane = new JPanel(new CardLayout()) {
+            @Override
+            public Dimension getPreferredSize() {
+                if (content.getSelectedIndex() == 0) {
+                    return commonPanel.getPreferredSize();
+                } else {
+                    return new Dimension(commonPanel.getPreferredSize().width, htmlLabelPane.getPreferredSize().height);
+                }
+            }
+        };
+        centerPane.add(htmlLabelPane, Toolkit.i18nText("Fine-Design_Chart_Custom"));
+        centerPane.add(commonPanel, Toolkit.i18nText("Fine-Design_Chart_Common"));
+
+        double[] column = {f, e};
+        double[] row = {p, p, p};
+        Component[][] components = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{new UILabel(getLabelContentTitle()), content},
+                new Component[]{null, centerPane},
+        };
+        initContentListener();
+        JPanel paramsPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, column);
+
+        JPanel contentPane = new JPanel(new BorderLayout());
+        contentPane.add(paramsPanel, BorderLayout.CENTER);
+        contentPane.add(stylePanel, BorderLayout.SOUTH);
+
+        return getLabelContentPane(contentPane);
+    }
+
+    protected boolean hasTextStylePane() {
+        return true;
+    }
+
+    private JPanel createTextStylePane() {
+        styleButton = new UIButtonGroup<>(new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Automatic"),
+                Toolkit.i18nText("Fine-Design_Chart_Custom")
+        });
+
+        textAttrPane = new ChartTextAttrPane() {
+            protected Component[][] getComponents(JPanel buttonPane) {
+                return new Component[][]{
+                        new Component[]{null, null},
+                        new Component[]{null, getFontNameComboBox()},
+                        new Component[]{null, buttonPane}
+                };
+            }
+        };
+
+        JPanel buttonPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), styleButton);
+
+        JPanel stylePanel = new JPanel(new BorderLayout());
+        stylePanel.add(buttonPane, BorderLayout.CENTER);
+        stylePanel.add(textAttrPane, BorderLayout.SOUTH);
+
+        initStyleButtonListener();
+
+        return stylePanel;
+    }
+
+    private void initStyleButtonListener() {
+        styleButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                checkStylePane();
+            }
+        });
+    }
+
+    private void checkStylePane() {
+        if (hasTextStylePane()) {
+            stylePanel.setVisible(true);
+            textAttrPane.setVisible(styleButton.getSelectedIndex() == 1);
+        } else {
+            stylePanel.setVisible(false);
+        }
+    }
+
+    protected String getLabelContentTitle() {
+        return Toolkit.i18nText("Fine-Design_Report_Text");
+    }
+
+    protected JPanel getLabelContentPane(JPanel contentPane) {
+        return createTableLayoutPaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Content"), contentPane);
+    }
+
+    protected VanChartHtmlLabelPane createHtmlLabelPane() {
+        return new VanChartHtmlLabelPane();
+    }
+
+    protected JPanel createCommonPanel() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+
+        double[] columnSize = {f, p};
+        double[] rowSize = getRowSize(p);
+
+        return TableLayoutHelper.createTableLayoutPane(getPaneComponents(), rowSize, columnSize);
+    }
+
+    protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane);
+        seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane);
+        valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane);
+        percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
+    }
+
+    protected JPanel createTableLayoutPaneWithTitle(String title, JPanel panel) {
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(title, panel);
+    }
+
+    protected double[] getRowSize(double p) {
+        return new double[]{p, p, p, p};
+    }
+
+    protected Component[][] getPaneComponents() {
+        return new Component[][]{
+                new Component[]{categoryNameFormatPane, null},
+                new Component[]{seriesNameFormatPane, null},
+                new Component[]{valueFormatPane, null},
+                new Component[]{percentFormatPane, null},
+        };
+    }
+
+    private void initContentListener() {
+        content.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                checkCardPane();
+            }
+        });
+    }
+
+
+    private void checkCardPane() {
+        CardLayout cardLayout = (CardLayout) centerPane.getLayout();
+        if (content.getSelectedIndex() == 1) {
+            cardLayout.show(centerPane, Toolkit.i18nText("Fine-Design_Chart_Custom"));
+            if (isDirty()) {
+                setCustomFormatterText();
+                setDirty(false);
+            }
+        } else {
+            cardLayout.show(centerPane, Toolkit.i18nText("Fine-Design_Chart_Common"));
+        }
+    }
+
+    protected void setCustomFormatterText() {
+        htmlLabelPane.setCustomFormatterText(updateBean().getFormatterTextFromCommon());
+    }
+
+    public boolean isDirty() {
+        return categoryNameFormatPane.isDirty() || seriesNameFormatPane.isDirty() || valueFormatPane.isDirty() || percentFormatPane.isDirty()
+                || (changedValueFormatPane != null && changedValueFormatPane.isDirty()) || (changedValueFormatPane != null && changedPercentFormatPane.isDirty());
+    }
+
+    public void setDirty(boolean isDirty) {
+        categoryNameFormatPane.setDirty(isDirty);
+        seriesNameFormatPane.setDirty(isDirty);
+        valueFormatPane.setDirty(isDirty);
+        percentFormatPane.setDirty(isDirty);
+
+        if (changedValueFormatPane != null) {
+            changedValueFormatPane.setDirty(isDirty);
+        }
+        if (changedPercentFormatPane != null) {
+            changedPercentFormatPane.setDirty(isDirty);
+        }
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return "";
+    }
+
+
+    @Override
+    public void populateBean(AttrTooltipContent attrTooltipContent) {
+        if (attrTooltipContent == null) {
+            return;
+        }
+
+        content.setSelectedIndex(attrTooltipContent.isCommon() ? 0 : 1);
+
+        populateFormatPane(attrTooltipContent);
+
+        htmlLabelPane.populate(attrTooltipContent.getHtmlLabel());
+        if (!attrTooltipContent.isCommon()) {
+            setDirty(false);
+        }
+        if (hasTextStylePane()) {
+            this.styleButton.setSelectedIndex(attrTooltipContent.isCustom() ? 1 : 0);
+            this.textAttrPane.populate(attrTooltipContent.getTextAttr());
+        }
+        checkCardPane();
+        checkStylePane();
+    }
+
+    protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
+        categoryNameFormatPane.populate(attrTooltipContent.getCategoryFormat());
+        seriesNameFormatPane.populate(attrTooltipContent.getSeriesFormat());
+        valueFormatPane.populate(attrTooltipContent.getValueFormat());
+        percentFormatPane.populate(attrTooltipContent.getPercentFormat());
+
+        if (changedValueFormatPane != null) {
+            changedValueFormatPane.populate(attrTooltipContent.getChangedValueFormat());
+        }
+        if (changedPercentFormatPane != null) {
+            changedPercentFormatPane.populate(attrTooltipContent.getChangedPercentFormat());
+        }
+    }
+
+    public AttrTooltipContent updateBean() {
+        AttrTooltipContent attrTooltipContent = createAttrTooltip();
+
+        attrTooltipContent.setCommon(content.getSelectedIndex() == 0);
+
+        updateFormatPane(attrTooltipContent);
+
+        updateFormatsWithPaneWidth(attrTooltipContent);
+
+        htmlLabelPane.update(attrTooltipContent.getHtmlLabel());
+
+        if (hasTextStylePane()) {
+            attrTooltipContent.setCustom(styleButton.getSelectedIndex() == 1);
+            attrTooltipContent.setTextAttr(this.textAttrPane.update());
+        }
+
+        return attrTooltipContent;
+    }
+
+    protected AttrTooltipContent createAttrTooltip() {
+        return new AttrTooltipContent();
+    }
+
+    protected void updateFormatPane(AttrTooltipContent attrTooltipContent) {
+        categoryNameFormatPane.update(attrTooltipContent.getCategoryFormat());
+        seriesNameFormatPane.update(attrTooltipContent.getSeriesFormat());
+        valueFormatPane.update(attrTooltipContent.getValueFormat());
+        percentFormatPane.update(attrTooltipContent.getPercentFormat());
+
+        if (changedValueFormatPane != null) {
+            changedValueFormatPane.update(attrTooltipContent.getChangedValueFormat());
+        }
+        if (changedPercentFormatPane != null) {
+            changedPercentFormatPane.update(attrTooltipContent.getChangedPercentFormat());
+        }
+    }
+
+    private void updateFormatsWithPaneWidth(AttrTooltipContent attrTooltipContent) {
+        int paneWidth = seriesNameFormatPane.getWidth();
+        if (paneWidth == 0) {
+            attrTooltipContent.getSeriesFormat().setEnable(false);
+        }
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRefreshTooltipContentPane.java

@@ -1,7 +1,9 @@
 package com.fr.van.chart.designer.component;
 
 import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -24,18 +26,37 @@ public class VanChartRefreshTooltipContentPane extends VanChartTooltipContentPan
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
         super.initFormatPane(parent, showOnPane);
 
-        changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane);
-        changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane);
+        setChangedValueFormatPane(new ChangedValueFormatPaneWithCheckBox(parent, showOnPane));
+        setChangedPercentFormatPane(new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane));
+    }
+
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        super.initRichTextFormatPane(parent, showOnPane);
+
+        setRichTextChangedValueFormatPane(new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextChangedPercentFormatPane(new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane));
     }
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{categoryNameFormatPane,null},
-                new Component[]{seriesNameFormatPane,null},
-                new Component[]{valueFormatPane,null},
-                new Component[]{changedValueFormatPane,null},
-                new Component[]{percentFormatPane,null},
-                new Component[]{changedPercentFormatPane,null},
+                new Component[]{getCategoryNameFormatPane(), null},
+                new Component[]{getSeriesNameFormatPane(), null},
+                new Component[]{getValueFormatPane(), null},
+                new Component[]{getChangedValueFormatPane(), null},
+                new Component[]{getPercentFormatPane(), null},
+                new Component[]{getChangedPercentFormatPane(), null},
+        };
+    }
+
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextCategoryNameFormatPane(), null},
+                new Component[]{getRichTextSeriesNameFormatPane(), null},
+                new Component[]{getRichTextValueFormatPane(), null},
+                new Component[]{getRichTextChangedValueFormatPane(), null},
+                new Component[]{getRichTextPercentFormatPane(), null},
+                new Component[]{getRichTextChangedPercentFormatPane(), null}
         };
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java

@@ -0,0 +1,110 @@
+package com.fr.van.chart.designer.component;
+
+import com.fr.design.ui.ModernUIPane;
+import com.fr.plugin.chart.base.AttrTooltipRichText;
+import com.fr.stable.StringUtils;
+import com.teamdev.jxbrowser.chromium.Browser;
+import com.teamdev.jxbrowser.chromium.JSValue;
+import com.teamdev.jxbrowser.chromium.events.ScriptContextAdapter;
+import com.teamdev.jxbrowser.chromium.events.ScriptContextEvent;
+
+import java.util.Map;
+
+public class VanChartRichEditorPane {
+
+    private static final String namespace = "Pool";
+    private static final String variable = "data";
+    private static final String richEditorPath = "/com/fr/design/editor/rich_editor.html";
+    private static final String expression = "dispatch()";
+
+    private static ModernUIPane<RichEditorModel> richEditorPane;
+    private static Browser browser;
+
+    public static ModernUIPane<RichEditorModel> createRichEditorPane(AttrTooltipRichText richEditor) {
+        RichEditorModel model = getRichEditorModel(richEditor);
+
+        if (richEditorPane == null) {
+            richEditorPane = initPane(model);
+        } else if (browser != null) {
+            updatePane(browser, model);
+        }
+
+        return richEditorPane;
+    }
+
+    public static ModernUIPane<RichEditorModel> initPane(RichEditorModel model) {
+        return new ModernUIPane.Builder<RichEditorModel>()
+                .prepare(new ScriptContextAdapter() {
+                    public void onScriptContextCreated(ScriptContextEvent event) {
+                        browser = event.getBrowser();
+
+                        JSValue ns = browser.executeJavaScriptAndReturnValue("window." + namespace);
+                        ns.asObject().setProperty(variable, model);
+                    }
+                })
+                .withEMB(richEditorPath)
+                .namespace(namespace).build();
+    }
+
+    public static void updatePane(Browser browser, RichEditorModel model) {
+        JSValue ns = browser.executeJavaScriptAndReturnValue("window." + namespace);
+        ns.asObject().setProperty(variable, model);
+        browser.executeJavaScript("window." + namespace + "." + expression);
+    }
+
+    public static RichEditorModel getRichEditorModel(AttrTooltipRichText richText) {
+        Map<String, String> paramsMap = richText.getParams();
+        StringBuilder paramsStr = new StringBuilder(StringUtils.EMPTY);
+
+        if (paramsMap != null) {
+            for (Map.Entry<String, String> entry : paramsMap.entrySet()) {
+                paramsStr.append(entry.getKey()).append(":").append(entry.getValue());
+                paramsStr.append("-");
+            }
+        }
+
+        int len = paramsStr.length();
+
+        if (len > 0) {
+            paramsStr.deleteCharAt(len - 1);
+        }
+
+        return new RichEditorModel(richText.getContent(), richText.isAuto(), paramsStr.toString());
+    }
+
+    public static class RichEditorModel {
+        private String content;
+        private boolean auto;
+        private String params;
+
+        public RichEditorModel(String content, boolean auto, String params) {
+            this.content = content;
+            this.auto = auto;
+            this.params = params;
+        }
+
+        public String getContent() {
+            return content;
+        }
+
+        public void setContent(String content) {
+            this.content = content;
+        }
+
+        public boolean isAuto() {
+            return auto;
+        }
+
+        public void setAuto(boolean auto) {
+            this.auto = auto;
+        }
+
+        public String getParams() {
+            return params;
+        }
+
+        public void setParams(String params) {
+            this.params = params;
+        }
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java

@@ -1,120 +1,403 @@
 package com.fr.van.chart.designer.component;
 
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.dialog.BasicDialog;
+import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ilable.UILabel;
+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.ui.ModernUIPane;
 import com.fr.plugin.chart.base.AttrTooltipContent;
+import com.fr.plugin.chart.base.AttrTooltipRichText;
+import com.fr.plugin.chart.base.format.AttrTooltipFormat;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.PercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ValueFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
+import javax.swing.JComponent;
+import javax.swing.JFrame;
 import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 
 /**
- * 内容界面 。数据点提示
+ * 数据点提示内容界面，含有通用设置、富文本编辑器、自定义JS界面
  */
 public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent> {
 
     private static final long serialVersionUID = 8825929000117843641L;
 
-    protected UIButtonGroup<Integer> content;
-    protected ValueFormatPaneWithCheckBox valueFormatPane;
-    protected PercentFormatPaneWithCheckBox percentFormatPane;
-    protected CategoryNameFormatPaneWithCheckBox categoryNameFormatPane;
-    protected SeriesNameFormatPaneWithCheckBox seriesNameFormatPane;
+    private UIButtonGroup<Integer> content;
+
+    private CategoryNameFormatPaneWithCheckBox categoryNameFormatPane;
+    private SeriesNameFormatPaneWithCheckBox seriesNameFormatPane;
+    private ValueFormatPaneWithCheckBox valueFormatPane;
+    private PercentFormatPaneWithCheckBox percentFormatPane;
 
     //监控刷新时，自动数据点提示使用
-    protected ChangedValueFormatPaneWithCheckBox changedValueFormatPane;
-    protected ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane;
+    private ChangedValueFormatPaneWithCheckBox changedValueFormatPane;
+    private ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane;
 
-    private JPanel centerPane;
+    private CategoryNameFormatPaneWithoutCheckBox richTextCategoryNameFormatPane;
+    private SeriesNameFormatPaneWithoutCheckBox richTextSeriesNameFormatPane;
+    private ValueFormatPaneWithoutCheckBox richTextValueFormatPane;
+    private PercentFormatPaneWithoutCheckBox richTextPercentFormatPane;
+    private ChangedValueFormatPaneWithoutCheckBox richTextChangedValueFormatPane;
+    private ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane;
+
+    private JPanel centerPanel;
     private JPanel commonPanel;
+    private JPanel editorPanel;
+    private JPanel htmlPanel;
+    private JPanel stylePanel;
+    private UIButtonGroup<Integer> styleButton;
+    private ChartTextAttrPane textAttrPane;
     private VanChartHtmlLabelPane htmlLabelPane;
 
     private VanChartStylePane parent;
     private JPanel showOnPane;
 
+    private AttrTooltipRichText richText;
+
     public VanChartTooltipContentPane(VanChartStylePane parent, JPanel showOnPane){
         this.parent = parent;
         this.showOnPane = showOnPane;
+        this.richText = new AttrTooltipRichText();
+
+        initFormatPane(parent, showOnPane);
+        initRichTextFormatPane(parent, showOnPane);
 
         this.setLayout(new BorderLayout());
         this.add(createLabelContentPane(),BorderLayout.CENTER);
     }
 
+    public CategoryNameFormatPaneWithCheckBox getCategoryNameFormatPane() {
+        return categoryNameFormatPane;
+    }
+
+    public void setCategoryNameFormatPane(CategoryNameFormatPaneWithCheckBox categoryNameFormatPane) {
+        this.categoryNameFormatPane = categoryNameFormatPane;
+    }
+
+    public SeriesNameFormatPaneWithCheckBox getSeriesNameFormatPane() {
+        return seriesNameFormatPane;
+    }
+
+    public void setSeriesNameFormatPane(SeriesNameFormatPaneWithCheckBox seriesNameFormatPane) {
+        this.seriesNameFormatPane = seriesNameFormatPane;
+    }
+
+    public ValueFormatPaneWithCheckBox getValueFormatPane() {
+        return valueFormatPane;
+    }
+
+    public void setValueFormatPane(ValueFormatPaneWithCheckBox valueFormatPane) {
+        this.valueFormatPane = valueFormatPane;
+    }
+
+    public PercentFormatPaneWithCheckBox getPercentFormatPane() {
+        return percentFormatPane;
+    }
+
+    public void setPercentFormatPane(PercentFormatPaneWithCheckBox percentFormatPane) {
+        this.percentFormatPane = percentFormatPane;
+    }
+
+    public ChangedValueFormatPaneWithCheckBox getChangedValueFormatPane() {
+        return changedValueFormatPane;
+    }
+
+    public void setChangedValueFormatPane(ChangedValueFormatPaneWithCheckBox changedValueFormatPane) {
+        this.changedValueFormatPane = changedValueFormatPane;
+    }
+
+    public ChangedPercentFormatPaneWithCheckBox getChangedPercentFormatPane() {
+        return changedPercentFormatPane;
+    }
+
+    public void setChangedPercentFormatPane(ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane) {
+        this.changedPercentFormatPane = changedPercentFormatPane;
+    }
+
+    public CategoryNameFormatPaneWithoutCheckBox getRichTextCategoryNameFormatPane() {
+        return richTextCategoryNameFormatPane;
+    }
+
+    public void setRichTextCategoryNameFormatPane(CategoryNameFormatPaneWithoutCheckBox richTextCategoryNameFormatPane) {
+        this.richTextCategoryNameFormatPane = richTextCategoryNameFormatPane;
+    }
+
+    public SeriesNameFormatPaneWithoutCheckBox getRichTextSeriesNameFormatPane() {
+        return richTextSeriesNameFormatPane;
+    }
+
+    public void setRichTextSeriesNameFormatPane(SeriesNameFormatPaneWithoutCheckBox richTextSeriesNameFormatPane) {
+        this.richTextSeriesNameFormatPane = richTextSeriesNameFormatPane;
+    }
+
+    public ValueFormatPaneWithoutCheckBox getRichTextValueFormatPane() {
+        return richTextValueFormatPane;
+    }
+
+    public void setRichTextValueFormatPane(ValueFormatPaneWithoutCheckBox richTextValueFormatPane) {
+        this.richTextValueFormatPane = richTextValueFormatPane;
+    }
+
+    public PercentFormatPaneWithoutCheckBox getRichTextPercentFormatPane() {
+        return richTextPercentFormatPane;
+    }
+
+    public void setRichTextPercentFormatPane(PercentFormatPaneWithoutCheckBox richTextPercentFormatPane) {
+        this.richTextPercentFormatPane = richTextPercentFormatPane;
+    }
+
+    public ChangedValueFormatPaneWithoutCheckBox getRichTextChangedValueFormatPane() {
+        return richTextChangedValueFormatPane;
+    }
+
+    public void setRichTextChangedValueFormatPane(ChangedValueFormatPaneWithoutCheckBox richTextChangedValueFormatPane) {
+        this.richTextChangedValueFormatPane = richTextChangedValueFormatPane;
+    }
+
+    public ChangedPercentFormatPaneWithoutCheckBox getRichTextChangedPercentFormatPane() {
+        return richTextChangedPercentFormatPane;
+    }
+
+    public void setRichTextChangedPercentFormatPane(ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane) {
+        this.richTextChangedPercentFormatPane = richTextChangedPercentFormatPane;
+    }
+
+    public AttrTooltipRichText getRichTextAttr() {
+        return richText;
+    }
+
     private JPanel createLabelContentPane() {
-        content = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")});
+        initDetailPane();
+        initCenterPane();
 
-        initFormatPane(parent, showOnPane);
+        JPanel content = new JPanel(new BorderLayout());
 
-        double p = TableLayout.PREFERRED;
-        double f = TableLayout.FILL;
-        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+        content.add(createButtonPane(), BorderLayout.NORTH);
+        content.add(centerPanel, BorderLayout.CENTER);
+        content.add(stylePanel, BorderLayout.SOUTH);
 
-        commonPanel = createCommonPanel();
-        htmlLabelPane = createHtmlLabelPane();
-        htmlLabelPane.setParent(parent);
+        initContentListener();
 
-        centerPane = new JPanel(new CardLayout()){
-            @Override
+        return getLabelContentPane(content);
+    }
+
+    private void initDetailPane() {
+        commonPanel = createCommonFormatPanel();
+        editorPanel = createRichEditorPanel();
+        htmlPanel = createHtmlPane();
+        stylePanel = createCommonStylePane();
+    }
+
+    private void initCenterPane() {
+        centerPanel = new JPanel(new CardLayout()) {
             public Dimension getPreferredSize() {
                 if (content.getSelectedIndex() == 0) {
                     return commonPanel.getPreferredSize();
+                } else if (content.getSelectedIndex() == 1) {
+                    return editorPanel.getPreferredSize();
                 } else {
-                    return new Dimension(commonPanel.getPreferredSize().width,htmlLabelPane.getPreferredSize().height);
+                    return htmlPanel.getPreferredSize();
                 }
             }
         };
-        centerPane.add(htmlLabelPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom"));
-        centerPane.add(commonPanel,com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"));
 
-        double[] column = {f, e};
-        double[] row = {p,p,p};
+        centerPanel.add(commonPanel, Toolkit.i18nText("Fine-Design_Chart_Common"));
+        centerPanel.add(editorPanel, Toolkit.i18nText("Fine-Design_Chart_Rich_Text"));
+        centerPanel.add(htmlPanel, Toolkit.i18nText("Fine-Design_Chart_Custom"));
+    }
+
+    protected String getLabelContentTitle() {
+        return Toolkit.i18nText("Fine-Design_Report_Text");
+    }
+
+    protected JPanel getLabelContentPane(JPanel contentPane) {
+        return createTableLayoutPaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Content"), contentPane);
+    }
+
+    private JPanel createButtonPane() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+
+        double[] column = {f, p};
+        double[] row = {p, p};
+
+        content = new UIButtonGroup<>(new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Common"),
+                Toolkit.i18nText("Fine-Design_Chart_Rich_Text"),
+                Toolkit.i18nText("Fine-Design_Chart_Custom")
+        });
+
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(getLabelContentTitle()),content},
-                new Component[]{null,centerPane},
+                new Component[]{content, null}
         };
-        initContentListener();
-        JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, column);
-        return getLabelContentPane(contentPane);
+
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, column);
     }
 
-    protected String getLabelContentTitle () {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Text");
+    protected JPanel createCommonFormatPanel() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+
+        JPanel formatContent = TableLayoutHelper.createTableLayoutPane(getPaneComponents(), getRowSize(p), new double[]{f, p});
+
+        Component[][] components = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{new UILabel(getLabelContentTitle()), formatContent}
+        };
+
+        return TableLayoutHelper.createTableLayoutPane(components, new double[]{p, p}, new double[]{f, e});
     }
 
-    protected JPanel getLabelContentPane(JPanel contentPane) {
-        return createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content"), contentPane);
+    private JPanel createCommonStylePane() {
+        styleButton = new UIButtonGroup<>(new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Automatic"),
+                Toolkit.i18nText("Fine-Design_Chart_Custom")
+        });
+
+        textAttrPane = new ChartTextAttrPane() {
+            protected Component[][] getComponents(JPanel buttonPane) {
+                return new Component[][]{
+                        new Component[]{null, null},
+                        new Component[]{null, getFontNameComboBox()},
+                        new Component[]{null, buttonPane}
+                };
             }
+        };
 
-    protected VanChartHtmlLabelPane createHtmlLabelPane() {
-        return new VanChartHtmlLabelPaneWithOutWidthAndHeight();
+        JPanel buttonPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), styleButton);
+
+        JPanel stylePanel = new JPanel(new BorderLayout());
+        stylePanel.add(buttonPane, BorderLayout.CENTER);
+        stylePanel.add(textAttrPane, BorderLayout.SOUTH);
+
+        initStyleButtonListener();
+
+        return stylePanel;
+    }
+
+    private void initStyleButtonListener() {
+        styleButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                checkStylePane();
+            }
+        });
+    }
+
+    private void checkStylePane() {
+        textAttrPane.setVisible(styleButton.getSelectedIndex() == 1);
     }
 
-    protected JPanel createCommonPanel() {
+    private JPanel createRichEditorPanel() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+
+        double[] columnSize = {f, e};
+        double[] rowSize = {p, p, p};
+
+        JPanel formatContent = TableLayoutHelper.createTableLayoutPane(getRichTextComponents(), getRowSize(p), new double[]{f, p});
+
+        Component[][] components = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Content_Style")), createRichEditorButton()},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Use_Format")), formatContent}
+        };
+
+        return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+    }
+
+    private JComponent createRichEditorButton() {
+        UIButton contentTextArea = new UIButton(Toolkit.i18nText("Fine-Design_Chart_Rich_Text_Edit"));
+
+        contentTextArea.addMouseListener(new MouseAdapter() {
+            public void mouseClicked(MouseEvent e) {
+                fireRichEditor();
+            }
+        });
+
+        return contentTextArea;
+    }
+
+    private void fireRichEditor() {
+        final ModernUIPane<VanChartRichEditorPane.RichEditorModel> pane = VanChartRichEditorPane.createRichEditorPane(richText);
+        BasicDialog dialog = pane.showWindow(new JFrame());
+
+        pane.populate(VanChartRichEditorPane.getRichEditorModel(richText));
+
+        dialog.addDialogActionListener(new DialogActionAdapter() {
+
+            public void doOk() {
+                VanChartRichEditorPane.RichEditorModel model = pane.update();
 
-        double[] columnSize = {f, p};
-        double[] rowSize = getRowSize(p);
+                String content = model.getContent();
+                updateLocalRichText(content, model.isAuto());
 
-        return TableLayoutHelper.createTableLayoutPane(getPaneComponents(), rowSize, columnSize);
+                SwingUtilities.getWindowAncestor(pane).setVisible(false);
+            }
+
+            public void doCancel() {
+                SwingUtilities.getWindowAncestor(pane).setVisible(false);
+            }
+        });
+
+        dialog.setVisible(true);
+
+        if (parent != null) {
+            parent.attributeChanged();
+        }
+    }
+
+    private JPanel createHtmlPane() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+
+        double[] column = {f, p};
+        double[] row = {p, p};
+
+        htmlLabelPane = createHtmlLabelPane();
+        htmlLabelPane.setParent(parent);
+
+        Component[][] htmlComponents = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{htmlLabelPane, null}
+        };
+
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(htmlComponents, row, column);
+    }
+
+    protected VanChartHtmlLabelPane createHtmlLabelPane() {
+        return new VanChartHtmlLabelPaneWithOutWidthAndHeight();
     }
 
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
@@ -124,6 +407,13 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
     }
 
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        richTextCategoryNameFormatPane = new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane);
+        richTextSeriesNameFormatPane = new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane);
+        richTextValueFormatPane = new ValueFormatPaneWithoutCheckBox(parent, showOnPane);
+        richTextPercentFormatPane = new PercentFormatPaneWithoutCheckBox(parent, showOnPane);
+    }
+
     protected JPanel createTableLayoutPaneWithTitle(String title, JPanel panel) {
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(title, panel);
     }
@@ -141,6 +431,15 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         };
     }
 
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{richTextCategoryNameFormatPane, null},
+                new Component[]{richTextSeriesNameFormatPane, null},
+                new Component[]{richTextValueFormatPane, null},
+                new Component[]{richTextPercentFormatPane, null},
+        };
+    }
+
     private void initContentListener() {
         content.addActionListener(new ActionListener() {
             @Override
@@ -152,16 +451,20 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
 
     private void checkCardPane() {
-        CardLayout cardLayout = (CardLayout) centerPane.getLayout();
-        if (content.getSelectedIndex() == 1) {
-            cardLayout.show(centerPane,com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom"));
+        CardLayout cardLayout = (CardLayout) centerPanel.getLayout();
+        if (content.getSelectedIndex() == 2) {
+            cardLayout.show(centerPanel, Toolkit.i18nText("Fine-Design_Chart_Custom"));
             if(isDirty()){
                 setCustomFormatterText();
                 setDirty(false);
             }
+        } else if (content.getSelectedIndex() == 1) {
+            cardLayout.show(centerPanel, Toolkit.i18nText("Fine-Design_Chart_Rich_Text"));
         } else {
-            cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"));
+            cardLayout.show(centerPanel, Toolkit.i18nText("Fine-Design_Chart_Common"));
         }
+
+        stylePanel.setVisible(content.getSelectedIndex() != 1);
     }
 
     protected void setCustomFormatterText() {
@@ -169,8 +472,13 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     }
 
     public boolean isDirty() {
-        return categoryNameFormatPane.isDirty() || seriesNameFormatPane.isDirty() || valueFormatPane.isDirty() || percentFormatPane.isDirty()
-                || (changedValueFormatPane != null && changedValueFormatPane.isDirty()) || (changedValueFormatPane != null && changedPercentFormatPane.isDirty());
+
+        return categoryNameFormatPane.isDirty()
+                || seriesNameFormatPane.isDirty()
+                || valueFormatPane.isDirty()
+                || percentFormatPane.isDirty()
+                || (changedValueFormatPane != null && changedValueFormatPane.isDirty())
+                || (changedValueFormatPane != null && changedPercentFormatPane.isDirty());
     }
 
     public void setDirty(boolean isDirty) {
@@ -199,28 +507,103 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
             return;
         }
 
-        content.setSelectedIndex(attrTooltipContent.isCommon() ? 0 : 1);
+        if (attrTooltipContent.isCommon()) {
+            content.setSelectedIndex(0);
+        } else if (attrTooltipContent.isRichText()) {
+            content.setSelectedIndex(1);
+        } else {
+            content.setSelectedIndex(2);
+        }
+
+        if (attrTooltipContent.isCustom()) {
+            styleButton.setSelectedIndex(1);
+        } else {
+            styleButton.setSelectedIndex(0);
+        }
+
+        this.textAttrPane.populate(attrTooltipContent.getTextAttr());
 
         populateFormatPane(attrTooltipContent);
+        populateRichEditor(attrTooltipContent);
 
         htmlLabelPane.populate(attrTooltipContent.getHtmlLabel());
         if(!attrTooltipContent.isCommon()){
             setDirty(false);
         }
+
         checkCardPane();
+        checkStylePane();
     }
 
     protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
-        categoryNameFormatPane.populate(attrTooltipContent.getCategoryFormat());
-        seriesNameFormatPane.populate(attrTooltipContent.getSeriesFormat());
-        valueFormatPane.populate(attrTooltipContent.getValueFormat());
-        percentFormatPane.populate(attrTooltipContent.getPercentFormat());
+        VanChartFormatPaneWithCheckBox[] formatPaneGroup = new VanChartFormatPaneWithCheckBox[]{
+                categoryNameFormatPane,
+                seriesNameFormatPane,
+                valueFormatPane,
+                percentFormatPane,
+                changedValueFormatPane,
+                changedPercentFormatPane
+        };
 
-        if (changedValueFormatPane != null) {
-            changedValueFormatPane.populate(attrTooltipContent.getChangedValueFormat());
+        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
+                attrTooltipContent.getCategoryFormat(),
+                attrTooltipContent.getSeriesFormat(),
+                attrTooltipContent.getValueFormat(),
+                attrTooltipContent.getPercentFormat(),
+                attrTooltipContent.getChangedValueFormat(),
+                attrTooltipContent.getChangedPercentFormat()
+        };
+
+        for (int i = 0, len = formatPaneGroup.length; i < len; i++) {
+            VanChartFormatPaneWithCheckBox formatPane = formatPaneGroup[i];
+            AttrTooltipFormat format = formatGroup[i];
+
+            if (formatPane != null && format != null) {
+                formatPane.populate(format);
             }
-        if (changedPercentFormatPane != null) {
-            changedPercentFormatPane.populate(attrTooltipContent.getChangedPercentFormat());
+        }
+    }
+
+    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+        VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
+                richTextCategoryNameFormatPane,
+                richTextSeriesNameFormatPane,
+                richTextValueFormatPane,
+                richTextPercentFormatPane,
+                richTextChangedValueFormatPane,
+                richTextChangedPercentFormatPane
+        };
+
+        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
+                attrTooltipContent.getRichTextCategoryFormat(),
+                attrTooltipContent.getRichTextSeriesFormat(),
+                attrTooltipContent.getRichTextValueFormat(),
+                attrTooltipContent.getRichTextPercentFormat(),
+                attrTooltipContent.getRichTextChangedValueFormat(),
+                attrTooltipContent.getRichTextChangedPercentFormat()
+        };
+
+        populateRichTextFormat(formatPaneGroup, formatGroup);
+        populateRichText(attrTooltipContent.getRichTextAttr());
+    }
+
+    protected void populateRichTextFormat(VanChartFormatPaneWithCheckBox[] formatPaneGroup, AttrTooltipFormat[] formatGroup) {
+        for (int i = 0, len = formatPaneGroup.length; i < len; i++) {
+            VanChartFormatPaneWithCheckBox formatPane = formatPaneGroup[i];
+            AttrTooltipFormat format = formatGroup[i];
+
+            if (formatPane != null && format != null) {
+                formatPane.populate(format);
+
+                // 填充面板时，更新富文本编辑器参数
+                formatPane.updateFormatParams(richText.getParams(), format.getJs());
+            }
+        }
+    }
+
+    protected void populateRichText(AttrTooltipRichText tooltipRichText) {
+        if (tooltipRichText != null) {
+            updateLocalRichText(tooltipRichText.getContent(), tooltipRichText.isAuto());
         }
     }
 
@@ -228,9 +611,13 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         AttrTooltipContent attrTooltipContent = createAttrTooltip();
 
         attrTooltipContent.setCommon(content.getSelectedIndex() == 0);
+        attrTooltipContent.setRichText(content.getSelectedIndex() == 1);
+        attrTooltipContent.setCustom(styleButton.getSelectedIndex() == 1);
+        attrTooltipContent.setTextAttr(this.textAttrPane.update());
 
         updateFormatPane(attrTooltipContent);
-
+        updateRichEditor(attrTooltipContent);
+        updateTooltipRichText(attrTooltipContent);
         updateFormatsWithPaneWidth(attrTooltipContent);
 
         htmlLabelPane.update(attrTooltipContent.getHtmlLabel());
@@ -243,11 +630,18 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     }
 
     protected void updateFormatPane(AttrTooltipContent attrTooltipContent) {
+        if (categoryNameFormatPane != null) {
             categoryNameFormatPane.update(attrTooltipContent.getCategoryFormat());
+        }
+        if (seriesNameFormatPane != null) {
             seriesNameFormatPane.update(attrTooltipContent.getSeriesFormat());
+        }
+        if (valueFormatPane != null) {
             valueFormatPane.update(attrTooltipContent.getValueFormat());
+        }
+        if (percentFormatPane != null) {
             percentFormatPane.update(attrTooltipContent.getPercentFormat());
-
+        }
         if (changedValueFormatPane != null) {
             changedValueFormatPane.update(attrTooltipContent.getChangedValueFormat());
         }
@@ -256,6 +650,40 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         }
     }
 
+    protected void updateRichEditor(AttrTooltipContent attrTooltipContent) {
+        if (richTextCategoryNameFormatPane != null) {
+            richTextCategoryNameFormatPane.update(attrTooltipContent.getRichTextCategoryFormat());
+        }
+        if (richTextSeriesNameFormatPane != null) {
+            richTextSeriesNameFormatPane.update(attrTooltipContent.getRichTextSeriesFormat());
+        }
+        if (richTextValueFormatPane != null) {
+            richTextValueFormatPane.update(attrTooltipContent.getRichTextValueFormat());
+        }
+        if (richTextPercentFormatPane != null) {
+            richTextPercentFormatPane.update(attrTooltipContent.getRichTextPercentFormat());
+        }
+        if (richTextChangedValueFormatPane != null) {
+            richTextChangedValueFormatPane.update(attrTooltipContent.getRichTextChangedValueFormat());
+        }
+        if (richTextChangedPercentFormatPane != null) {
+            richTextChangedPercentFormatPane.update(attrTooltipContent.getRichTextChangedPercentFormat());
+        }
+    }
+
+    private void updateLocalRichText(String content, boolean isAuto) {
+        richText.setContent(content);
+        richText.setAuto(isAuto);
+    }
+
+    private void updateTooltipRichText(AttrTooltipContent attrTooltipContent) {
+        if (attrTooltipContent != null) {
+            AttrTooltipRichText tooltipRichText = attrTooltipContent.getRichTextAttr();
+            tooltipRichText.setContent(richText.getContent());
+            tooltipRichText.setAuto(richText.isAuto());
+        }
+    }
+
     /**
      * CHART-1295
      * 通过格式的面板宽度来判断在自定义js代码中是否显示this.seriesName字符串。

designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderPane.java

@@ -6,6 +6,7 @@ import com.fr.chart.chartglyph.GeneralInfo;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.icombobox.LineComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.style.color.ColorSelectBox;
 import com.fr.design.utils.gui.UIComponentUtils;
@@ -30,20 +31,18 @@ public class VanChartBorderPane extends BasicPane {
     protected void initComponents() {
         currentLineCombo = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART);
         currentLineColorPane = new ColorSelectBox(100);
-        double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
         double[] columnSize = {f, e};
-        double[] rowSize = {p, p, p, p};
         Component[][] components = getUseComponent();
-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
+        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, getRowSize(), columnSize);
         this.setLayout(new BorderLayout());
         this.add(panel,BorderLayout.CENTER);
     }
 
     protected Component[][] getUseComponent() {
-        UILabel lineStyleLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style"));
-        UILabel colorLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color"));
+        UILabel lineStyleLabel = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Line_Style"));
+        UILabel colorLabel = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Color"));
 
         return new Component[][]{
                 new Component[]{null,null},
@@ -52,6 +51,11 @@ public class VanChartBorderPane extends BasicPane {
         };
     }
 
+    protected double[] getRowSize() {
+        double p = TableLayout.PREFERRED;
+        return new double[]{p, p, p, p};
+    }
+
     /**
      * 标题
      * @return 标题

designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithRadiusPane.java

@@ -4,10 +4,10 @@ import com.fr.chart.base.AttrBorder;
 import com.fr.chart.chartglyph.GeneralInfo;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.design.widget.FRWidgetFactory;
 
-
 import javax.swing.JSeparator;
 import java.awt.BorderLayout;
 import java.awt.Component;
@@ -19,6 +19,10 @@ public class VanChartBorderWithRadiusPane extends VanChartBorderPane {
     private static final long serialVersionUID = -3937853702118283803L;
     private UISpinner radius;
 
+    public UISpinner getRadius() {
+        return radius;
+    }
+
     @Override
     protected void initComponents() {
         radius = new UISpinner(0,1000,1,0);
@@ -31,11 +35,11 @@ public class VanChartBorderWithRadiusPane extends VanChartBorderPane {
         return new Component[][]{
                 new Component[]{null,null},
                 new Component[]{
-                        FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),
+                        FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Line_Style")),
                         UIComponentUtils.wrapWithBorderLayoutPane(currentLineCombo)
                 },
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")),currentLineColorPane},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")),radius}
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color")),currentLineColorPane},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Radius")),radius}
         } ;
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithShapePane.java

@@ -0,0 +1,58 @@
+package com.fr.van.chart.designer.component.border;
+
+import com.fr.chart.base.AttrBorder;
+import com.fr.chart.chartglyph.Marker;
+import com.fr.chart.chartglyph.MarkerFactory;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.xcombox.MarkerComboBox;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.utils.gui.UIComponentUtils;
+import com.fr.design.widget.FRWidgetFactory;
+import com.fr.plugin.chart.base.AttrBorderWithShape;
+import com.fr.plugin.chart.marker.type.MarkerType;
+
+import java.awt.Component;
+
+public class VanChartBorderWithShapePane extends VanChartBorderWithRadiusPane {
+
+    private MarkerComboBox shapePane;
+
+    protected void initComponents() {
+        shapePane = new MarkerComboBox(MarkerFactory.getLabelShapeMarkers());
+        super.initComponents();
+    }
+
+    protected Component[][] getUseComponent() {
+        return new Component[][]{
+                new Component[]{null, null},
+                new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Line_Style")),
+                        UIComponentUtils.wrapWithBorderLayoutPane(currentLineCombo)},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color")), currentLineColorPane},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Shape")),
+                        UIComponentUtils.wrapWithBorderLayoutPane(shapePane)},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Radius")), getRadius()}
+        };
+    }
+
+    protected double[] getRowSize() {
+        double p = TableLayout.PREFERRED;
+        return new double[]{p, p, p, p, p};
+    }
+
+    public void populate(AttrBorder border) {
+        super.populate(border);
+
+        if (border instanceof AttrBorderWithShape) {
+            shapePane.setSelectedMarker((Marker.createMarker(((AttrBorderWithShape) border).getShape())));
+        }
+    }
+
+    public void update(AttrBorder border) {
+        super.update(border);
+
+        if (border instanceof AttrBorderWithShape) {
+            ((AttrBorderWithShape) border).setShape(MarkerType.parse(shapePane.getSelectedMarkder().getMarkerType()));
+        }
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/designer/component/format/CategoryNameFormatPaneWithoutCheckBox.java

@@ -0,0 +1,17 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class CategoryNameFormatPaneWithoutCheckBox extends VanChartFormatPaneWithoutCheckBox {
+
+    public CategoryNameFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name");
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ChangedPercentFormatPaneWithoutCheckBox.java

@@ -0,0 +1,21 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class ChangedPercentFormatPaneWithoutCheckBox extends VanChartFormatPaneWithoutCheckBox {
+
+    public ChangedPercentFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Change_Percent");
+    }
+
+    protected boolean isPercent() {
+        return true;
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ChangedValueFormatPaneWithoutCheckBox.java

@@ -0,0 +1,17 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class ChangedValueFormatPaneWithoutCheckBox extends VanChartFormatPaneWithoutCheckBox {
+
+    public ChangedValueFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Change_Value");
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/designer/component/format/MapAreaNameFormatPaneWithoutCheckBox.java

@@ -0,0 +1,17 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class MapAreaNameFormatPaneWithoutCheckBox extends CategoryNameFormatPaneWithoutCheckBox {
+
+    public MapAreaNameFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Area_Name");
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/designer/component/format/PercentFormatPaneWithoutCheckBox.java

@@ -0,0 +1,21 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class PercentFormatPaneWithoutCheckBox extends VanChartFormatPaneWithoutCheckBox {
+
+    public PercentFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
+    }
+
+    protected boolean isPercent() {
+        return true;
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/designer/component/format/SeriesNameFormatPaneWithoutCheckBox.java

@@ -0,0 +1,17 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class SeriesNameFormatPaneWithoutCheckBox extends VanChartFormatPaneWithoutCheckBox {
+
+    public SeriesNameFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Series_Name");
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ValueFormatPaneWithoutCheckBox.java

@@ -0,0 +1,17 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class ValueFormatPaneWithoutCheckBox extends VanChartFormatPaneWithoutCheckBox {
+
+    public ValueFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Use_Value");
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java

@@ -5,8 +5,9 @@ import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
 import com.fr.design.gui.frpane.UIBubbleFloatPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.style.FormatPane;
-
+import com.fr.design.i18n.Toolkit;
 import com.fr.plugin.chart.base.format.AttrTooltipFormat;
 import com.fr.stable.Constants;
 
@@ -17,6 +18,7 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.text.Format;
+import java.util.Map;
 
 /**
  * Created by Mitisky on 16/2/23.
@@ -41,8 +43,14 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{
 
         this.setLayout(new BorderLayout());
         isSelectedBox = new UICheckBox(getCheckBoxText());
-        formatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format"));
+        formatButton = new UIButton(Toolkit.i18nText("Fine-Design_Chart_Use_Format"));
+
+        if (showSelectBox()) {
             this.add(isSelectedBox, BorderLayout.CENTER);
+        } else {
+            this.add(new UILabel(getCheckBoxText()), BorderLayout.CENTER);
+        }
+
         this.add(formatButton, BorderLayout.EAST);
 
         initFormatListener();
@@ -76,6 +84,10 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{
 
     protected abstract String getCheckBoxText();
 
+    protected boolean showSelectBox() {
+        return true;
+    }
+
     protected boolean isPercent() {
         return false;
     }
@@ -135,4 +147,12 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{
         tooltipFormat.setFormat(format);
         tooltipFormat.setEnable(isSelectedBox.isSelected());
     }
+
+    public void updateFormatParams(Map<String, String> paramMap, String value) {
+        String key = this.getCheckBoxText();
+
+        if (paramMap != null && !paramMap.containsKey(key)) {
+            paramMap.put(key, value);
+        }
+    }
 }

designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithoutCheckBox.java

@@ -0,0 +1,16 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public abstract class VanChartFormatPaneWithoutCheckBox extends VanChartFormatPaneWithCheckBox {
+
+    public VanChartFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected boolean showSelectBox() {
+        return false;
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/designer/component/format/XFormatPaneWithoutCheckBox.java

@@ -0,0 +1,16 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class XFormatPaneWithoutCheckBox extends VanChartFormatPaneWithoutCheckBox {
+
+    public XFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return "x";
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/designer/component/format/YFormatPaneWithoutCheckBox.java

@@ -0,0 +1,16 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class YFormatPaneWithoutCheckBox extends VanChartFormatPaneWithoutCheckBox {
+
+    public YFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return "y";
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/designer/component/label/GaugeLabelContentPane.java

@@ -1,7 +1,8 @@
 package com.fr.van.chart.designer.component.label;
 
 
-import com.fr.van.chart.designer.component.VanChartLabelContentPane;
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.component.VanChartLabelContentPaneWithoutRichText;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -9,18 +10,21 @@ import javax.swing.JPanel;
 /**
  * Created by mengao on 2017/8/13.
  */
-public class GaugeLabelContentPane extends VanChartLabelContentPane {
+public class GaugeLabelContentPane extends VanChartLabelContentPaneWithoutRichText {
 
     public GaugeLabelContentPane(VanChartStylePane parent, JPanel showOnPane) {
         super(parent, showOnPane);
     }
 
     protected String getLabelContentTitle() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content");
+        return Toolkit.i18nText("Fine-Design_Chart_Content");
     }
 
     protected JPanel getLabelContentPane(JPanel contentPane) {
         return contentPane;
     }
 
+    protected boolean hasTextStylePane() {
+        return false;
+    }
 }

designer-chart/src/main/java/com/fr/van/chart/designer/component/label/LabelContentPaneWithCate.java

@@ -27,7 +27,7 @@ public class LabelContentPaneWithCate extends GaugeLabelContentPane {
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{categoryNameFormatPane,null},
+                new Component[]{getCategoryNameFormatPane(),null},
         };
     }
 }

designer-chart/src/main/java/com/fr/van/chart/designer/component/label/LabelContentPaneWithCateValue.java

@@ -27,8 +27,8 @@ public class LabelContentPaneWithCateValue extends GaugeLabelContentPane {
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{categoryNameFormatPane,null},
-                new Component[]{valueFormatPane,null},
+                new Component[]{getCategoryNameFormatPane(),null},
+                new Component[]{getValueFormatPane(),null},
         };
     }
 }

designer-chart/src/main/java/com/fr/van/chart/designer/component/label/LabelContentPaneWithOutCate.java

@@ -27,9 +27,9 @@ public class LabelContentPaneWithOutCate extends GaugeLabelContentPane {
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{seriesNameFormatPane, null},
-                new Component[]{valueFormatPane, null},
-                new Component[]{percentFormatPane, null},
+                new Component[]{getSeriesNameFormatPane(), null},
+                new Component[]{getValueFormatPane(), null},
+                new Component[]{getPercentFormatPane(), null},
         };
     }
 }

designer-chart/src/main/java/com/fr/van/chart/designer/component/label/LabelContentPaneWithPercent.java

@@ -26,7 +26,7 @@ public class LabelContentPaneWithPercent extends GaugeLabelContentPane {
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{percentFormatPane, null},
+                new Component[]{getPercentFormatPane(), null},
         };
     }
 }

designer-chart/src/main/java/com/fr/van/chart/designer/component/tooltip/RefreshTooltipContentPaneWithOutSeries.java

@@ -1,7 +1,9 @@
 package com.fr.van.chart.designer.component.tooltip;
 
 import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -19,8 +21,16 @@ public class RefreshTooltipContentPaneWithOutSeries extends TooltipContentPaneWi
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
         super.initFormatPane(parent, showOnPane);
 
-        changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane);
-        changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane);
+        setChangedValueFormatPane(new ChangedValueFormatPaneWithCheckBox(parent, showOnPane));
+        setChangedPercentFormatPane(new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane));
+    }
+
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        super.initRichTextFormatPane(parent, showOnPane);
+
+        setRichTextChangedValueFormatPane(new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextChangedPercentFormatPane(new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane));
     }
 
     protected double[] getRowSize(double p){
@@ -29,11 +39,21 @@ public class RefreshTooltipContentPaneWithOutSeries extends TooltipContentPaneWi
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{categoryNameFormatPane,null},
-                new Component[]{valueFormatPane,null},
-                new Component[]{changedValueFormatPane,null},
-                new Component[]{percentFormatPane,null},
-                new Component[]{changedPercentFormatPane,null},
+                new Component[]{getCategoryNameFormatPane(),null},
+                new Component[]{getValueFormatPane(),null},
+                new Component[]{getChangedValueFormatPane(),null},
+                new Component[]{getPercentFormatPane(),null},
+                new Component[]{getChangedPercentFormatPane(),null},
+        };
+    }
+
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextCategoryNameFormatPane(), null},
+                new Component[]{getRichTextValueFormatPane(), null},
+                new Component[]{getRichTextChangedValueFormatPane(), null},
+                new Component[]{getRichTextPercentFormatPane(), null},
+                new Component[]{getRichTextChangedPercentFormatPane(), null}
         };
     }
 }

designer-chart/src/main/java/com/fr/van/chart/designer/component/tooltip/TooltipContentPaneWithOutSeries.java

@@ -23,9 +23,17 @@ public class TooltipContentPaneWithOutSeries extends VanChartTooltipContentPane
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{categoryNameFormatPane,null},
-                new Component[]{valueFormatPane,null},
-                new Component[]{percentFormatPane,null},
+                new Component[]{getCategoryNameFormatPane(),null},
+                new Component[]{getValueFormatPane(),null},
+                new Component[]{getPercentFormatPane(),null},
+        };
+    }
+
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextCategoryNameFormatPane(), null},
+                new Component[]{getRichTextValueFormatPane(), null},
+                new Component[]{getRichTextPercentFormatPane(), null}
         };
     }
 }

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

@@ -29,6 +29,7 @@ import com.fr.plugin.chart.base.VanChartAttrMarker;
 import com.fr.plugin.chart.base.VanChartConstants;
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.base.VanChartZoom;
+import com.fr.plugin.chart.gantt.attr.AttrGanttLabel;
 import com.fr.plugin.chart.map.line.condition.AttrLineEffect;
 import com.fr.plugin.chart.scatter.attr.ScatterAttrLabel;
 import com.fr.plugin.chart.vanchart.VanChart;
@@ -436,6 +437,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
             conditionAttr.remove(AttrEffect.class);
             conditionAttr.remove(AttrLineEffect.class);
             conditionAttr.remove(AttrFloatColor.class);
+            conditionAttr.remove(AttrGanttLabel.class);
 
             VanChartAttrMarker attrMarker = conditionAttr.getExisted(VanChartAttrMarker.class);
             if (attrMarker != null && !attrMarker.isCommon()) {

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartAxisButtonPane.java

@@ -8,7 +8,6 @@ import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
-
 import com.fr.plugin.chart.VanChartAttrHelper;
 import com.fr.plugin.chart.attr.axis.VanChartAxis;
 import com.fr.plugin.chart.attr.plot.VanChartAxisPlot;
@@ -18,6 +17,8 @@ import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.Icon;
 import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -29,8 +30,6 @@ 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.List;
 
 /**
  * 坐标轴-上方按钮界面
@@ -41,9 +40,12 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
     private static final int B_W = 56;
     private static final int B_H = 21;
     private static final int COL_COUNT = 3;
+    private static final int MAX_COUNT = 20;
 
     private UIButton addButton;
     private UIPopupMenu popupMenu;
+    private UIMenuItem itemX;
+    private UIMenuItem itemY;
 
     private List<ChartAxisButton> indexList_X = new ArrayList<ChartAxisButton>();
     private List<ChartAxisButton> indexList_Y = new ArrayList<ChartAxisButton>();
@@ -66,6 +68,20 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
         buttonPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 10, 0));
         this.add(buttonPane, BorderLayout.CENTER);
 
+        itemX = new UIMenuItem(VanChartAttrHelper.X_AXIS_PREFIX);
+        itemX.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                addXAxis();
+            }
+        });
+        itemY = new UIMenuItem(VanChartAttrHelper.Y_AXIS_PREFIX);
+        itemY.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                addYAxis();
+            }
+        });
         addButton.addActionListener(addListener);
     }
 
@@ -165,24 +181,12 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
     ActionListener addListener = new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent e) {
-            if(popupMenu == null){
             popupMenu = new UIPopupMenu();
-                UIMenuItem item_x = new UIMenuItem(VanChartAttrHelper.X_AXIS_PREFIX);
-                item_x.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        addXAxis();
-                    }
-                });
-                UIMenuItem item_y = new UIMenuItem(VanChartAttrHelper.Y_AXIS_PREFIX);
-                item_y.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        addYAxis();
+            if (indexList_X.size() < MAX_COUNT) {
+                popupMenu.add(itemX);
             }
-                });
-                popupMenu.add(item_x);
-                popupMenu.add(item_y);
+            if (indexList_Y.size() < MAX_COUNT) {
+                popupMenu.add(itemY);
             }
             popupMenu.setVisible(true);
             GUICoreUtils.showPopupMenu(popupMenu, addButton, addButton.getWidth() - popupMenu.getPreferredSize().width, addButton.getY() - 1 + addButton.getHeight());
@@ -219,6 +223,7 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
         public AddButton(Icon icon) {
             super(icon);
         }
+
         /**
          * 组件是否需要响应添加的观察者事件
          *

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeCateOrPercentLabelDetailPane.java

@@ -22,7 +22,7 @@ public class VanChartGaugeCateOrPercentLabelDetailPane extends VanChartGaugeLabe
     }
 
     protected double[] getLabelPaneRowSize(Plot plot, double p) {
-        if (hasLabelAlign(plot)) {
+        if (hasLabelAlignPane()) {
             return new double[]{p, p, p, p};
         }
 
@@ -37,10 +37,10 @@ public class VanChartGaugeCateOrPercentLabelDetailPane extends VanChartGaugeLabe
         switch (getGaugeStyle()) {
             case POINTER:
             case POINTER_SEMI:
-                dataLabelContentPane = new LabelContentPaneWithCate(parent, VanChartGaugeCateOrPercentLabelDetailPane.this);
+                setDataLabelContentPane(new LabelContentPaneWithCate(getParentPane(), VanChartGaugeCateOrPercentLabelDetailPane.this));
                 break;
             default:
-                dataLabelContentPane = new LabelContentPaneWithPercent(parent, VanChartGaugeCateOrPercentLabelDetailPane.this);
+                setDataLabelContentPane(new LabelContentPaneWithPercent(getParentPane(), VanChartGaugeCateOrPercentLabelDetailPane.this));
                 break;
         }
     }

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java

@@ -24,6 +24,8 @@ import javax.swing.SwingConstants;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 /**
  * Created by mengao on 2017/8/13.
@@ -35,6 +37,8 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
     private UIButtonGroup<Integer> align;
     private JPanel alignPane;
     private Integer[] oldAlignValues;
+    private UIButtonGroup<Integer> style;
+    private ChartTextAttrPane textFontPane;
 
     public VanChartGaugeLabelDetailPane(Plot plot, VanChartStylePane parent) {
         super(plot, parent);
@@ -63,6 +67,15 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
         return TableLayoutHelper.createTableLayoutPane(getLabelStyleComponents(plot), row, col);
     }
 
+    protected void initStyleListener() {
+        style.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                checkStyleUse();
+            }
+        });
+    }
+
     protected boolean isFontSizeAuto() {
         return false;
     }
@@ -101,8 +114,9 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
         };
     }
 
-    protected JPanel getLabelPositionPane(Component[][] comps, double[] row, double[] col) {
-        return TableLayoutHelper.createTableLayoutPane(comps, row, col);
+    // 仪表盘标签内无布局tab
+    protected JPanel getLabelLayoutPane(JPanel panel, String title) {
+        return panel;
     }
 
     protected JPanel createTableLayoutPaneWithTitle(String title, JPanel panel) {
@@ -110,17 +124,20 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
     }
 
     protected Component[][] getLabelPaneComponents(Plot plot, double p, double[] columnSize) {
-        if (hasLabelAlign(plot)) {
+        if (hasLabelAlignPane()) {
 
             return new Component[][]{
-                    new Component[]{dataLabelContentPane, null},
+                    new Component[]{getDataLabelContentPane(), null},
                     new Component[]{createLabelPositionPane(Toolkit.i18nText("Fine-Design_Chart_Layout_Vertical"), plot), null},
                     new Component[]{createLabelAlignPane(Toolkit.i18nText("Fine-Design_Chart_Layout_Horizontal")), null},
                     new Component[]{createLabelStylePane(getLabelStyleRowSize(p), columnSize, plot), null},
             };
         } else {
 
-            return super.getLabelPaneComponents(plot, p, columnSize);
+            return new Component[][]{
+                    new Component[]{getDataLabelContentPane(), null},
+                    new Component[]{createLabelStylePane(getLabelStyleRowSize(p), columnSize, plot), null},
+            };
         }
     }
 
@@ -170,8 +187,8 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
         alignPane.setLayout(new BorderLayout());
         alignPane.add(getLabelPositionPane(comps, row, col), BorderLayout.CENTER);
 
-        if (parent != null) {
-            parent.initListener(alignPane);
+        if (getParentPane() != null) {
+            getParentPane().initListener(alignPane);
         }
     }
 
@@ -206,19 +223,29 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
         return getGaugeStyle() == GaugeStyle.THERMOMETER && !((VanChartGaugePlot) plot).getGaugeDetailStyle().isHorizontalLayout();
     }
 
+    protected boolean hasLabelAlignPane() {
+        return getGaugeStyle() == GaugeStyle.THERMOMETER;
+    }
+
     public void populate(AttrLabelDetail detail) {
         super.populate(detail);
 
         style.setSelectedIndex(1);
+        textFontPane.populate(detail.getTextAttr());
         if (hasLabelAlign(this.getPlot()) && align != null) {
             align.setSelectedItem(detail.getAlign());
         }
+
+        checkStyleUse();
     }
 
     public void update(AttrLabelDetail detail) {
         super.update(detail);
 
         detail.setCustom(true);
+        if (textFontPane != null) {
+            detail.setTextAttr(textFontPane.update());
+        }
         if (align != null) {
             if (align.getSelectedItem() != null) {
                 detail.setAlign(align.getSelectedItem());

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugePlotLabelPane.java

@@ -1,13 +1,15 @@
 package com.fr.van.chart.designer.style.label;
 
 import com.fr.chart.chartattr.Plot;
-
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.i18n.Toolkit;
+import com.fr.plugin.chart.attr.GaugeDetailStyle;
 import com.fr.plugin.chart.base.AttrLabel;
+import com.fr.plugin.chart.base.AttrLabelDetail;
 import com.fr.plugin.chart.gauge.VanChartGaugePlot;
 import com.fr.plugin.chart.type.GaugeStyle;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.style.VanChartStylePane;
-import com.fr.design.i18n.Toolkit;
 
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
@@ -18,6 +20,9 @@ import java.awt.BorderLayout;
 public class VanChartGaugePlotLabelPane extends VanChartPlotLabelPane {
     private static final long serialVersionUID = -322148616244458359L;
 
+    private UIButtonGroup<Integer> orientation;
+    private JPanel layoutPane;
+
     private VanChartPlotLabelDetailPane gaugeValueLabelPane;
 
     public VanChartGaugePlotLabelPane(Plot plot, VanChartStylePane parent) {
@@ -25,10 +30,10 @@ public class VanChartGaugePlotLabelPane extends VanChartPlotLabelPane {
     }
 
     protected void createLabelPane() {
-        labelPane = new JPanel(new BorderLayout(0, 4));
-        labelDetailPane = new VanChartGaugeCateOrPercentLabelDetailPane(this.plot, this.parent);
-        gaugeValueLabelPane = new VanChartGaugeValueLabelDetailPane(this.plot, this.parent);
-        GaugeStyle gaugeStyle = ((VanChartGaugePlot)this.plot).getGaugeStyle();
+        setLabelPane(new JPanel(new BorderLayout(0, 4)));
+        setLabelDetailPane(new VanChartGaugeCateOrPercentLabelDetailPane(getPlot(), getParentPane()));
+        gaugeValueLabelPane = new VanChartGaugeValueLabelDetailPane(getPlot(), getParentPane());
+        GaugeStyle gaugeStyle = ((VanChartGaugePlot)getPlot()).getGaugeStyle();
         String cateTitle, valueTitle = Toolkit.i18nText("Fine-Design_Chart_Value_Label");
         switch (gaugeStyle){
             case POINTER:
@@ -39,25 +44,67 @@ public class VanChartGaugePlotLabelPane extends VanChartPlotLabelPane {
                 cateTitle = Toolkit.i18nText("Fine-Design_Chart_Percent_Label");
                 break;
         }
-        JPanel cateOrPercentPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(cateTitle, labelDetailPane);
+        JPanel cateOrPercentPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(cateTitle, getLabelDetailPane());
         JPanel valuePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(valueTitle, gaugeValueLabelPane);
-        labelPane.add(cateOrPercentPane, BorderLayout.NORTH);
-        labelPane.add(valuePane, BorderLayout.SOUTH);
+
+        layoutPane = createGaugeLabelLayoutPane();
+
+        getLabelPane().add(cateOrPercentPane, BorderLayout.NORTH);
+        getLabelPane().add(valuePane, BorderLayout.CENTER);
+        getLabelPane().add(layoutPane, BorderLayout.SOUTH);
+
+        checkLayoutPaneVisible();
+    }
+
+    private void checkLayoutPaneVisible() {
+        layoutPane.setVisible(showLayoutPane());
+    }
+
+    private boolean showLayoutPane() {
+        VanChartGaugePlot plot = (VanChartGaugePlot) this.getPlot();
+        GaugeDetailStyle gaugeDetailStyle = plot.getGaugeDetailStyle();
+
+        return plot.getGaugeStyle() == GaugeStyle.THERMOMETER && gaugeDetailStyle != null && gaugeDetailStyle.isHorizontalLayout();
+    }
+
+    // 试管仪表盘横行布局时，正常标签外增加布局tab，同时控制百分比和值标签的文本方向
+    private JPanel createGaugeLabelLayoutPane() {
+        orientation = new UIButtonGroup<>(new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal"),
+                Toolkit.i18nText("Fine-Design_Chart_Direction_Vertical"),
+        });
+
+        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Text_Orientation"), orientation);
+
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Form_Attr_Layout"), panel);
     }
 
     public void populate(AttrLabel attr) {
         super.populate(attr);
 
         if(gaugeValueLabelPane != null && attr != null){
-            gaugeValueLabelPane.populate(attr.getGaugeValueLabelDetail());
+            AttrLabelDetail labelDetail = attr.getGaugeValueLabelDetail();
+            gaugeValueLabelPane.populate(labelDetail);
+            orientation.setSelectedIndex(labelDetail.isHorizontal() ? 0 : 1);
+
+            checkLayoutPaneVisible();
         }
     }
 
     public AttrLabel update() {
         AttrLabel attrLabel = super.update();
+
         if(gaugeValueLabelPane != null && attrLabel != null){
-            gaugeValueLabelPane.update(attrLabel.getGaugeValueLabelDetail());
+            AttrLabelDetail defaultLabelDetail = attrLabel.getAttrLabelDetail();
+            AttrLabelDetail valueLabelDetail = attrLabel.getGaugeValueLabelDetail();
+
+            gaugeValueLabelPane.update(valueLabelDetail);
+
+            boolean horizontal = orientation.getSelectedIndex() == 0;
+            defaultLabelDetail.setHorizontal(horizontal);
+            valueLabelDetail.setHorizontal(horizontal);
         }
+
         return attrLabel;
     }
 }

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeValueLabelDetailPane.java

@@ -24,10 +24,10 @@ public class VanChartGaugeValueLabelDetailPane extends VanChartGaugeLabelDetailP
         switch (getGaugeStyle()) {
             case POINTER:
             case POINTER_SEMI:
-                dataLabelContentPane = new LabelContentPaneWithOutCate(parent, VanChartGaugeValueLabelDetailPane.this);
+                setDataLabelContentPane(new LabelContentPaneWithOutCate(getParentPane(), VanChartGaugeValueLabelDetailPane.this));
                 break;
             default:
-                dataLabelContentPane = new LabelContentPaneWithCateValue(parent, VanChartGaugeValueLabelDetailPane.this);
+                setDataLabelContentPane(new LabelContentPaneWithCateValue(getParentPane(), VanChartGaugeValueLabelDetailPane.this));
                 break;
         }
     }
@@ -44,7 +44,7 @@ public class VanChartGaugeValueLabelDetailPane extends VanChartGaugeLabelDetailP
 
     private Component[][] getLabelPaneComponentsWithBackground(Plot plot, double p, double[] columnSize) {
         return new Component[][]{
-                new Component[]{dataLabelContentPane, null},
+                new Component[]{getDataLabelContentPane(), null},
                 new Component[]{createLabelStylePane(new double[]{p}, columnSize, plot), null},
                 new Component[]{createBackgroundColorPane(), null},
         };

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java

@@ -7,12 +7,11 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.ilable.UILabel;
+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.style.color.ColorSelectBox;
-import com.fr.design.i18n.Toolkit;
-
 import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.attr.plot.VanChartLabelPositionPlot;
 import com.fr.plugin.chart.base.AttrLabelDetail;
@@ -20,6 +19,8 @@ import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.stable.Constants;
 import com.fr.van.chart.designer.PlotFactory;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+import com.fr.van.chart.designer.component.background.VanChartBackgroundWithOutImagePane;
+import com.fr.van.chart.designer.component.border.VanChartBorderWithShapePane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -28,9 +29,6 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 /**
  * Created by Mitisky on 15/12/7.
@@ -38,22 +36,22 @@ import java.awt.event.ActionListener;
 public class VanChartPlotLabelDetailPane extends BasicPane {
     private static final long serialVersionUID = -22438250307946275L;
 
-    protected BasicBeanPane<AttrTooltipContent> dataLabelContentPane;
+    private BasicBeanPane<AttrTooltipContent> dataLabelContentPane;
 
-    protected UIButtonGroup<Integer> position;
-    protected UIButtonGroup<Boolean> autoAdjust;
-    protected UIToggleButton tractionLine;
+    private UIButtonGroup<Integer> position;
+    private UIButtonGroup<Boolean> autoAdjust;
+    private UIButtonGroup<Integer> orientation;
+    private UIToggleButton tractionLine;
 
-    protected UIButtonGroup<Integer> style;
-    protected ChartTextAttrPane textFontPane;
-
-    protected ColorSelectBox backgroundColor;
+    private ColorSelectBox backgroundColor;
+    private VanChartBorderWithShapePane borderPane;
+    private VanChartBackgroundWithOutImagePane backgroundPane;
 
     private JPanel tractionLinePane;
     private JPanel positionPane;
     private Integer[] oldPositionValues;
 
-    protected VanChartStylePane parent;
+    private VanChartStylePane parent;
     private Plot plot;
 
     public VanChartPlotLabelDetailPane(Plot plot, VanChartStylePane parent) {
@@ -62,6 +60,18 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         initLabelDetailPane(plot);
     }
 
+    public BasicBeanPane<AttrTooltipContent> getDataLabelContentPane() {
+        return dataLabelContentPane;
+    }
+
+    public void setDataLabelContentPane(BasicBeanPane<AttrTooltipContent> dataLabelContentPane) {
+        this.dataLabelContentPane = dataLabelContentPane;
+    }
+
+    public VanChartStylePane getParentPane() {
+        return parent;
+    }
+
     protected void initLabelDetailPane (Plot plot) {
         this.setLayout(new BorderLayout());
         initToolTipContentPane(plot);
@@ -91,17 +101,48 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
 
     protected Component[][] getLabelPaneComponents(Plot plot, double p, double[] columnSize) {
         if(hasLabelPosition(plot)){
+
+            // 仅饼图、柱形图、条形图、折线图、面积图含有边框和背景
+            if (hasBorderAndBackground(plot)) {
                 return new Component[][]{
                         new Component[]{dataLabelContentPane,null},
                         new Component[]{createLabelPositionPane(Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), plot), null},
-                    new Component[]{createLabelStylePane(getLabelStyleRowSize(p), columnSize, plot),null},
+                        new Component[]{createLabelBorderPane(), null},
+                        new Component[]{createLabelBackgroundPane(), null}
                 };
-        } else {
+            }
+
             return new Component[][]{
                     new Component[]{dataLabelContentPane,null},
-                    new Component[]{createLabelStylePane(getLabelStyleRowSize(p), columnSize, plot),null},
+                    new Component[]{createLabelPositionPane(Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), plot), null}
             };
         }
+
+        return  new Component[][]{
+                new Component[]{dataLabelContentPane,null}
+        };
+    }
+
+    private JPanel createLabelBorderPane() {
+        borderPane  = new VanChartBorderWithShapePane();
+
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Border"), borderPane);
+    }
+
+    private JPanel createLabelBackgroundPane() {
+        backgroundPane = new VanChartBackgroundWithOutImagePane(){
+
+            protected Component[][] getPaneComponents() {
+                return new Component[][]{
+                        new Component[]{null, null},
+                        new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Fill")), typeComboBox},
+                        new Component[]{null, centerPane},
+                        new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent},
+                };
+            }
+        };
+
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane);
     }
 
     protected double[] getLabelStyleRowSize(double p) {
@@ -116,6 +157,10 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         return plot instanceof VanChartLabelPositionPlot;
     }
 
+    private boolean hasBorderAndBackground(Plot plot) {
+        return PlotFactory.hasBorderAndBackgroundPlotLabel(plot);
+    }
+
     protected JPanel createTableLayoutPaneWithTitle(String title, JPanel panel) {
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(title, panel);
     }
@@ -150,8 +195,11 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
 
         positionPane = new JPanel();
         checkPositionPane(title);
-        panel.add(positionPane, BorderLayout.CENTER);
+        panel.add(positionPane, BorderLayout.NORTH);
 
+        if (hasLabelOrientationPane()) {
+            panel.add(createLabelOrientationPane(), BorderLayout.CENTER);
+        }
 
         if (plot.isSupportLeadLine()) {
             tractionLine = new UIToggleButton(Toolkit.i18nText("Fine-Design_Chart_Show_Guideline"));
@@ -161,7 +209,25 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         } else if (PlotFactory.plotAutoAdjustLabelPosition(plot)) {
             panel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Auto_Adjust"), autoAdjust), BorderLayout.SOUTH);
         }
-        return panel;
+
+        return getLabelLayoutPane(panel, Toolkit.i18nText("Fine-Design_Form_Attr_Layout"));
+    }
+
+    protected JPanel getLabelLayoutPane(JPanel panel, String title) {
+        return createTableLayoutPaneWithTitle(title, panel);
+    }
+
+    protected boolean hasLabelOrientationPane() {
+        return false;
+    }
+
+    private JPanel createLabelOrientationPane() {
+        orientation = new UIButtonGroup<>(new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal"),
+                Toolkit.i18nText("Fine-Design_Chart_Direction_Vertical"),
+        });
+
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Text_Orientation"), orientation);
     }
 
     protected void checkPositionPane(String title) {
@@ -198,13 +264,10 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         }
     }
 
-
     protected JPanel getLabelPositionPane (Component[][] comps, double[] row, double[] col){
-        JPanel panel = TableLayoutHelper.createTableLayoutPane(comps,row,col);
-        return createTableLayoutPaneWithTitle(Toolkit.i18nText("Fine-Design_Form_Attr_Layout"), panel);
+        return TableLayoutHelper.createTableLayoutPane(comps, row, col);
     }
 
-
     protected void initPositionListener() {
         position.addChangeListener(new ChangeListener() {
             @Override
@@ -214,17 +277,6 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         });
     }
 
-    protected JPanel createLabelStylePane(double[] row, double[] col, Plot plot) {
-        style = new UIButtonGroup<Integer>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Automatic"),
-                Toolkit.i18nText("Fine-Design_Chart_Custom")});
-        textFontPane =initTextFontPane();
-
-        initStyleListener();
-
-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(getLabelStyleComponents(plot),row,col);
-        return createTableLayoutPaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel);
-    }
-
     protected ChartTextAttrPane initTextFontPane () {
         return new ChartTextAttrPane(){
             protected Component[][] getComponents(JPanel buttonPane) {
@@ -237,24 +289,6 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         };
     }
 
-    protected Component[][] getLabelStyleComponents(Plot plot) {
-        UILabel text = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT);
-        return new Component[][]{
-                new Component[]{null,null},
-                new Component[]{text,style},
-                new Component[]{textFontPane,null},
-        };
-    }
-
-    protected void initStyleListener() {
-        style.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                checkStyleUse();
-            }
-        });
-    }
-
     protected JPanel createBackgroundColorPane() {
         backgroundColor = new ColorSelectBox(100);
         return createTableLayoutPaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundColor);
@@ -265,18 +299,12 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
     }
 
     private void checkAllUse() {
-        checkStyleUse();
         if(tractionLine == null){
             return;
         }
         checkPositionEnabled();
     }
 
-    protected void checkStyleUse() {
-        textFontPane.setVisible(style.getSelectedIndex() == 1);
-        textFontPane.setPreferredSize(style.getSelectedIndex() == 1 ? new Dimension(0, 60) : new Dimension(0, 0));
-    }
-
     private void checkPosition() {
         tractionLine.setSelected(position.getSelectedItem() == Constants.OUTSIDE);
         checkPositionEnabled();
@@ -295,18 +323,25 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         if(position != null){
             position.setSelectedItem(detail.getPosition());
         }
+        if(orientation != null){
+            orientation.setSelectedIndex(detail.isHorizontal() ? 0 : 1);
+        }
         if(tractionLine != null){
             tractionLine.setSelected(detail.isShowGuidLine());
         }
         if(autoAdjust != null){
-            autoAdjust.setSelectedIndex(detail.isAutoAdjust() == true ? 0 : 1);
+            autoAdjust.setSelectedIndex(detail.isAutoAdjust() ? 0 : 1);
         }
-        style.setSelectedIndex(detail.isCustom() ? 1 : 0);
-        textFontPane.populate(detail.getTextAttr());
 
         if(backgroundColor != null){
             backgroundColor.setSelectObject(detail.getBackgroundColor());
         }
+        if(borderPane != null){
+            borderPane.populate(detail.getBorder());
+        }
+        if(backgroundPane != null){
+            backgroundPane.populate(detail.getBackground());
+        }
 
         checkAllUse();
     }
@@ -324,16 +359,21 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
 
         detail.setAutoAdjust(autoAdjust != null && autoAdjust.getSelectedItem());
 
+        if(orientation != null){
+            detail.setHorizontal(orientation.getSelectedIndex() == 0);
+        }
         if(tractionLine != null){
             detail.setShowGuidLine(tractionLine.isSelected() && detail.getPosition() == Constants.OUTSIDE);
         }
-        detail.setCustom(style.getSelectedIndex() == 1);
-        if(textFontPane != null){
-            detail.setTextAttr(textFontPane.update());
-        }
         if(backgroundColor != null){
             detail.setBackgroundColor(backgroundColor.getSelectObject());
         }
+        if(borderPane != null){
+            borderPane.update(detail.getBorder());
+        }
+        if(backgroundPane != null){
+            backgroundPane.update(detail.getBackground());
+        }
     }
 
 }

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelNoCheckPane.java

@@ -19,12 +19,12 @@ public class VanChartPlotLabelNoCheckPane extends VanChartPlotLabelPane {
 
     protected void addComponents() {
         this.setLayout(new BorderLayout());
-        this.add(labelPane,BorderLayout.CENTER);
+        this.add(getLabelPane(),BorderLayout.CENTER);
     }
 
     public void populate(AttrLabel attr) {
         super.populate(attr);
-        isLabelShow.setSelected(true);
-        labelPane.setVisible(true);
+        getLabelShowCheckBox().setSelected(true);
+        getLabelPane().setVisible(true);
     }
 }

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelPane.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.designer.style.label;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 
@@ -19,24 +20,52 @@ import java.awt.event.ActionListener;
 
 public class VanChartPlotLabelPane extends BasicPane {
     private static final long serialVersionUID = -1701936672446232396L;
-    protected UICheckBox isLabelShow;
+    private UICheckBox isLabelShow;
 
-    protected VanChartPlotLabelDetailPane labelDetailPane;
+    private VanChartPlotLabelDetailPane labelDetailPane;
 
-    protected VanChartStylePane parent;
-    protected Plot plot;
+    private VanChartStylePane parent;
+    private Plot plot;
 
-    protected JPanel labelPane;
+    private JPanel labelPane;
 
     public VanChartPlotLabelPane(Plot plot, VanChartStylePane parent) {
         this.parent = parent;
         this.plot = plot;
-        isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Label"));
+        isLabelShow = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Use_Label"));
         labelPane = new JPanel(new BorderLayout(0, 4));
         createLabelPane();
         addComponents();
     }
 
+    public UICheckBox getLabelShowCheckBox() {
+        return isLabelShow;
+    }
+
+    public VanChartPlotLabelDetailPane getLabelDetailPane() {
+        return labelDetailPane;
+    }
+
+    public void setLabelDetailPane(VanChartPlotLabelDetailPane labelDetailPane) {
+        this.labelDetailPane = labelDetailPane;
+    }
+
+    public VanChartStylePane getParentPane() {
+        return parent;
+    }
+
+    public Plot getPlot() {
+        return plot;
+    }
+
+    public JPanel getLabelPane() {
+        return labelPane;
+    }
+
+    public void setLabelPane(JPanel labelPane) {
+        this.labelPane = labelPane;
+    }
+
     protected void createLabelPane() {
         labelDetailPane = new VanChartPlotLabelDetailPane(this.plot, this.parent);
         labelPane.add(labelDetailPane, BorderLayout.CENTER);

designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java

@@ -72,7 +72,6 @@ public class VanChartPlotRefreshTooltipPane extends VanChartPlotTooltipNoCheckPa
         Component[][] components = new Component[][]{
                 new Component[]{refreshTooltipContentPane,null},
                 new Component[]{initDurationPane(),null},
-                new Component[]{createLabelStylePane(),null},
                 new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border"),borderPane),null},
                 new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane),null},
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java

@@ -7,8 +7,6 @@ import com.fr.design.gui.icheckbox.UICheckBox;
 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.utils.gui.UIComponentUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.plugin.chart.base.AttrTooltip;
@@ -28,13 +26,11 @@ import java.awt.event.ActionListener;
 public class VanChartPlotTooltipPane extends BasicPane {
     private static final long serialVersionUID = 6087381131907589370L;
 
+    // todo 使用private
     protected UICheckBox isTooltipShow;
 
     protected VanChartTooltipContentPane tooltipContentPane;
 
-    protected UIButtonGroup<Integer> style;
-    protected ChartTextAttrPane textFontPane;
-
     protected VanChartBorderWithRadiusPane borderPane;
 
     protected VanChartBackgroundWithOutImagePane backgroundPane;
@@ -95,7 +91,6 @@ public class VanChartPlotTooltipPane extends BasicPane {
     protected Component[][] createComponents(Plot plot) {
         Component[][] components = new Component[][]{
                 new Component[]{tooltipContentPane,null},
-                new Component[]{createLabelStylePane(),null},
                 new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Border"),borderPane),null},
                 new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane),null},
                 new Component[]{createDisplayStrategy(plot),null},
@@ -108,38 +103,6 @@ public class VanChartPlotTooltipPane extends BasicPane {
         tooltipContentPane = PlotFactory.createPlotTooltipContentPane(plot, parent, VanChartPlotTooltipPane.this);
     }
 
-    protected JPanel createLabelStylePane() {
-        style = new UIButtonGroup<Integer>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Automatic"),Toolkit.i18nText("Fine-Design_Chart_Custom")});
-        textFontPane = new ChartTextAttrPane() {
-            protected Component[][] getComponents(JPanel buttonPane) {
-                return new Component[][]{
-                        new Component[]{null, null},
-                        new Component[]{null, getFontNameComboBox()},
-                        new Component[]{null, buttonPane}
-                };
-            }
-        };
-
-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Character"), style);
-        JPanel panel1 = new JPanel(new BorderLayout());
-        panel1.add(panel, BorderLayout.CENTER);
-        panel1.add(textFontPane, BorderLayout.SOUTH);
-
-        initStyleListener();
-
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel1);
-    }
-
-
-    private void initStyleListener() {
-        style.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                checkStyleUse();
-            }
-        });
-    }
-
     protected JPanel createDisplayStrategy(Plot plot) {
         showAllSeries = new UICheckBox(getShowAllSeriesLabelText());
         followMouse = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Follow_Mouse"),
@@ -175,7 +138,6 @@ public class VanChartPlotTooltipPane extends BasicPane {
 
     private void checkAllUse() {
         checkBoxUse();
-        checkStyleUse();
     }
     /**
      * 检查box使用.
@@ -184,10 +146,6 @@ public class VanChartPlotTooltipPane extends BasicPane {
         tooltipPane.setVisible(isTooltipShow.isSelected());
     }
 
-    private void checkStyleUse() {
-        textFontPane.setVisible(style.getSelectedIndex() == 1);
-    }
-
     protected AttrTooltip getAttrTooltip() {
         return new AttrTooltip();
     }
@@ -202,8 +160,6 @@ public class VanChartPlotTooltipPane extends BasicPane {
             tooltipContentPane.populateBean(attr.getContent());
         }
 
-        style.setSelectedIndex(attr.isCustom() ? 1 : 0);
-        textFontPane.populate(attr.getTextAttr());
         borderPane.populate(attr.getGeneralInfo());
         backgroundPane.populate(attr.getGeneralInfo());
         if(showAllSeries != null) {
@@ -224,10 +180,6 @@ public class VanChartPlotTooltipPane extends BasicPane {
             attrTooltip.setContent(tooltipContentPane.updateBean());
         }
 
-        attrTooltip.setCustom(style.getSelectedIndex() == 1);
-        if(textFontPane != null){
-            attrTooltip.setTextAttr(textFontPane.update());
-        }
         borderPane.update(attrTooltip.getGeneralInfo());
         backgroundPane.update(attrTooltip.getGeneralInfo());
         if(showAllSeries != null) {

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

@@ -0,0 +1,90 @@
+package com.fr.van.chart.designer.type;
+
+import com.fr.chart.chartglyph.ConditionCollection;
+import com.fr.log.FineLoggerFactory;
+import com.fr.plugin.chart.PiePlot4VanChart;
+import com.fr.plugin.chart.area.VanChartAreaPlot;
+import com.fr.plugin.chart.attr.axis.VanChartAxis;
+import com.fr.plugin.chart.attr.plot.VanChartPlot;
+import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot;
+import com.fr.plugin.chart.bubble.VanChartBubblePlot;
+import com.fr.plugin.chart.column.VanChartColumnPlot;
+import com.fr.plugin.chart.line.VanChartLinePlot;
+import com.fr.plugin.chart.scatter.VanChartScatterPlot;
+import com.fr.plugin.chart.type.VanChartPlotType;
+import com.fr.plugin.chart.vanchart.VanChart;
+import com.fr.stable.StringUtils;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-08-24
+ */
+public abstract class AbstractRectanglePlotPane extends AbstractVanChartTypePane {
+
+    private static Set<String> extendPlotIds = new HashSet<>();
+
+    static {
+        extendPlotIds.add(VanChartColumnPlot.VAN_CHART_COLUMN_PLOT_ID);
+        extendPlotIds.add(VanChartColumnPlot.VAN_CHART_BAR_PLOT_ID);
+        extendPlotIds.add(VanChartLinePlot.VAN_CHART_LINE_PLOT);
+        extendPlotIds.add(VanChartAreaPlot.VAN_CHART_AREA_PLOT_ID);
+        extendPlotIds.add(VanChartScatterPlot.VAN_CHART_SCATTER_PLOT_ID);
+        extendPlotIds.add(PiePlot4VanChart.VAN_CHART_PIE_PLOT);
+    }
+
+    @Override
+    protected VanChartPlot cloneOldPlot2New(VanChartPlot oldPlot, VanChartPlot newPlot) {
+        try {
+            VanChartRectanglePlot vanChartRectanglePlot = (VanChartRectanglePlot) newPlot;
+            VanChartRectanglePlot clonePlot = (VanChartRectanglePlot) oldPlot.clone();
+            clonePlot.setVanChartPlotType(vanChartRectanglePlot.getVanChartPlotType());
+            //自定义类型的图形要增加一个y2轴，并且增加系列中的堆积条件，反之则要去掉y2轴和条件
+            if (clonePlot.isCustomChart()) {
+                List<VanChartAxis> valueAxisList = clonePlot.getValueAxisList();
+                valueAxisList.add(vanChartRectanglePlot.getValueAxisList().get(1));
+                clonePlot.setStackAndAxisCondition(vanChartRectanglePlot.getStackAndAxisCondition());
+            } else {
+                List<VanChartAxis> xAxisList = clonePlot.getXAxisList();
+                List<VanChartAxis> yAxisList = clonePlot.getYAxisList();
+                List<VanChartAxis> newXAxisList = new ArrayList<>();
+                List<VanChartAxis> newYAxisList = new ArrayList<>();
+                newXAxisList.add(xAxisList.get(0));
+                newYAxisList.add(yAxisList.get(0));
+                clonePlot.setXAxisList(newXAxisList);
+                clonePlot.setYAxisList(newYAxisList);
+                clonePlot.setStackAndAxisCondition(new ConditionCollection());
+            }
+
+            //百分比堆积图值轴的格式不保留
+            if (clonePlot.getVanChartPlotType() == VanChartPlotType.STACK_BY_PERCENT ||
+                    ((VanChartRectanglePlot) oldPlot).getVanChartPlotType() == VanChartPlotType.STACK_BY_PERCENT) {
+                VanChartAxis cloneAxis = clonePlot.getValueAxisList().get(0);
+                VanChartAxis vanChartAxis = vanChartRectanglePlot.getValueAxisList().get(0);
+                cloneAxis.setFormat(vanChartAxis.getFormat());
+                cloneAxis.setPercentage(vanChartAxis.isPercentage());
+                cloneAxis.setCommonValueFormat(vanChartAxis.isCommonValueFormat());
+                cloneAxis.setHtmlLabel(vanChartAxis.getHtmlLabel());
+            }
+            return clonePlot;
+        } catch (CloneNotSupportedException ex) {
+            FineLoggerFactory.getLogger().error("Error in change plot");
+            return newPlot;
+        }
+    }
+
+    //是否支持属性的继承
+    @Override
+    protected boolean supportExtendAttr(VanChart chart) {
+        if (StringUtils.equals(VanChartBubblePlot.VAN_CHART_BUBBLE_PLOT_ID, chart.getID())) {
+            VanChartBubblePlot vanChartBubblePlot = chart.getPlot();
+            return !vanChartBubblePlot.isForceBubble();
+        }
+        return extendPlotIds.contains(chart.getID());
+    }
+}

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

@@ -1,10 +1,13 @@
 package com.fr.van.chart.designer.type;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.chart.base.AttrFillStyle;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Legend;
 import com.fr.chart.chartattr.Plot;
+import com.fr.chart.chartdata.NormalReportDataDefinition;
+import com.fr.chart.chartdata.NormalTableDataDefinition;
 import com.fr.chart.chartglyph.ConditionAttr;
 import com.fr.chart.chartglyph.ConditionCollection;
 import com.fr.chart.chartglyph.DataSheet;
@@ -37,7 +40,7 @@ import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.ActionListener;
 
-public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Chart> {
+public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<VanChart> {
     private static final long serialVersionUID = 7743244512351499265L;
     private UICheckBox largeModelCheckBox;
 
@@ -119,7 +122,7 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Cha
     /**
      * 更新界面内容
      */
-    public void populateBean(Chart chart) {
+    public void populateBean(VanChart chart) {
         for (ChartImagePane imagePane : typeDemo) {
             imagePane.isPressing = false;
         }
@@ -131,15 +134,14 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Cha
     /**
      * 保存界面属性
      */
-    public void updateBean(Chart chart) {
+    public void updateBean(VanChart chart) {
         VanChartPlot oldPlot = chart.getPlot();
         VanChartPlot newPlot = getSelectedClonedPlot();
         checkTypeChange(oldPlot);
         samePlot = accept(chart);
         if (typeChanged && samePlot) {
             //同一中图表切换不同类型
-            cloneOldPlot2New(oldPlot, newPlot);
-            chart.setPlot(newPlot);
+            chart.setPlot(cloneOldPlot2New(oldPlot, newPlot));
             resetChartAttr4SamePlot(chart);
             ChartInfoCollector.getInstance().updateChartMiniType(chart);
         } else if (!samePlot) {
@@ -150,9 +152,8 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Cha
             //切换类型埋点
             ChartInfoCollector.getInstance().updateChartTypeTime(chart, oldPlot.getPlotID());
         }
-        if (chart instanceof VanChart
-                && !acceptDefinition(((VanChart) chart).getChartDataDefinition(), newPlot)) {
-            ((VanChart) chart).setChartDataDefinition(null);
+        if (!acceptDefinition(chart.getChartDataDefinition(), newPlot)) {
+            chart.setChartDataDefinition(null);
         }
     }
 
@@ -164,31 +165,41 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Cha
         return false;
     }
 
-    protected void resetChartAttr4SamePlot(Chart chart) {
-        resetRefreshMoreLabelAttr((VanChart) chart);
+    protected void resetChartAttr4SamePlot(VanChart chart) {
+        resetRefreshMoreLabelAttr(chart);
     }
 
-    protected void resetChartAttr(Chart chart, Plot newPlot) {
+    protected void resetChartAttr(VanChart chart, VanChartPlot newPlot) {
+        resetFilterDefinition(chart);
+        //上个图表支持继承部分属性到新图表
+        if (supportExtendAttr(chart)) {
+            newPlot.extendAttribute(chart);
+            chart.setPlot(newPlot);
+            return;
+        }
         chart.setPlot(newPlot);
         if (newPlot.isSupportZoomDirection() && !newPlot.isSupportZoomCategoryAxis()) {
             //图表缩放新设计 恢复用注释。下面一行删除。
-            ((VanChart) chart).setVanChartZoom(new VanChartZoom());
+            chart.setVanChartZoom(new VanChartZoom());
             //图表缩放新设计 恢复用注释。下面一行取消注释。
             // ((VanChart) chart).setZoomAttribute(new ZoomAttribute());
         }
         //重置工具栏选项
-        ((VanChart) chart).setVanChartTools(createVanChartTools());
+        chart.setVanChartTools(createVanChartTools());
         //重置标题选项
         resetTitleAttr(chart);
         //重置监控刷新选项
-        resetRefreshMoreLabelAttr((VanChart) chart);
-        resetFilterDefinition(chart);
+        resetRefreshMoreLabelAttr(chart);
+    }
 
+    //是否支持属性的继承
+    protected boolean supportExtendAttr(VanChart chart) {
+        return false;
     }
 
     //默认有标题
     protected void resetTitleAttr(Chart chart) {
-        VanChartPlot vanChartPlot = (VanChartPlot) chart.getPlot();
+        VanChartPlot vanChartPlot = chart.getPlot();
         chart.setTitle(vanChartPlot.getDefaultTitle());
     }
 
@@ -219,7 +230,7 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Cha
     /**
      * 同一个图表， 类型之间切换
      */
-    protected void cloneOldPlot2New(Plot oldPlot, Plot newPlot) {
+    protected VanChartPlot cloneOldPlot2New(VanChartPlot oldPlot, VanChartPlot newPlot) {
         try {
             if (oldPlot.getLegend() != null) {
                 newPlot.setLegend((Legend) oldPlot.getLegend().clone());
@@ -247,11 +258,12 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Cha
             newPlot.setAlpha(oldPlot.getAlpha());
             newPlot.setShadow(oldPlot.isShadow());
 
-            ((VanChartPlot) newPlot).setCategoryNum(((VanChartPlot) oldPlot).getCategoryNum());
+            newPlot.setCategoryNum(oldPlot.getCategoryNum());
 
         } catch (CloneNotSupportedException e) {
             FineLoggerFactory.getLogger().error("Error in change plot");
         }
+        return newPlot;
     }
 
     protected void cloneHotHyperLink(Plot oldPlot, Plot newPlot) throws CloneNotSupportedException {
@@ -280,4 +292,17 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Cha
             autoButton.addActionListener(autoButtonListener);
         }
     }
+
+    //部分图表继承到多分类之后会报错
+    protected void resetMoreCateDefinition(Chart chart) {
+        TopDefinitionProvider filterDefinition = chart.getFilterDefinition();
+        if (filterDefinition instanceof NormalTableDataDefinition) {
+            ((NormalTableDataDefinition) filterDefinition).clearMoreCate();
+            ((VanChartPlot) chart.getPlot()).setCategoryNum(1);
+        }
+        if (filterDefinition instanceof NormalReportDataDefinition) {
+            ((NormalReportDataDefinition) filterDefinition).clearMoreCate();
+            ((VanChartPlot) chart.getPlot()).setCategoryNum(1);
+        }
+    }
 }

designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/MapDataTree.java

@@ -1,13 +1,13 @@
 package com.fr.van.chart.drillmap.designer.data.comp;
 
 import com.fr.design.constants.UIConstants;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.map.designer.type.GEOJSONTreeHelper;
 import com.fr.plugin.chart.map.server.ChartGEOJSONHelper;
 import com.fr.plugin.chart.map.server.CompatibleGEOJSONHelper;
 import com.fr.stable.StringUtils;
 
+import javax.swing.BorderFactory;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
@@ -15,7 +15,6 @@ import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.util.Enumeration;
 
 /**
@@ -45,11 +44,11 @@ public class MapDataTree extends JTree {
     public void selectDefaultTreeNode() {
         DefaultTreeModel m_model = (DefaultTreeModel) this.getModel();
         DefaultMutableTreeNode root = (DefaultMutableTreeNode) m_model.getRoot();
-        Enumeration<DefaultMutableTreeNode> children = root.children();
+        Enumeration<TreeNode> children = root.children();
         if (children.hasMoreElements()) {
-            DefaultMutableTreeNode child = children.nextElement();
+            DefaultMutableTreeNode child = (DefaultMutableTreeNode) children.nextElement();
 
-            if(GEOJSONTreeHelper.getInstance().isSelectableTreeNode(child)){
+            if (GEOJSONTreeHelper.isSelectableTreeNode(child)) {
                 selectTreeNode(child, m_model);
             } else {
                 setFirstChildTreeNode(child, m_model);
@@ -59,9 +58,9 @@ public class MapDataTree extends JTree {
     }
 
     private void setFirstChildTreeNode(DefaultMutableTreeNode parent, DefaultTreeModel m_model) {
-        Enumeration<DefaultMutableTreeNode> children = parent.children();
+        Enumeration<TreeNode> children = parent.children();
         if (children.hasMoreElements()) {
-            DefaultMutableTreeNode node = children.nextElement();
+            DefaultMutableTreeNode node = (DefaultMutableTreeNode) children.nextElement();
             selectTreeNode(node, m_model);
         }
     }
@@ -89,9 +88,9 @@ public class MapDataTree extends JTree {
         DefaultTreeModel m_model = (DefaultTreeModel) this.getModel();
         DefaultMutableTreeNode root = (DefaultMutableTreeNode) m_model.getRoot();
 
-        Enumeration<DefaultMutableTreeNode> els = root.postorderEnumeration();
+        Enumeration<TreeNode> els = root.postorderEnumeration();
         while (els.hasMoreElements()) {
-            DefaultMutableTreeNode el = els.nextElement();
+            DefaultMutableTreeNode el = (DefaultMutableTreeNode) els.nextElement();
             if (el == null || el.getUserObject() == null) {
                 return null;
             }
@@ -115,14 +114,7 @@ public class MapDataTree extends JTree {
             DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) value;
             String name = getPresentName(treeNode);
             this.setText(name);
-
-            UILabel label = new UILabel();
-            label.setText(getText());
-            label.setIcon(getIcon());
-            this.setSize(label.getPreferredSize());
-            Dimension dim = label.getPreferredSize();
-            dim.height += 2;
-            this.setPreferredSize(dim);
+            this.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0));
             this.setBackgroundNonSelectionColor(UIConstants.NORMAL_BACKGROUND);
             this.setForeground(UIConstants.FONT_COLOR);
             this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE);
@@ -145,10 +137,10 @@ public class MapDataTree extends JTree {
         DefaultTreeModel m_model = (DefaultTreeModel) this.getModel();
         DefaultMutableTreeNode root = (DefaultMutableTreeNode) m_model.getRoot();
 
-        Enumeration<DefaultMutableTreeNode> els = root.postorderEnumeration();
+        Enumeration<TreeNode> els = root.postorderEnumeration();
         while (els.hasMoreElements()) {
 
-            DefaultMutableTreeNode el = els.nextElement();
+            DefaultMutableTreeNode el = (DefaultMutableTreeNode) els.nextElement();
             String path = el.getUserObject().toString();
             String fileName = ChartGEOJSONHelper.getPresentNameWithPath(path);
             if (StringUtils.contains(fileName, text) && GEOJSONTreeHelper.isValidDirPath(path)) {

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

@@ -0,0 +1,18 @@
+package com.fr.van.chart.funnel.designer.style;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.component.format.PercentFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class FunnelPercentFormatPaneWithoutCheckBox extends PercentFormatPaneWithoutCheckBox {
+
+    public FunnelPercentFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Value_Conversion");
+    }
+}

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

@@ -4,8 +4,12 @@ import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.base.format.AttrTooltipNameFormat;
 import com.fr.van.chart.designer.component.VanChartLabelContentPane;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.format.PercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -25,18 +29,34 @@ public class VanChartFunnelLabelContentPane extends VanChartLabelContentPane {
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{seriesNameFormatPane,null},
-                new Component[]{valueFormatPane,null},
-                new Component[]{percentFormatPane,null},
+                new Component[]{getSeriesNameFormatPane(), null},
+                new Component[]{getValueFormatPane(), null},
+                new Component[]{getPercentFormatPane(), null},
+        };
+    }
+
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextSeriesNameFormatPane(), null},
+                new Component[]{getRichTextValueFormatPane(), null},
+                new Component[]{getRichTextPercentFormatPane(), null}
         };
     }
 
     @Override
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane);
-        seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane);
-        valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane);
-        percentFormatPane = new FunnelPercentFormatPaneWithCheckBox(parent, showOnPane);
+        setCategoryNameFormatPane(new CategoryNameFormatPaneWithCheckBox(parent, showOnPane));
+        setSeriesNameFormatPane(new SeriesNameFormatPaneWithCheckBox(parent, showOnPane));
+        setValueFormatPane(new ValueFormatPaneWithCheckBox(parent, showOnPane));
+        setPercentFormatPane(new FunnelPercentFormatPaneWithCheckBox(parent, showOnPane));
+    }
+
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        setRichTextCategoryNameFormatPane(new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextPercentFormatPane(new FunnelPercentFormatPaneWithoutCheckBox(parent, showOnPane));
     }
 
     protected AttrTooltipContent createAttrTooltip() {

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

@@ -1,7 +1,9 @@
 package com.fr.van.chart.funnel.designer.style;
 
 import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -18,8 +20,16 @@ public class VanChartFunnelRefreshTooltipContentPane extends VanChartFunnelToolt
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
         super.initFormatPane(parent, showOnPane);
 
-        changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane);
-        changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane);
+        setChangedValueFormatPane(new ChangedValueFormatPaneWithCheckBox(parent, showOnPane));
+        setChangedPercentFormatPane(new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane));
+    }
+
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        super.initRichTextFormatPane(parent, showOnPane);
+
+        setRichTextChangedValueFormatPane(new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextChangedPercentFormatPane(new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane));
     }
 
     protected double[] getRowSize(double p){
@@ -28,11 +38,21 @@ public class VanChartFunnelRefreshTooltipContentPane extends VanChartFunnelToolt
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{seriesNameFormatPane,null},
-                new Component[]{valueFormatPane,null},
-                new Component[]{changedValueFormatPane,null},
-                new Component[]{percentFormatPane,null},
-                new Component[]{changedPercentFormatPane,null},
+                new Component[]{getSeriesNameFormatPane(), null},
+                new Component[]{getValueFormatPane(), null},
+                new Component[]{getChangedValueFormatPane(), null},
+                new Component[]{getPercentFormatPane(), null},
+                new Component[]{getChangedPercentFormatPane(), null},
+        };
+    }
+
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextSeriesNameFormatPane(), null},
+                new Component[]{getRichTextValueFormatPane(), null},
+                new Component[]{getRichTextChangedValueFormatPane(), null},
+                new Component[]{getRichTextPercentFormatPane(), null},
+                new Component[]{getRichTextChangedPercentFormatPane(), null}
         };
     }
 }