Merge pull request #3472 in DESIGN/design from release/10.0 to bugfix/10.0

* commit 'ff08b8bc73adbdfca161bfe83c33306ca49e8899':
  新增字段支持部分图表类型
  调整富文本参数顺序
  适配仪表盘，清理代码
  适配饼图
  适配箱型图
  适配甘特图
  REPORT-43833 【10.0.14】远程设计数据连接/服务器数据集增加锁定 1. 将本地实现作为默认实现，注册起来，以兼容远程连接老版服务器的情况 2. 之前清理脏数据的逻辑有点问题，修改方式为：为LockItem对象添加一个成员变量birth，代表其创建时间，并且会为每个ClientID在对应的服务中存上一个key=clientID，value=LockItem的键值对，在用户登入时初始化，每隔30s更新创建时间，用户登出时清除，并且在轮询任务中加入检查当前各个LockItem对应的服务下这个键值对里value的birth是否超时了，如果超时，清理脏数据 3. 将之前使用的applyForService修改为applyForCleanableService，便于集群重启时清理服务数据
  适配框架图
  REPORT-43833 【10.0.14】远程设计数据连接/服务器数据集增加锁定 将通知组件的操作放到EDT中
  REPORT-43833 【10.0.14】远程设计数据连接/服务器数据集增加锁定 将弹窗关闭后解锁的操作，放到afterCommit中
  适配漏斗图
  适配流向地图
  适配地图
  适配多层饼图
  设计新增字段的id
  REPORT-43833 【10.0.14】远程设计数据连接/服务器数据集增加锁定 【问题原因】自测+修改一些bug 【改动思路】自测+修改一些bug
  REPORT-43833 【10.0.14】远程设计数据连接/服务器数据集增加锁定 【问题原因】迭代提交 【改动思路】迭代提交

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

@@ -339,33 +339,37 @@ public abstract class UpdateAction extends ShortCut implements Action {
 		if (!(object instanceof AbstractButton)) {
 			UIButton button = null;
 			button = new UIButton();
-			// 添加一个名字作为自动化测试用
+			object = initButton(button, UIButton.class.getName());
-			button.setName(getName());
+		}
-			button.set4ToolbarButton();
-
-			//设置属性.
-			Integer mnemonicInteger = (Integer) this.getValue(Action.MNEMONIC_KEY);
-			if (mnemonicInteger != null) {
-				button.setMnemonic((char) mnemonicInteger.intValue());
-			}
-
-			button.setIcon((Icon) this.getValue(Action.SMALL_ICON));
-			setPressedIcon4Button(button);
-			setDisabledIcon4Button(button);
-			button.addActionListener(this);
 
-			button.registerKeyboardAction(this, this.getAccelerator(), JComponent.WHEN_IN_FOCUSED_WINDOW);
+		return (JComponent) object;
+	}
 
-			this.putValue(UIButton.class.getName(), button);
+	protected JComponent initButton(UIButton button, String name) {
-			button.setText(StringUtils.EMPTY);
+		// 添加一个名字作为自动化测试用
-			button.setEnabled(this.isEnabled());
+		button.setName(getName());
+		button.set4ToolbarButton();
 
-			//peter:产生tooltip
+		//设置属性.
-			button.setToolTipText(getToolTipText());
+		Integer mnemonicInteger = (Integer) this.getValue(Action.MNEMONIC_KEY);
-			object = button;
+		if (mnemonicInteger != null) {
+			button.setMnemonic((char) mnemonicInteger.intValue());
 		}
 
-		return (JComponent) object;
+		button.setIcon((Icon) this.getValue(Action.SMALL_ICON));
+		setPressedIcon4Button(button);
+		setDisabledIcon4Button(button);
+		button.addActionListener(this);
+
+		button.registerKeyboardAction(this, this.getAccelerator(), JComponent.WHEN_IN_FOCUSED_WINDOW);
+
+		this.putValue(name, button);
+		button.setText(StringUtils.EMPTY);
+		button.setEnabled(this.isEnabled());
+
+		//peter:产生tooltip
+		button.setToolTipText(getToolTipText());
+		return button;
 	}
 
 	/**
@@ -641,14 +645,14 @@ public abstract class UpdateAction extends ShortCut implements Action {
 		shortPinyin.append(PinyinHelper.getShortPinyin(title)).append(separator);
 	}
 
-	private void setPressedIcon4Button(AbstractButton button) {
+	protected void setPressedIcon4Button(AbstractButton button) {
 		Icon pressedIcon = (Icon) this.getValue(UpdateAction.PRESSED_ICON);
 		if (pressedIcon != null && pressedIcon instanceof SVGIcon) {
 			button.setPressedIcon(pressedIcon);
 		}
 	}
 
-	private void setDisabledIcon4Button(AbstractButton button) {
+	protected void setDisabledIcon4Button(AbstractButton button) {
 		Icon disabledIcon = (Icon) this.getValue(UpdateAction.DISABLED_ICON);
 		if (disabledIcon != null && disabledIcon instanceof SVGIcon) {
 			button.setDisabledIcon(disabledIcon);

designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java

@@ -1,19 +1,23 @@
 package com.fr.design.actions.server;
 
-import com.fr.base.svg.IconUtils;
 import com.fr.data.impl.Connection;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.data.datapane.connect.ConnectionShowPane;
 import com.fr.design.data.datapane.connect.DatabaseConnectionPane;
 import com.fr.design.dialog.BasicDialog;
+import com.fr.design.editlock.ConnectionLockChangeChecker;
+import com.fr.design.editlock.EditLockUtils;
 import com.fr.design.gui.NameInspector;
+import com.fr.design.gui.imenu.UILockMenuItem;
+import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.stable.os.support.OSBasedAction;
 import com.fr.stable.os.support.OSSupportCenter;
 import com.fr.design.os.impl.DatabaseDialogAction;
 import com.fr.file.ConnectionConfig;
+import com.fr.report.LockItem;
 
-import javax.swing.*;
+import javax.swing.KeyStroke;
 import java.awt.event.ActionEvent;
 import java.util.Map;
 
@@ -53,8 +57,16 @@ public class ConnectionListAction extends UpdateAction {
      * @param evt 事件
      */
     public void actionPerformed(ActionEvent evt) {
-        OSBasedAction osBasedAction =  OSSupportCenter.getAction(DatabaseDialogAction.class);
+        // 尝试为数据连接加锁
-        osBasedAction.execute();
+        boolean actionLock = EditLockUtils.lock(LockItem.CONNECTION);
+        if (!actionLock) {
+            // 锁定失败，代表已经被其他用户锁定，跳出弹窗提示
+            EditLockUtils.showLockMessage();
+        } else {
+            // 锁定成功,执行后续操作
+            OSBasedAction osBasedAction =  OSSupportCenter.getAction(DatabaseDialogAction.class);
+            osBasedAction.execute();
+        }
     }
 
     /**
@@ -96,4 +108,21 @@ public class ConnectionListAction extends UpdateAction {
     public void update() {
         this.setEnabled(true);
     }
+
+    @Override
+    public UIMenuItem createMenuItem() {
+        Object object = this.getValue(UILockMenuItem.class.getName());
+        if (object == null && !(object instanceof UILockMenuItem)) {
+            UILockMenuItem menuItem = new UILockMenuItem(this, EditLockUtils.CONNECTION_LOCKED_TOOLTIPS, null, LockItem.CONNECTION);
+            // 设置名字用作单元测
+            menuItem.setName(getName());
+            setPressedIcon4Button(menuItem);
+            setDisabledIcon4Button(menuItem);
+            object = menuItem;
+
+            this.putValue(UILockMenuItem.class.getName(), object);
+            ConnectionLockChangeChecker.getInstance().addEditLockChangeListener((UILockMenuItem)object);
+        }
+        return (UILockMenuItem) object;
+    }
 }

designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java

@@ -4,7 +4,6 @@
 package com.fr.design.actions.server;
 
 import com.fr.base.TableData;
-import com.fr.base.svg.IconUtils;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.data.DesignTableDataManager;
@@ -13,7 +12,11 @@ import com.fr.design.data.tabledata.ResponseDataSourceChange;
 import com.fr.design.data.tabledata.tabledatapane.TableDataManagerPane;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.editlock.EditLockUtils;
+import com.fr.design.editlock.ServerTableDataLockChangeChecker;
 import com.fr.design.gui.NameInspector;
+import com.fr.design.gui.imenu.UILockMenuItem;
+import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.menu.MenuKeySet;
@@ -22,9 +25,10 @@ import com.fr.file.TableDataConfig;
 import com.fr.transaction.CallBackAdaptor;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.WorkerFacade;
+import com.fr.report.LockItem;
 
 import javax.swing.KeyStroke;
-import java.awt.*;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.util.HashMap;
 import java.util.Map;
@@ -66,6 +70,14 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
      * @param evt 事件
      */
     public void actionPerformed(ActionEvent evt) {
+        // 尝试为服务器数据集加锁
+        boolean actionLock = EditLockUtils.lock(LockItem.SERVER_TABLE_DATA);
+        if (!actionLock) {
+            // 锁定失败，代表已经被其他用户锁定，跳出弹窗提示
+            EditLockUtils.showLockMessage();
+            return;
+        }
+        // 锁定成功,执行后续操作
         final DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
         final TableDataConfig tableDataConfig = TableDataConfig.getInstance();
         final TableDataManagerPane globalTableDataPane = new TableDataManagerPane() {
@@ -90,7 +102,6 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
                     globalTableDataDialog.setDoOKSucceed(false);
                     return;
                 }
-
                 DesignTableDataManager.clearGlobalDs();
                 // 保存时 移除服务器数据集列名缓存
                 for (String name : tableDataConfig.getTableDatas().keySet()) {
@@ -114,9 +125,18 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
                         // 刷新共有数据集
                         TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter());
                         fireDSChanged(globalTableDataPane.getDsChangedNameMap());
+                        // 关闭服务器数据集页面，为其解锁
+                        EditLockUtils.unlock(LockItem.SERVER_TABLE_DATA);
                     }
                 }));
             }
+
+            @Override
+            public void doCancel() {
+                super.doCancel();
+                // 关闭服务器数据集页面，为其解锁
+                EditLockUtils.unlock(LockItem.SERVER_TABLE_DATA);
+            }
         });
         globalTableDataDialog.setVisible(true);
     }
@@ -166,4 +186,21 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
     public void fireDSChanged(Map<String, String> map) {
         DesignTableDataManager.fireDSChanged(map);
     }
+
+    @Override
+    public UIMenuItem createMenuItem() {
+        Object object = this.getValue(UILockMenuItem.class.getName());
+        if (object == null && !(object instanceof UILockMenuItem)) {
+            UILockMenuItem menuItem = new UILockMenuItem(this, EditLockUtils.SERVER_TABLEDATA_LOCKED_TOOLTIPS, null, LockItem.SERVER_TABLE_DATA);
+            // 设置名字用作单元测
+            menuItem.setName(getName());
+            setPressedIcon4Button(menuItem);
+            setDisabledIcon4Button(menuItem);
+            object = menuItem;
+
+            this.putValue(UILockMenuItem.class.getName(), object);
+            ServerTableDataLockChangeChecker.getInstance().addEditLockChangeListener((UILockMenuItem)object);
+        }
+        return (UILockMenuItem) object;
+    }
 }

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

@@ -18,7 +18,10 @@ import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
 import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.editlock.ConnectionLockChangeChecker;
+import com.fr.design.editlock.EditLockUtils;
 import com.fr.design.gui.ibutton.UIHeadGroup;
+import com.fr.design.gui.ibutton.UILockButton;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.icon.IconPathConstants;
@@ -31,8 +34,11 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
 
+import javax.swing.AbstractButton;
+import javax.swing.Action;
 import javax.swing.DefaultCellEditor;
 import javax.swing.Icon;
+import javax.swing.JComponent;
 import javax.swing.JTree;
 import javax.swing.event.CellEditorListener;
 import javax.swing.event.ChangeEvent;
@@ -439,6 +445,23 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
             this.setMnemonic('D');
             this.setSmallIcon("/com/fr/design/images/m_web/connection");
         }
+
+        @Override
+        public JComponent createToolBarComponent() {
+            Object object = this.getValue(UILockButton.class.getName());
+            if (!(object instanceof AbstractButton)) {
+                UILockButton button = new UILockButton(
+                        EditLockUtils.CONNECTION_LOCKED_ICON,
+                        (Icon) this.getValue(Action.SMALL_ICON),
+                        EditLockUtils.CONNECTION_LOCKED_TOOLTIPS,
+                        getToolTipText()
+                );
+                initButton(button, UILockButton.class.getName());
+                object = button;
+                ConnectionLockChangeChecker.getInstance().addEditLockChangeListener((UILockButton)object);
+            }
+            return (JComponent) object;
+        }
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package com.fr.design.data.datapane.connect;
 
+import com.fr.base.svg.IconUtils;
 import com.fr.data.impl.AbstractDatabaseConnection;
 import com.fr.data.impl.Connection;
 import com.fr.data.impl.NameDatabaseConnection;
@@ -7,6 +8,10 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.server.ConnectionListAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.editlock.ConnectionLockChangeChecker;
+import com.fr.design.editlock.EditLockUtils;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ibutton.UILockButton;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.file.ConnectionConfig;
 import com.fr.general.ComparatorUtils;
@@ -16,8 +21,12 @@ import com.fr.transaction.Configurations;
 import com.fr.transaction.WorkerFacade;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.connection.DBConnectAuth;
+import com.fr.report.LockItem;
 
 import javax.swing.SwingUtilities;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.ArrayList;
@@ -56,6 +65,24 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
         refreshItems();
     }
 
+    @Override
+    protected UIButton initEditButton(UIButton editButton, Dimension buttonSize) {
+        editButton = new UILockButton(
+                EditLockUtils.CONNECTION_LOCKED_ICON,
+                IconUtils.readIcon("/com/fr/design/images/m_web/connection"),
+                EditLockUtils.CONNECTION_LOCKED_TOOLTIPS,
+                StringUtils.EMPTY
+        );
+        editButton.setPreferredSize(buttonSize);
+        editButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent evt) {
+                editItems();
+            }
+        });
+        ConnectionLockChangeChecker.getInstance().addEditLockChangeListener((UILockButton) editButton);
+        return editButton;
+    }
+
     /*
      * 刷新ComboBox.items
      */
@@ -97,6 +124,14 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
      * 弹出对话框编辑Items
      */
     protected void editItems() {
+        // 尝试为数据连接加锁
+        boolean actionLock = EditLockUtils.lock(LockItem.CONNECTION);
+        if (!actionLock) {
+            // 锁定失败，代表已经被其他用户锁定，跳出弹窗提示
+            EditLockUtils.showLockMessage();
+            return;
+        }
+        // 锁定成功，执行后续操作
         final ConnectionListPane connectionListPane = new ConnectionListPane();
         final ConnectionConfig connectionConfig = ConnectionConfig.getInstance();
         ConnectionConfig cloned = connectionConfig.mirror();
@@ -109,7 +144,8 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
                     connectionListDialog.setDoOKSucceed(false);
                     return;
                 }
-
+                // 关闭定义数据连接页面，为其解锁
+                EditLockUtils.unlock(LockItem.CONNECTION);
                 Configurations.modify(new WorkerFacade(ConnectionConfig.class) {
                     @Override
                     public void run() {
@@ -129,6 +165,13 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
                 }));
 
             }
+
+            @Override
+            public void doCancel() {
+                // 关闭定义数据连接页面，为其解锁
+                super.doCancel();
+                EditLockUtils.unlock(LockItem.CONNECTION);
+            }
         });
         connectionListDialog.setVisible(true);
         refreshItems();

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

@@ -34,24 +34,16 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 
 	protected void initComponents() {
 		this.setLayout(FRGUIPaneFactory.createM_BorderLayout());
-		
+		Dimension buttonSize = new Dimension(26, 20);
 		itemComboBox = new UIComboBox();
 		itemComboBox.setEnabled(true);
 		this.add(itemComboBox, BorderLayout.CENTER);
-		
-		editButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/control/control-center2.png"));
         refreshButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
         JPanel jPanel = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(2, 4 ,4);
+        editButton = initEditButton(editButton, buttonSize);
         jPanel.add(editButton);
         jPanel.add(refreshButton);
 		this.add(jPanel, BorderLayout.EAST);
-        Dimension buttonSize = new Dimension(26, 20);
-		editButton.setPreferredSize(buttonSize);
-		editButton.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent evt) {
-                editItems();
-            }
-        });
         refreshButton.setPreferredSize(buttonSize);
         refreshButton.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
@@ -60,6 +52,18 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
         });
 	}
 
+	protected UIButton initEditButton(UIButton editButton, Dimension buttonSize) {
+		editButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/control/control-center2.png"));
+		editButton.setPreferredSize(buttonSize);
+		editButton.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent evt) {
+				editItems();
+			}
+		});
+		return editButton;
+	}
+
+
 	/**
 	 * 给itemComboBox添加ActionListener
 	 */

designer-base/src/main/java/com/fr/design/editlock/ConnectionLockChangeChecker.java

@@ -0,0 +1,25 @@
+package com.fr.design.editlock;
+
+
+import com.fr.report.LockItem;
+
+/**
+ * @author Yvan
+ * @version 10.0
+ * Created by Yvan on 2021/1/20
+ * 定义数据连接的checker
+ */
+public class ConnectionLockChangeChecker extends EditLockChangeChecker{
+
+    private static class Holder {
+        private static final ConnectionLockChangeChecker INSTANCE = new ConnectionLockChangeChecker();
+    }
+
+    public static ConnectionLockChangeChecker getInstance() {
+        return ConnectionLockChangeChecker.Holder.INSTANCE;
+    }
+
+    public ConnectionLockChangeChecker() {
+        this.lockItem = LockItem.CONNECTION;
+    }
+}

designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java

@@ -0,0 +1,73 @@
+package com.fr.design.editlock;
+
+import com.fr.concurrent.NamedThreadFactory;
+import com.fr.design.ui.util.UIUtil;
+import com.fr.log.FineLoggerFactory;
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.lock.editlock.EditLockOperator;
+import com.fr.report.LockItem;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author Yvan
+ * @version 10.0
+ * Created by Yvan on 2021/1/19
+ * 判断当前设计器在远程设计服务器中的锁状态是否发生了改变
+ */
+public abstract class EditLockChangeChecker {
+
+    private static final int INTERVAL = 30000;
+    private ScheduledExecutorService scheduler;
+    protected LockItem lockItem;
+    private boolean isLocked = false;
+    private List<EditLockChangeListener> listeners = new ArrayList<>();
+
+    /**
+     * 轮询任务，如果是远程设计状态，每隔30s查询一次相应lockItem的锁状态是否改变
+     */
+    public void start() {
+        this.scheduler = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("EditLockChangeChecker"));
+        this.scheduler.scheduleAtFixedRate(new Runnable() {
+            @Override
+            public void run() {
+                // 判断是否为远程设计环境
+                if (!WorkContext.getCurrent().isLocal()) {
+                    try {
+                        EditLockOperator operator = WorkContext.getCurrent().get(EditLockOperator.class);
+                        boolean locked = operator.isLocked(lockItem);
+                        if (isLocked != locked) {
+                            isLocked = locked;
+                            fireChange();
+                        }
+                    } catch (Exception e) {
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                    }
+                }
+            }
+        }, 0, INTERVAL, TimeUnit.MILLISECONDS);
+    }
+
+    public void stop() {
+        this.scheduler.shutdown();
+    }
+
+    public void addEditLockChangeListener(EditLockChangeListener listener) {
+        this.listeners.add(listener);
+    }
+
+    private void fireChange() {
+        UIUtil.invokeLaterIfNeeded(new Runnable() {
+            @Override
+            public void run() {
+                for (EditLockChangeListener listener : EditLockChangeChecker.this.listeners) {
+                    listener.updateLockedState(new EditLockChangeEvent(isLocked));
+                }
+            }
+        });
+    }
+}

designer-base/src/main/java/com/fr/design/editlock/EditLockChangeEvent.java

@@ -0,0 +1,25 @@
+package com.fr.design.editlock;
+
+import java.util.EventObject;
+
+/**
+ * @author Yvan
+ * @version 10.0
+ * Created by Yvan on 2021/1/20
+ */
+public class EditLockChangeEvent extends EventObject {
+
+    private boolean isLocked;
+
+    /**
+     * @param source 锁状态发生了改变，且当前锁状态就是source
+     */
+    public EditLockChangeEvent(boolean source) {
+        super(source);
+        this.isLocked = source;
+    }
+
+    public boolean isLocked() {
+        return isLocked;
+    }
+}

designer-base/src/main/java/com/fr/design/editlock/EditLockChangeListener.java

@@ -0,0 +1,16 @@
+package com.fr.design.editlock;
+
+import java.util.EventListener;
+
+/**
+ * @author Yvan
+ * @version 10.0
+ * Created by Yvan on 2021/1/20
+ */
+public interface EditLockChangeListener extends EventListener {
+    /**
+     * 锁定状态改变后执行的动作
+     * @param event 事件
+     */
+    void updateLockedState(EditLockChangeEvent event);
+}

designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java

@@ -0,0 +1,79 @@
+package com.fr.design.editlock;
+
+import com.fr.base.svg.IconUtils;
+import com.fr.base.svg.SVGLoader;
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.general.IOUtils;
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.lock.editlock.EditLockOperator;
+import com.fr.report.LockItem;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.Icon;
+import javax.swing.JOptionPane;
+import java.awt.Image;
+
+/**
+ * @author Yvan
+ * @version 10.0
+ * Created by Yvan on 2021/1/20
+ * 关于编辑锁定的一些常量和静态方法
+ */
+public class EditLockUtils {
+
+    /**
+     * 数据连接锁定标志
+     */
+    public static final Icon CONNECTION_LOCKED_ICON = IconUtils.readIcon("/com/fr/design/images/m_web/connection_locked");
+
+    /**
+     * 小锁图片
+     */
+    public static final @Nullable Image LOCKED_IMAGE = SVGLoader.load("/com/fr/design/images/m_web/locked_normal.svg");
+
+    /**
+     * 提示弹窗中的提示标志
+     */
+    public static final Icon TOOLTIPS_ICON = IOUtils.readIcon("/com/fr/design/images/m_web/warningIcon.png");
+
+    /**
+     * 数据连接锁定中
+     */
+    public static final String CONNECTION_LOCKED_TOOLTIPS = Toolkit.i18nText("Fine_Designer_Remote_Design_Data_Connection_Locked");
+
+    /**
+     * 服务器数据集锁定中
+     */
+    public static final String SERVER_TABLEDATA_LOCKED_TOOLTIPS = Toolkit.i18nText("Fine_Designer_Remote_Design_Server_TableData_Locked");
+
+    /**
+     * 提示弹窗中的提示信息
+     */
+    public static final String LOCKED_MESSAGE = Toolkit.i18nText("Fine_Designer_Remote_Design_Locked_Message");
+
+    /**
+     * 提示弹窗中的标题
+     */
+    public static final String TOOLTIPS = Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Title_Hint");
+
+    /**
+     * 已经被锁，跳出弹窗提示
+     */
+    public static void showLockMessage() {
+        FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), EditLockUtils.LOCKED_MESSAGE, EditLockUtils.TOOLTIPS, JOptionPane.INFORMATION_MESSAGE, EditLockUtils.TOOLTIPS_ICON);
+    }
+
+    public static boolean lock(LockItem lockItem) {
+        return WorkContext.getCurrent().get(EditLockOperator.class).lock(lockItem);
+    }
+
+    public static boolean unlock(LockItem lockItem) {
+        return WorkContext.getCurrent().get(EditLockOperator.class).unlock(lockItem);
+    }
+
+    public static boolean isLocked(LockItem lockItem) {
+        return WorkContext.getCurrent().get(EditLockOperator.class).isLocked(lockItem);
+    }
+}

designer-base/src/main/java/com/fr/design/editlock/ServerTableDataLockChangeChecker.java

@@ -0,0 +1,23 @@
+package com.fr.design.editlock;
+
+import com.fr.report.LockItem;
+
+/**
+ * @author Yvan
+ * @version 10.0
+ * Created by Yvan on 2021/1/20
+ * 服务器数据集的checker
+ */
+public class ServerTableDataLockChangeChecker extends EditLockChangeChecker{
+    private static class Holder {
+        private static final ServerTableDataLockChangeChecker INSTANCE = new ServerTableDataLockChangeChecker();
+    }
+
+    public static ServerTableDataLockChangeChecker getInstance() {
+        return ServerTableDataLockChangeChecker.Holder.INSTANCE;
+    }
+
+    public ServerTableDataLockChangeChecker() {
+        this.lockItem = LockItem.SERVER_TABLE_DATA;
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.fr.design.gui.ibutton;
+
+import com.fr.design.editlock.EditLockChangeEvent;
+import com.fr.design.editlock.EditLockChangeListener;
+import com.fr.design.editlock.EditLockUtils;
+import com.fr.report.LockItem;
+
+import javax.swing.Icon;
+
+/**
+ * @author Yvan
+ * @version 10.0
+ * Created by Yvan on 2021/1/20
+ */
+public class UILockButton extends UIButton implements EditLockChangeListener {
+
+    /**
+     * 锁定状态图标
+     */
+    private Icon lockedIcon;
+    /**
+     * 正常状态图标
+     */
+    private Icon normalIcon;
+    /**
+     * 锁定状态的提示信息
+     */
+    private String lockedTooltips;
+    /**
+     * 正常状态的提示信息
+     */
+    private String normalTooltips;
+
+    public UILockButton(Icon lockedIcon, Icon normalIcon, String lockedTooltips, String normalTooltips) {
+        super();
+        this.lockedIcon = lockedIcon;
+        this.normalIcon = normalIcon;
+        this.lockedTooltips = lockedTooltips;
+        this.normalTooltips = normalTooltips;
+        init();
+    }
+
+    private void init() {
+        boolean locked = EditLockUtils.isLocked(LockItem.CONNECTION);
+        this.setIcon(locked ? lockedIcon : normalIcon);
+        this.setToolTipText(locked ? lockedTooltips : normalTooltips);
+    }
+
+    @Override
+    public void updateLockedState(EditLockChangeEvent event) {
+        this.setIcon(event.isLocked() ? lockedIcon : normalIcon);
+        this.setToolTipText(event.isLocked() ? lockedTooltips : normalTooltips);
+        this.repaint();
+    }
+}

designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItem.java

@@ -0,0 +1,47 @@
+package com.fr.design.gui.imenu;
+
+import com.fr.design.editlock.EditLockChangeEvent;
+import com.fr.design.editlock.EditLockChangeListener;
+import com.fr.report.LockItem;
+
+import javax.swing.Action;
+
+/**
+ * @author Yvan
+ * @version 10.0
+ * Created by Yvan on 2021/1/20
+ */
+public class UILockMenuItem extends UIMenuItem implements EditLockChangeListener {
+
+    /**
+     * 锁定状态的提示信息
+     */
+    private String lockedTooltips;
+    /**
+     * 正常状态的提示信息
+     */
+    private String normalTooltips;
+
+    /**
+     * 当前锁定项
+     */
+    private LockItem lockItem;
+
+    public UILockMenuItem(Action action, String lockedTooltips, String normalTooltips, LockItem lockItem) {
+        super(action);
+        this.lockedTooltips = lockedTooltips;
+        this.normalTooltips = normalTooltips;
+        this.lockItem = lockItem;
+        setUI(new UILockMenuItemUI());
+    }
+
+    public LockItem getLockItem() {
+        return lockItem;
+    }
+
+    @Override
+    public void updateLockedState(EditLockChangeEvent event) {
+        this.setToolTipText(event.isLocked() ? lockedTooltips : normalTooltips);
+        this.repaint();
+    }
+}

designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItemUI.java

@@ -0,0 +1,28 @@
+package com.fr.design.gui.imenu;
+
+import com.fr.design.editlock.EditLockUtils;
+
+import javax.swing.JMenuItem;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+
+/**
+ * @author Yvan
+ * @version 10.0
+ * Created by Yvan on 2021/1/20
+ */
+public class UILockMenuItemUI extends UIMenuItemUI{
+
+    @Override
+    protected void paintText(Graphics g, JMenuItem menuItem, Rectangle textRect, String text) {
+        super.paintText(g, menuItem, textRect, text);
+        // 除了绘制text之外，还需要画一下锁定图标
+        UILockMenuItem lockMenuItem = (UILockMenuItem) menuItem;
+        if (EditLockUtils.isLocked(lockMenuItem.getLockItem())) {
+            int width = menuItem.getWidth();
+            int height = menuItem.getHeight();
+            g.drawImage(EditLockUtils.LOCKED_IMAGE, (int) Math.round(width * 0.9), (int) Math.round(height * 0.1), 16, 16, null);
+        }
+
+    }
+}

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

@@ -1,18 +1,17 @@
 package com.fr.design.os.impl;
 
-import com.fr.config.ServerPreferenceConfig;
 import com.fr.design.data.datapane.connect.ConnectionManagerPane;
-import com.fr.design.dcm.UniversalDatabaseOpener;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.editlock.EditLockUtils;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.file.ConnectionConfig;
-import com.fr.stable.os.OperatingSystem;
 import com.fr.stable.os.support.OSBasedAction;
 import com.fr.transaction.CallBackAdaptor;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.WorkerFacade;
+import com.fr.report.LockItem;
 import static com.fr.design.actions.server.ConnectionListAction.doWithDatasourceManager;
 
 /**
@@ -68,9 +67,18 @@ public class DatabaseDialogAction implements OSBasedAction {
                     @Override
                     public void afterCommit() {
                         DesignerContext.getDesignerBean("databasename").refreshBeanElement();
+                        // 定义数据连接弹窗关闭后，解锁
+                        EditLockUtils.unlock(LockItem.CONNECTION);
                     }
                 }));
             }
+
+            @Override
+            public void doCancel() {
+                super.doCancel();
+                // 定义数据连接弹窗关闭后，解锁
+                EditLockUtils.unlock(LockItem.CONNECTION);
+            }
         });
         databaseListDialog.setVisible(true);
     }

designer-base/src/main/resources/com/fr/design/images/m_web/connection_locked_normal.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 3</title>
+    <g id="远程设计数据连接/服务器数据集增加锁定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g transform="translate(-162.000000, -121.000000)" id="template">
+            <g transform="translate(24.000000, 115.000000)">
+                <g id="编组-3" transform="translate(138.000000, 6.000000)">
+                    <rect id="矩形" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="16" height="16"></rect>
+                    <path d="M13.9931545,2 C14.5492199,2 15,2.44371665 15,2.99980749 L15,6.00019251 C15,6.18235446 14.9510312,6.35313811 14.8654084,6.50022573 C14.9510251,6.64542671 15,6.81651267 15,6.99980749 L15,8 L13.999,8 L14,6.99980749 L2.00684547,7 C2.00567632,7 2.00469979,7.12351139 2.00388585,7.32041361 L2.003125,7.53992312 C2.00300685,7.57996653 2.00289294,7.6215845 2.00278313,7.66454498 L2.00201498,8.01864019 L2.00184669,8.11271215 L2.00184669,8.11271215 L2.00113666,8.59786697 C2.00105585,8.66296526 2.00098034,8.72781696 2.00090983,8.7919289 L2.00000644,9.98367135 C2.00000205,9.99452107 2,10.0001925 2,10.0001925 L8,10 L8,10.999 L2.00684547,11 C2.00567632,11 2.00469979,11.1235114 2.00388585,11.3204136 L2.003125,11.5399231 C2.00300685,11.5799665 2.00289294,11.6215845 2.00278313,11.664545 L2.00201498,12.0186402 L2.00184669,12.1127121 L2.00184669,12.1127121 L2.00113666,12.597867 C2.00105585,12.6629653 2.00098034,12.727817 2.00090983,12.7919289 L2.00000644,13.9836714 C2.00000205,13.9945211 2,14.0001925 2,14.0001925 L8,14 L8,15 L2.00684547,15 C1.45078007,15 1,14.5562834 1,14.0001925 L1,10.9998075 C1,10.8176455 1.04896881,10.6468619 1.13459156,10.4997743 C1.04897491,10.3545733 1,10.1834873 1,10.0001925 L1,6.99980749 C1,6.81764554 1.04896881,6.64686189 1.13459156,6.49977427 C1.04897491,6.35457329 1,6.18348733 1,6.00019251 L1,2.99980749 C1,2.44762906 1.44994876,2 2.00684547,2 L13.9931545,2 Z M14,2.99980749 L2.00684547,3 C2.00567632,3 2.00469979,3.12351139 2.00388585,3.32041361 L2.003125,3.53992312 C2.00300685,3.57996653 2.00289294,3.6215845 2.00278313,3.66454498 L2.00201498,4.01864019 L2.00184669,4.11271215 L2.00184669,4.11271215 L2.00113666,4.59786697 C2.00105585,4.66296526 2.00098034,4.72781696 2.00090983,4.7919289 L2.00000644,5.98367135 C2.00000205,5.99452107 2,6.00019251 2,6.00019251 L13.9814047,6.00000045 C13.9891898,6.00000015 13.9931545,6 13.9931545,6 C13.9943237,6 13.9953002,5.87648861 13.9961142,5.67958639 L13.996875,5.46007688 C13.9969932,5.42003347 13.9971071,5.3784155 13.9972169,5.33545502 L13.997985,4.98135981 L13.9981533,4.88728785 L13.9981533,4.88728785 L13.9988633,4.40213303 C13.9989441,4.33703474 13.9990197,4.27218304 13.9990902,4.2080711 L14,2.99980749 Z M4,4 L4,5 L3,5 L3,4 L4,4 Z M6,4 L6,5 L5,5 L5,4 L6,4 Z" id="形状结合" fill="#333334" fill-rule="nonzero"></path>
+                    <path d="M14,8 L14,10 L15,10 L15,15 L9,15 L9,10 L10,10 L10,8 L14,8 Z M13,12 L11,12 L11,13 L13,13 L13,12 Z M13,9 L11,9 L11,10 L13,10 L13,9 Z" id="形状结合" fill="#E21E20" fill-rule="nonzero"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_web/locked_normal.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 2</title>
+    <g id="远程设计数据连接/服务器数据集增加锁定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g transform="translate(-476.000000, -106.000000)" id="列表/导航栏下拉列表">
+            <g transform="translate(243.000000, 70.000000)">
+                <g id="编组-2" transform="translate(233.000000, 36.000000)">
+                    <rect id="矩形" fill="#FFFFFF" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                    <path d="M11,3 L11,6 L12,6 L12,13 L4,13 L4,6 L5,6 L5,3 L11,3 Z M10,9 L6,9 L6,10 L10,10 L10,9 Z M10,4 L6,4 L6,6 L10,6 L10,4 Z" id="形状结合" fill="#E21E20" fill-rule="nonzero"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

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

@@ -0,0 +1,135 @@
+package com.fr.van.chart.box;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.ui.ModernUIPane;
+import com.fr.plugin.chart.base.AttrTooltipContent;
+import com.fr.plugin.chart.base.format.AttrTooltipCategoryFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipDataMaxFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipDataMedianFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipDataMinFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipDataNumberFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipDataOutlierFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipDataQ1Format;
+import com.fr.plugin.chart.base.format.AttrTooltipDataQ3Format;
+import com.fr.plugin.chart.base.format.AttrTooltipSeriesFormat;
+import com.fr.plugin.chart.box.attr.AttrBoxTooltipContent;
+import com.fr.van.chart.designer.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldButton;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListener;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+
+import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.List;
+
+public class VanChartBoxRichTextDetailedFieldListPane extends VanChartFieldListPane {
+
+    private VanChartFieldButton richTextNumber;
+    private VanChartFieldButton richTextMax;
+    private VanChartFieldButton richTextQ3;
+    private VanChartFieldButton richTextMedian;
+    private VanChartFieldButton richTextQ1;
+    private VanChartFieldButton richTextMin;
+    private VanChartFieldButton richTextOutlier;
+
+    public VanChartBoxRichTextDetailedFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+        super(fieldAttrPane, richEditorPane);
+    }
+
+    public VanChartFieldButton getRichTextMax() {
+        return richTextMax;
+    }
+
+    public VanChartFieldButton getRichTextQ3() {
+        return richTextQ3;
+    }
+
+    public VanChartFieldButton getRichTextMedian() {
+        return richTextMedian;
+    }
+
+    public VanChartFieldButton getRichTextQ1() {
+        return richTextQ1;
+    }
+
+    public VanChartFieldButton getRichTextMin() {
+        return richTextMin;
+    }
+
+    protected void initDefaultFieldButton() {
+        VanChartFieldListener listener = getFieldListener();
+
+        setCategoryNameButton(new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name"), new AttrTooltipCategoryFormat(),  listener));
+        setSeriesNameButton(new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Series_Name"), new AttrTooltipSeriesFormat(),  listener));
+
+        richTextNumber = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Data_Number"), new AttrTooltipDataNumberFormat(),  listener);
+        richTextMax = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Max_Value"), new AttrTooltipDataMaxFormat(), listener);
+        richTextQ3 = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Data_Q3"), new AttrTooltipDataQ3Format(), listener);
+        richTextMedian = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Data_Median"), new AttrTooltipDataMedianFormat(), listener);
+        richTextQ1 = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Data_Q1"), new AttrTooltipDataQ1Format(),  listener);
+        richTextMin = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Min_Value"), new AttrTooltipDataMinFormat(),  listener);
+        richTextOutlier = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Outlier_Value"), new AttrTooltipDataOutlierFormat(),  listener);
+    }
+
+    protected void addDefaultFieldButton(JPanel fieldPane) {
+        fieldPane.add(getCategoryNameButton());
+        fieldPane.add(getSeriesNameButton());
+        fieldPane.add(richTextNumber);
+        fieldPane.add(richTextMax);
+        fieldPane.add(richTextQ3);
+        fieldPane.add(richTextMedian);
+        fieldPane.add(richTextQ1);
+        fieldPane.add(richTextMin);
+        fieldPane.add(richTextOutlier);
+    }
+
+    protected List<VanChartFieldButton> getDefaultFieldButtonList() {
+        List<VanChartFieldButton> fieldButtonList = new ArrayList<>();
+
+        fieldButtonList.add(getCategoryNameButton());
+        fieldButtonList.add(getSeriesNameButton());
+        fieldButtonList.add(richTextNumber);
+        fieldButtonList.add(richTextMax);
+        fieldButtonList.add(richTextQ3);
+        fieldButtonList.add(richTextMedian);
+        fieldButtonList.add(richTextQ1);
+        fieldButtonList.add(richTextMin);
+        fieldButtonList.add(richTextOutlier);
+
+        return fieldButtonList;
+    }
+
+    public void populateDefaultField(AttrTooltipContent tooltipContent) {
+        super.populateDefaultField(tooltipContent);
+
+        if (tooltipContent instanceof AttrBoxTooltipContent) {
+            AttrBoxTooltipContent box = (AttrBoxTooltipContent) tooltipContent;
+
+            populateButtonFormat(richTextNumber, box.getRichTextNumber());
+            populateButtonFormat(richTextMax, box.getRichTextMax());
+            populateButtonFormat(richTextQ3, box.getRichTextQ3());
+            populateButtonFormat(richTextMedian, box.getRichTextMedian());
+            populateButtonFormat(richTextQ1, box.getRichTextQ1());
+            populateButtonFormat(richTextMin, box.getRichTextMin());
+            populateButtonFormat(richTextOutlier, box.getRichTextOutlier());
+        }
+    }
+
+    public void updateDefaultField(AttrTooltipContent tooltipContent) {
+        super.updateDefaultField(tooltipContent);
+
+        if (tooltipContent instanceof AttrBoxTooltipContent) {
+            AttrBoxTooltipContent box = (AttrBoxTooltipContent) tooltipContent;
+
+            updateButtonFormat(richTextNumber, box.getRichTextNumber());
+            updateButtonFormat(richTextMax, box.getRichTextMax());
+            updateButtonFormat(richTextQ3, box.getRichTextQ3());
+            updateButtonFormat(richTextMedian, box.getRichTextMedian());
+            updateButtonFormat(richTextQ1, box.getRichTextQ1());
+            updateButtonFormat(richTextMin, box.getRichTextMin());
+            updateButtonFormat(richTextOutlier, box.getRichTextOutlier());
+        }
+    }
+
+}

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

@@ -0,0 +1,41 @@
+package com.fr.van.chart.box;
+
+import com.fr.design.ui.ModernUIPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldButton;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+
+import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.List;
+
+public class VanChartBoxRichTextResultFieldListPane extends VanChartBoxRichTextDetailedFieldListPane {
+
+    public VanChartBoxRichTextResultFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+        super(fieldAttrPane, richEditorPane);
+    }
+
+    protected void addDefaultFieldButton(JPanel fieldPane) {
+        fieldPane.add(getCategoryNameButton());
+        fieldPane.add(getSeriesNameButton());
+        fieldPane.add(getRichTextMax());
+        fieldPane.add(getRichTextQ3());
+        fieldPane.add(getRichTextMedian());
+        fieldPane.add(getRichTextQ1());
+        fieldPane.add(getRichTextMin());
+    }
+
+    protected List<VanChartFieldButton> getDefaultFieldButtonList() {
+        List<VanChartFieldButton> fieldButtonList = new ArrayList<>();
+
+        fieldButtonList.add(getCategoryNameButton());
+        fieldButtonList.add(getSeriesNameButton());
+        fieldButtonList.add(getRichTextMax());
+        fieldButtonList.add(getRichTextQ3());
+        fieldButtonList.add(getRichTextMedian());
+        fieldButtonList.add(getRichTextQ1());
+        fieldButtonList.add(getRichTextMin());
+
+        return fieldButtonList;
+    }
+}

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

@@ -4,8 +4,8 @@ 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.ui.ModernUIPane;
 import com.fr.plugin.chart.base.AttrTooltipContent;
-import com.fr.plugin.chart.base.AttrTooltipRichText;
 import com.fr.plugin.chart.base.format.AttrTooltipCategoryFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipDataMaxFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipDataMedianFormat;
@@ -20,17 +20,17 @@ 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.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+import com.fr.van.chart.designer.component.richText.VanChartRichTextPane;
 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 {
 
@@ -44,20 +44,9 @@ 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;
 
-    private JPanel richTextNumberPane;
-    private JPanel richTextOutlierPane;
-
     public VanChartBoxTooltipContentPane(VanChartStylePane parent, JPanel showOnPane, boolean isDetailed) {
         super(parent, showOnPane);
         checkFormatVisible(isDetailed);
@@ -104,47 +93,6 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         };
     }
 
-    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());
 
@@ -155,27 +103,73 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         return commonPanel;
     }
 
-    protected JPanel createRichFormatPanel() {
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
-        JPanel richFormatPanel = new JPanel(new BorderLayout());
 
-        richFormatPanel.add(createRichTextCateAndSeriesPane(), BorderLayout.NORTH);
+        return new VanChartRichTextPane(richEditorPane) {
-        richFormatPanel.add(createRichTextDataNumberPane(), BorderLayout.CENTER);
-        richFormatPanel.add(createRichTextDataDetailPane(), BorderLayout.SOUTH);
 
-        return richFormatPanel;
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                if (detailed) {
+                    return new VanChartBoxRichTextDetailedFieldListPane(fieldAttrPane, richEditor);
+                }
+
+                return new VanChartBoxRichTextResultFieldListPane(fieldAttrPane, richEditor);
+            }
+
+            protected AttrTooltipContent getInitialTooltipContent() {
+                return createAttrTooltip();
+            }
+        };
+    }
+
+    protected String[] getRichTextFieldNames() {
+        if (detailed) {
+            return new String[]{
+                    Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name"),
+                    Toolkit.i18nText("Fine-Design_Chart_Series_Name"),
+                    Toolkit.i18nText("Fine-Design_Chart_Data_Number"),
+                    Toolkit.i18nText("Fine-Design_Chart_Max_Value"),
+                    Toolkit.i18nText("Fine-Design_Chart_Data_Q3"),
+                    Toolkit.i18nText("Fine-Design_Chart_Data_Median"),
+                    Toolkit.i18nText("Fine-Design_Chart_Data_Q1"),
+                    Toolkit.i18nText("Fine-Design_Chart_Min_Value"),
+                    Toolkit.i18nText("Fine-Design_Chart_Outlier_Value")
+            };
+        }
+
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_Series_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_Max_Value"),
+                Toolkit.i18nText("Fine-Design_Chart_Data_Q3"),
+                Toolkit.i18nText("Fine-Design_Chart_Data_Median"),
+                Toolkit.i18nText("Fine-Design_Chart_Data_Q1"),
+                Toolkit.i18nText("Fine-Design_Chart_Min_Value")
+        };
     }
 
-    protected Component[][] getRichTextComponents() {
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
-        return new Component[][]{
+        if (detailed) {
-                new Component[]{getRichTextCategoryNameFormatPane(), null},
+            return new AttrTooltipFormat[]{
-                new Component[]{getRichTextSeriesNameFormatPane(), null},
+                    new AttrTooltipCategoryFormat(),
-                new Component[]{richTextNumber, null},
+                    new AttrTooltipSeriesFormat(),
-                new Component[]{richTextMax, null},
+                    new AttrTooltipDataNumberFormat(),
-                new Component[]{richTextQ3, null},
+                    new AttrTooltipDataMaxFormat(),
-                new Component[]{richTextMedian, null},
+                    new AttrTooltipDataQ3Format(),
-                new Component[]{richTextQ1, null},
+                    new AttrTooltipDataMedianFormat(),
-                new Component[]{richTextMin, null},
+                    new AttrTooltipDataQ1Format(),
-                new Component[]{richTextOutlier, null}
+                    new AttrTooltipDataMinFormat(),
+                    new AttrTooltipDataOutlierFormat()
+            };
+        }
+
+        return new AttrTooltipFormat[]{
+                new AttrTooltipCategoryFormat(),
+                new AttrTooltipSeriesFormat(),
+                new AttrTooltipDataMaxFormat(),
+                new AttrTooltipDataQ3Format(),
+                new AttrTooltipDataMedianFormat(),
+                new AttrTooltipDataQ1Format(),
+                new AttrTooltipDataMinFormat()
         };
     }
 
@@ -249,72 +243,6 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         return detailPane;
     }
 
-    private JPanel createRichTextCateAndSeriesPane() {
-        double p = TableLayout.PREFERRED;
-        double f = TableLayout.FILL;
-        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
-
-        double[] columnSize = {f, e};
-        double[] rowSize = {p, p, p};
-
-        Component[][] cateAndSeries = new Component[][]{
-                new Component[]{null, null},
-                new Component[]{null, getRichTextCategoryNameFormatPane()},
-                new Component[]{null, getRichTextSeriesNameFormatPane()}
-        };
-
-        return TableLayoutHelper.createTableLayoutPane(cateAndSeries, rowSize, columnSize);
-    }
-
-    private JPanel createRichTextDataNumberPane() {
-        double p = TableLayout.PREFERRED;
-        double f = TableLayout.FILL;
-        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
-
-        double[] columnSize = {f, e};
-        double[] rowSize = {p, p};
-
-        Component[][] dataNumber = new Component[][]{
-                new Component[]{null, null},
-                new Component[]{null, richTextNumber},
-        };
-
-        richTextNumberPane = TableLayoutHelper.createTableLayoutPane(dataNumber, rowSize, columnSize);
-
-        return richTextNumberPane;
-    }
-
-    private JPanel createRichTextDataDetailPane() {
-        double p = TableLayout.PREFERRED;
-        double f = TableLayout.FILL;
-        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
-
-        double[] columnSize = {f, e};
-
-        JPanel detailPane = new JPanel(new BorderLayout());
-
-        Component[][] richTextDetail = new Component[][]{
-                new Component[]{null, null},
-                new Component[]{null, richTextMax},
-                new Component[]{new UILabel(getLabelContentTitle()), richTextQ3},
-                new Component[]{null, richTextMedian},
-                new Component[]{null, richTextQ1},
-                new Component[]{null, richTextMin}
-        };
-
-        Component[][] dataOutlier = new Component[][]{
-                new Component[]{null, null},
-                new Component[]{null, richTextOutlier},
-        };
-
-        richTextOutlierPane = TableLayoutHelper.createTableLayoutPane(dataOutlier, new double[]{p, p}, columnSize);
-
-        detailPane.add(TableLayoutHelper.createTableLayoutPane(richTextDetail, new double[]{p, p, p, p, p, p}, columnSize), BorderLayout.NORTH);
-        detailPane.add(richTextOutlierPane, BorderLayout.CENTER);
-
-        return detailPane;
-    }
-
     public boolean isDirty() {
         return getCategoryNameFormatPane().isDirty()
                 || getSeriesNameFormatPane().isDirty()
@@ -362,63 +290,21 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         }
     }
 
-    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+    protected void updateTooltipFormat(AttrTooltipContent target, AttrTooltipContent source) {
-        setRichTextAttr(new AttrTooltipRichText());
+        super.updateTooltipFormat(target, source);
-        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 = getFormatPaneGroup();
-            AttrTooltipFormat[] formatGroup = getFormatGroup(boxTooltipContent);
-
-            populateRichTextFormat(formatPaneGroup, formatGroup);
-            populateRichText(attrTooltipContent.getRichTextAttr());
-
-            checkRichEditorState(attrTooltipContent);
-        }
-    }
-
-    private VanChartFormatPaneWithoutCheckBox[] getFormatPaneGroup() {
-        if (detailed) {
-            return new VanChartFormatPaneWithoutCheckBox[]{
-                    richTextNumber, richTextMax, richTextQ3, richTextMedian,
-                    richTextQ1, richTextMin, richTextOutlier
-            };
-        }
-
-        return new VanChartFormatPaneWithoutCheckBox[]{
-                richTextMax, richTextQ3, richTextMedian, richTextQ1, richTextMin
-        };
-    }
 
-    private AttrTooltipFormat[] getFormatGroup(AttrBoxTooltipContent boxTooltipContent) {
+        if (target instanceof AttrBoxTooltipContent && source instanceof AttrBoxTooltipContent) {
-        AttrTooltipDataNumberFormat richTextNumber = boxTooltipContent.getRichTextNumber();
+            AttrBoxTooltipContent targetGantt = (AttrBoxTooltipContent) target;
-        AttrTooltipDataMaxFormat richTextMaxFormat = boxTooltipContent.getRichTextMax();
+            AttrBoxTooltipContent sourceGantt = (AttrBoxTooltipContent) source;
-        AttrTooltipDataQ3Format richTextQ3Format = boxTooltipContent.getRichTextQ3();
-        AttrTooltipDataMedianFormat richTextMedianFormat = boxTooltipContent.getRichTextMedian();
-        AttrTooltipDataQ1Format richTextQ1Format = boxTooltipContent.getRichTextQ1();
-        AttrTooltipDataMinFormat richTextMinFormat = boxTooltipContent.getRichTextMin();
-        AttrTooltipDataOutlierFormat richTextOutlierFormat = boxTooltipContent.getRichTextOutlier();
 
-        if (detailed) {
+            targetGantt.setRichTextNumber(sourceGantt.getRichTextNumber());
-            return new AttrTooltipFormat[]{
+            targetGantt.setRichTextMax(sourceGantt.getRichTextMax());
-                    richTextNumber, richTextMaxFormat, richTextQ3Format, richTextMedianFormat,
+            targetGantt.setRichTextQ3(sourceGantt.getRichTextQ3());
-                    richTextQ1Format, richTextMinFormat, richTextOutlierFormat
+            targetGantt.setRichTextMedian(sourceGantt.getRichTextMedian());
-            };
+            targetGantt.setRichTextQ1(sourceGantt.getRichTextQ1());
+            targetGantt.setRichTextMin(sourceGantt.getRichTextMin());
+            targetGantt.setRichTextOutlier(sourceGantt.getRichTextOutlier());
         }
-
-        return new AttrTooltipFormat[]{
-                richTextMaxFormat, richTextQ3Format, richTextMedianFormat, richTextQ1Format, richTextMinFormat
-        };
     }
 
     protected void updateFormatPane(AttrTooltipContent attrTooltipContent) {
@@ -440,30 +326,10 @@ 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;
 
         dataNumberPane.setVisible(detailed);
         dataOutlierPane.setVisible(detailed);
-
-        richTextNumberPane.setVisible(detailed);
-        richTextOutlierPane.setVisible(detailed);
     }
 }

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

@@ -19,6 +19,7 @@ import com.fr.plugin.chart.heatmap.VanChartHeatMapPlot;
 import com.fr.plugin.chart.line.VanChartLinePlot;
 import com.fr.plugin.chart.map.VanChartMapPlot;
 import com.fr.plugin.chart.multilayer.VanChartMultiPiePlot;
+import com.fr.plugin.chart.radar.VanChartRadarPlot;
 import com.fr.plugin.chart.scatter.VanChartScatterPlot;
 import com.fr.plugin.chart.structure.VanChartStructurePlot;
 import com.fr.plugin.chart.treemap.VanChartTreeMapPlot;
@@ -94,6 +95,20 @@ public class PlotFactory {
         return autoAdjustLabelPlots.contains(plot.getClass());
     }
 
+    private static Set<Class<? extends Plot>> supportAddTableFieldPlots = new HashSet<>();
+
+    static {
+        supportAddTableFieldPlots.add(PiePlot4VanChart.class);
+        supportAddTableFieldPlots.add(VanChartColumnPlot.class);
+        supportAddTableFieldPlots.add(VanChartLinePlot.class);
+        supportAddTableFieldPlots.add(VanChartAreaPlot.class);
+        supportAddTableFieldPlots.add(VanChartRadarPlot.class);
+    }
+
+    public static boolean plotSupportAddTableField(Plot plot) {
+        return supportAddTableFieldPlots.contains(plot.getClass());
+    }
+
     private static Set<Class<? extends Plot>> borderAndBackgroundLabelPlots = new HashSet<>();
 
     static {

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

@@ -1,9 +1,7 @@
 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;
@@ -34,14 +32,6 @@ public class VanChartRefreshTooltipContentPane extends VanChartTooltipContentPan
         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[]{getCategoryNameFormatPane(), null},
@@ -52,16 +42,4 @@ public class VanChartRefreshTooltipContentPane extends VanChartTooltipContentPan
                 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/VanChartTooltipContentPane.java

@@ -24,17 +24,11 @@ import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
 import com.fr.stable.StringUtils;
 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.richText.VanChartRichEditorModel;
 import com.fr.van.chart.designer.component.richText.VanChartRichEditorPane;
@@ -53,7 +47,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -84,13 +78,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     private ChangedValueFormatPaneWithCheckBox changedValueFormatPane;
     private ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane;
 
-    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;
@@ -118,7 +105,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         this.richTextTooltipContent = createAttrTooltip();
 
         initFormatPane(parent, showOnPane);
-        initRichTextFormatPane(parent, showOnPane);
 
         this.setLayout(new BorderLayout());
         this.add(createLabelContentPane(), BorderLayout.CENTER);
@@ -184,54 +170,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         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 UIButtonGroup<Integer> getContent() {
         return content;
     }
@@ -512,7 +450,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         String[] fieldNames = getRichTextFieldNames();
         AttrTooltipFormat[] fieldFormats = getRichTextFieldFormats();
 
-        Map<String, String> params = new HashMap<>();
+        Map<String, String> params = new LinkedHashMap<>();
 
         for (int i = 0, len = fieldNames.length; i < len; i++) {
             params.put(fieldNames[i], fieldFormats[i].getJs());
@@ -522,7 +460,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
         if (tableFieldNames != null) {
             for (String fieldName : tableFieldNames) {
-                params.put(fieldName, fieldName);
+                params.put(fieldName, "${" + fieldName + "_" + fieldName.hashCode() + "}");
             }
         }
 
@@ -558,13 +496,6 @@ 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);
     }
@@ -582,15 +513,6 @@ 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
@@ -769,21 +691,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         checkRichEditorState(attrTooltipContent);
     }
 
-    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);
-
-                // 填充面板时，更新富文本编辑器参数
-                AttrTooltipRichText richText = this.richTextTooltipContent.getRichTextAttr();
-                formatPane.updateFormatParams(richText.getParams(), format.getJs());
-            }
-        }
-    }
-
     protected void populateRichText(AttrTooltipRichText tooltipRichText) {
         if (tooltipRichText != null) {
             updateLocalRichText(tooltipRichText.getContent(), tooltipRichText.isAuto());
@@ -806,7 +713,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         updateLabelType(attrTooltipContent);
         updateFormatPane(attrTooltipContent);
         if (supportRichEditor()) {
-            // updateRichEditor(attrTooltipContent);
             updateTooltipFormat(attrTooltipContent, this.richTextTooltipContent);
             updateTooltipRichText(attrTooltipContent);
         }
@@ -863,27 +769,6 @@ 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());
-        }
-    }
-
     protected void updateTooltipFormat(AttrTooltipContent target, AttrTooltipContent source) {
         if (target == null || source == null) {
             return;

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

@@ -2,11 +2,13 @@ package com.fr.van.chart.designer.component.richText;
 
 import com.fr.data.util.function.AbstractDataFunction;
 import com.fr.design.event.UIObserverListener;
+import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.style.FormatPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.mainframe.chart.gui.data.CalculateComboBox;
+import com.fr.plugin.chart.base.format.IntervalTimeFormat;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.format.FormatPaneWithOutFont;
 
@@ -21,15 +23,18 @@ import java.text.Format;
 public class VanChartFieldAttrPane extends JPanel {
 
     private FormatPane fieldFormatPane;
-    private CalculateComboBox fieldDataFunction;
+    private UIComboBox intervalTimeBox;
+    private CalculateComboBox dataFunctionBox;
 
+    private JPanel formatPane;
+    private JPanel intervalTimePane;
     private JPanel fieldFunctionPane;
 
     public VanChartFieldAttrPane() {
         initComponents();
 
         this.setLayout(new BorderLayout());
-        this.add(fieldFormatPane, BorderLayout.NORTH);
+        this.add(formatPane, BorderLayout.NORTH);
         this.add(fieldFunctionPane, BorderLayout.CENTER);
         this.setBorder(BorderFactory.createEmptyBorder(0, 30, 0, 0));
     }
@@ -44,28 +49,43 @@ public class VanChartFieldAttrPane extends JPanel {
                 return TableLayout4VanChartHelper.createGapTableLayoutPane(components, new double[]{p, p, p}, new double[]{d, e});
             }
         };
+        intervalTimeBox = new UIComboBox(IntervalTimeFormat.getFormats());
+        dataFunctionBox = new CalculateComboBox();
 
-        fieldDataFunction = new CalculateComboBox();
+        Component[][] intervalTimeComponents = new Component[][]{
-
+                new Component[]{null, null},
-        Component[][] components = new Component[][]{
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Format"), SwingConstants.LEFT), intervalTimeBox}
+        };
+        Component[][] dataFunctionComponents = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Summary_Method"), SwingConstants.LEFT), fieldDataFunction}
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Summary_Method"), SwingConstants.LEFT), dataFunctionBox}
         };
 
-        fieldFunctionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, new double[]{p, p}, new double[]{d, e});
+        intervalTimePane = TableLayout4VanChartHelper.createGapTableLayoutPane(intervalTimeComponents, new double[]{p, p}, new double[]{d, e});
-    }
 
-    public void registerFunctionListener(ActionListener listener) {
+        formatPane = new JPanel(new BorderLayout());
-        fieldDataFunction.addActionListener(listener);
+        formatPane.add(fieldFormatPane, BorderLayout.NORTH);
+        formatPane.add(intervalTimePane, BorderLayout.CENTER);
+
+        fieldFunctionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(dataFunctionComponents, new double[]{p, p}, new double[]{d, e});
     }
 
-    public void registerChangeListener(UIObserverListener listener) {
+    public void registerFormatListener(UIObserverListener listener) {
         fieldFormatPane.registerChangeListener(listener);
+        intervalTimeBox.registerChangeListener(listener);
     }
 
-    public void populate(Format format, AbstractDataFunction dataFunction, boolean showDataFunction) {
+    public void registerFunctionListener(ActionListener listener) {
+        dataFunctionBox.addActionListener(listener);
+    }
+
+    public void populate(Format format, IntervalTimeFormat intervalTime, AbstractDataFunction dataFunction, boolean showDataFunction, boolean showIntervalTime) {
         fieldFormatPane.populateBean(format);
-        fieldDataFunction.populateBean(dataFunction);
+        intervalTimeBox.setSelectedItem(intervalTime);
+        dataFunctionBox.populateBean(dataFunction);
+
+        fieldFormatPane.setVisible(!showIntervalTime);
+        intervalTimePane.setVisible(showIntervalTime);
         fieldFunctionPane.setVisible(showDataFunction);
     }
 
@@ -73,7 +93,11 @@ public class VanChartFieldAttrPane extends JPanel {
         return fieldFormatPane.update();
     }
 
+    public IntervalTimeFormat updateIntervalTime() {
+        return (IntervalTimeFormat) intervalTimeBox.getSelectedItem();
+    }
+
     public AbstractDataFunction updateDataFunction() {
-        return fieldDataFunction.updateBean();
+        return dataFunctionBox.updateBean();
     }
 }

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

@@ -7,7 +7,9 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.plugin.chart.base.format.AttrTooltipDurationFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipFormat;
+import com.fr.plugin.chart.base.format.IntervalTimeFormat;
 import com.fr.stable.StringUtils;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
@@ -33,16 +35,27 @@ public class VanChartFieldButton extends JPanel {
 
     private final AttrTooltipFormat tooltipFormat;
     private final boolean showDataFunction;
+    private final boolean showIntervalTime;
 
     private UIToggleButton fieldButton;
     private UIButton addButton;
 
     private DataFunction dataFunction = new NoneFunction();
 
+    public VanChartFieldButton(String fieldName, AttrTooltipFormat format, VanChartFieldListener listener) {
+        this(fieldName, format, false, false, listener);
+    }
+
     public VanChartFieldButton(String fieldName, AttrTooltipFormat format, boolean showDataFunction, VanChartFieldListener listener) {
+        this(fieldName, format, showDataFunction, false, listener);
+    }
+
+    public VanChartFieldButton(String fieldName, AttrTooltipFormat format, boolean showDataFunction, boolean showIntervalTime, VanChartFieldListener listener) {
         this.fieldName = fieldName;
         this.tooltipFormat = format;
+
         this.showDataFunction = showDataFunction;
+        this.showIntervalTime = showIntervalTime;
 
         this.fieldId = format == null ? StringUtils.EMPTY : format.getFormatJSONKey();
 
@@ -72,6 +85,20 @@ public class VanChartFieldButton extends JPanel {
         this.tooltipFormat.setFormat(format);
     }
 
+    public IntervalTimeFormat getIntervalTimeFormat() {
+        if (tooltipFormat instanceof AttrTooltipDurationFormat) {
+            return ((AttrTooltipDurationFormat) tooltipFormat).getIntervalTimeFormat();
+        }
+
+        return IntervalTimeFormat.DAY;
+    }
+
+    public void setIntervalTimeFormat(IntervalTimeFormat intervalTime) {
+        if (tooltipFormat instanceof AttrTooltipDurationFormat) {
+            ((AttrTooltipDurationFormat) tooltipFormat).setIntervalTimeFormat(intervalTime);
+        }
+    }
+
     public DataFunction getDataFunction() {
         return dataFunction;
     }
@@ -84,6 +111,10 @@ public class VanChartFieldButton extends JPanel {
         return showDataFunction;
     }
 
+    public boolean isShowIntervalTime() {
+        return showIntervalTime;
+    }
+
     public String getFormatJs() {
         return this.tooltipFormat.getJs();
     }

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

@@ -11,11 +11,13 @@ import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.base.TableFieldCollection;
 import com.fr.plugin.chart.base.TableFieldDefinition;
 import com.fr.plugin.chart.base.format.AttrTooltipCategoryFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipDurationFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipFieldFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipPercentFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipSeriesFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
+import com.fr.plugin.chart.base.format.IntervalTimeFormat;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
 import javax.swing.BorderFactory;
@@ -52,7 +54,7 @@ public class VanChartFieldListPane extends JPanel {
 
         List<String> richEditorFieldNames = VanChartRichEditorPane.getFieldNames();
 
-        this.tableFieldNameList = richEditorFieldNames == null ? new ArrayList<>() : richEditorFieldNames;
+        this.tableFieldNameList = (!supportAddField() || richEditorFieldNames == null) ? new ArrayList<>() : richEditorFieldNames;
 
         this.fieldAttrPane = fieldAttrPane;
         this.richEditorPane = richEditorPane;
@@ -131,6 +133,10 @@ public class VanChartFieldListPane extends JPanel {
                 new AttrTooltipPercentFormat(), false, fieldListener);
     }
 
+    protected boolean supportAddField() {
+        return true;
+    }
+
     protected void addDefaultFieldButton(JPanel fieldPane) {
         fieldPane.add(categoryNameButton);
         fieldPane.add(seriesNameButton);
@@ -242,10 +248,13 @@ public class VanChartFieldListPane extends JPanel {
                 }
 
                 Format format = fieldButton.getFormat();
+                IntervalTimeFormat intervalTime = fieldButton.getIntervalTimeFormat();
                 AbstractDataFunction dataFunction = (AbstractDataFunction) fieldButton.getDataFunction();
+
                 boolean showDataFunction = fieldButton.isShowDataFunction();
+                boolean showIntervalTime = fieldButton.isShowIntervalTime();
 
-                fieldAttrPane.populate(format, dataFunction, showDataFunction);
+                fieldAttrPane.populate(format, intervalTime, dataFunction, showDataFunction, showIntervalTime);
             }
 
             public void updateFieldFormatPane() {
@@ -256,6 +265,7 @@ public class VanChartFieldListPane extends JPanel {
                 }
 
                 fieldButton.setFormat(fieldAttrPane.updateFormat());
+                fieldButton.setIntervalTimeFormat(fieldAttrPane.updateIntervalTime());
                 fieldButton.setDataFunction(fieldAttrPane.updateDataFunction());
 
                 if (tableFieldNameList.contains(fieldName)) {
@@ -276,7 +286,7 @@ public class VanChartFieldListPane extends JPanel {
             }
         });
 
-        fieldAttrPane.registerChangeListener(new UIObserverListener() {
+        fieldAttrPane.registerFormatListener(new UIObserverListener() {
             public void doChange() {
                 fieldListener.updateFieldFormatPane();
             }
@@ -317,6 +327,10 @@ public class VanChartFieldListPane extends JPanel {
 
         button.setEnable(format.isEnable());
         button.setFormat(format.getFormat());
+
+        if (button.isShowIntervalTime() && format instanceof AttrTooltipDurationFormat) {
+            button.setIntervalTimeFormat(((AttrTooltipDurationFormat) format).getIntervalTimeFormat());
+        }
     }
 
     public void populateTableField(AttrTooltipContent tooltipContent) {
@@ -378,5 +392,9 @@ public class VanChartFieldListPane extends JPanel {
 
         format.setEnable(button.isEnable());
         format.setFormat(button.getFormat());
+
+        if (button.isShowIntervalTime() && format instanceof AttrTooltipDurationFormat) {
+            ((AttrTooltipDurationFormat) format).setIntervalTimeFormat(button.getIntervalTimeFormat());
+        }
     }
 }

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

@@ -3,6 +3,7 @@ package com.fr.van.chart.designer.component.richText;
 import com.fr.base.TableData;
 import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.chart.chartattr.Chart;
+import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartdata.MoreNameCDDefinition;
 import com.fr.chart.chartdata.OneValueCDDefinition;
 import com.fr.data.TableDataSource;
@@ -17,6 +18,7 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.base.AttrTooltipRichText;
 import com.fr.plugin.chart.type.TextAlign;
 import com.fr.stable.StringUtils;
+import com.fr.van.chart.designer.PlotFactory;
 import com.teamdev.jxbrowser.chromium.Browser;
 import com.teamdev.jxbrowser.chromium.JSValue;
 import com.teamdev.jxbrowser.chromium.events.ScriptContextAdapter;
@@ -51,6 +53,12 @@ public class VanChartRichEditorPane {
             return;
         }
 
+        Plot plot = chart.getPlot();
+
+        if (plot == null || !PlotFactory.plotSupportAddTableField(plot)) {
+            return;
+        }
+
         TopDefinitionProvider definition = chart.getFilterDefinition();
 
         if (definition == null) {

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

@@ -29,14 +29,6 @@ public class RefreshTooltipContentPaneWithOutSeries extends TooltipContentPaneWi
         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){
         return new double[]{p,p,p,p,p};
     }
@@ -50,14 +42,4 @@ public class RefreshTooltipContentPaneWithOutSeries extends TooltipContentPaneWi
                 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

@@ -1,10 +1,17 @@
 package com.fr.van.chart.designer.component.tooltip;
 
+import com.fr.design.i18n.Toolkit;
+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.AttrTooltipCategoryFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipPercentFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
-import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+import com.fr.van.chart.designer.component.richText.VanChartRichTextPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -33,31 +40,33 @@ public class TooltipContentPaneWithOutSeries extends VanChartTooltipContentPane
         };
     }
 
-    protected Component[][] getRichTextComponents() {
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
-        return new Component[][]{
+
-                new Component[]{getRichTextCategoryNameFormatPane(), null},
+        return new VanChartRichTextPane(richEditorPane) {
-                new Component[]{getRichTextValueFormatPane(), null},
+
-                new Component[]{getRichTextPercentFormatPane(), null}
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                return new VanChartFieldListPaneWithOutSeries(fieldAttrPane, richEditor);
+            }
+
+            protected AttrTooltipContent getInitialTooltipContent() {
+                return createAttrTooltip();
+            }
         };
     }
 
-    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+    protected String[] getRichTextFieldNames() {
-        VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
+        return new String[]{
-                getRichTextCategoryNameFormatPane(),
+                Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name"),
-                getRichTextValueFormatPane(),
+                Toolkit.i18nText("Fine-Design_Chart_Use_Value"),
-                getRichTextPercentFormatPane()
+                Toolkit.i18nText("Fine-Design_Chart_Use_Percent")
         };
+    }
 
-        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
-                attrTooltipContent.getRichTextCategoryFormat(),
+        return new AttrTooltipFormat[]{
-                attrTooltipContent.getRichTextValueFormat(),
+                new AttrTooltipCategoryFormat(),
-                attrTooltipContent.getRichTextPercentFormat()
+                new AttrTooltipValueFormat(),
+                new AttrTooltipPercentFormat()
         };
-
-        setRichTextAttr(new AttrTooltipRichText());
-        populateRichTextFormat(formatPaneGroup, formatGroup);
-        populateRichText(attrTooltipContent.getRichTextAttr());
-
-        checkRichEditorState(attrTooltipContent);
     }
 }

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

@@ -0,0 +1,34 @@
+package com.fr.van.chart.designer.component.tooltip;
+
+import com.fr.design.ui.ModernUIPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldButton;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+
+import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.List;
+
+public class VanChartFieldListPaneWithOutSeries extends VanChartFieldListPane {
+
+    public VanChartFieldListPaneWithOutSeries(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+        super(fieldAttrPane, richEditorPane);
+    }
+
+    protected void addDefaultFieldButton(JPanel fieldPane) {
+        fieldPane.add(getCategoryNameButton());
+        fieldPane.add(getValueButton());
+        fieldPane.add(getPercentButton());
+    }
+
+    protected List<VanChartFieldButton> getDefaultFieldButtonList() {
+        List<VanChartFieldButton> fieldButtonList = new ArrayList<>();
+
+        fieldButtonList.add(getCategoryNameButton());
+        fieldButtonList.add(getValueButton());
+        fieldButtonList.add(getPercentButton());
+
+        return fieldButtonList;
+    }
+}

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

@@ -1,18 +1,21 @@
 package com.fr.van.chart.funnel.designer.style;
 
+import com.fr.design.i18n.Toolkit;
+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.plugin.chart.base.format.AttrTooltipNameFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipPercentFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
 import com.fr.plugin.chart.type.TextAlign;
 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.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.richText.VanChartFieldAttrPane;
-import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+import com.fr.van.chart.designer.component.richText.VanChartRichTextPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -38,14 +41,6 @@ public class VanChartFunnelLabelContentPane extends VanChartLabelContentPane {
         };
     }
 
-    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) {
         setCategoryNameFormatPane(new CategoryNameFormatPaneWithCheckBox(parent, showOnPane));
@@ -54,32 +49,34 @@ public class VanChartFunnelLabelContentPane extends VanChartLabelContentPane {
         setPercentFormatPane(new FunnelPercentFormatPaneWithCheckBox(parent, showOnPane));
     }
 
-    @Override
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
-    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 void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+        return new VanChartRichTextPane(richEditorPane) {
-        VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
+
-                getRichTextSeriesNameFormatPane(),
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
-                getRichTextValueFormatPane(),
+                return new VanChartFunnelRichTextFieldListPane(fieldAttrPane, richEditor);
-                getRichTextPercentFormatPane()
+            }
-        };
 
-        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
+            protected AttrTooltipContent getInitialTooltipContent() {
-                attrTooltipContent.getRichTextSeriesFormat(),
+                return createAttrTooltip();
-                attrTooltipContent.getRichTextValueFormat(),
+            }
-                attrTooltipContent.getRichTextPercentFormat()
         };
+    }
 
-        setRichTextAttr(new AttrTooltipRichText());
+    protected String[] getRichTextFieldNames() {
-        populateRichTextFormat(formatPaneGroup, formatGroup);
+        return new String[]{
-        populateRichText(attrTooltipContent.getRichTextAttr());
+                Toolkit.i18nText("Fine-Design_Chart_Series_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_Use_Value"),
+                Toolkit.i18nText("Fine-Design_Chart_Value_Conversion")
+        };
+    }
 
-        checkRichEditorState(attrTooltipContent);
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
+        return new AttrTooltipFormat[]{
+                new AttrTooltipNameFormat(),
+                new AttrTooltipValueFormat(),
+                new AttrTooltipPercentFormat()
+        };
     }
 
     protected AttrTooltipContent createAttrTooltip() {

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

@@ -29,14 +29,6 @@ public class VanChartFunnelRefreshTooltipContentPane extends VanChartFunnelToolt
         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){
         return new double[]{p,p,p,p,p};
     }
@@ -50,14 +42,4 @@ public class VanChartFunnelRefreshTooltipContentPane extends VanChartFunnelToolt
                 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}
-        };
-    }
 }

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

@@ -0,0 +1,62 @@
+package com.fr.van.chart.funnel.designer.style;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.ui.ModernUIPane;
+import com.fr.plugin.chart.base.format.AttrTooltipCategoryFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipNameFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipPercentFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
+import com.fr.van.chart.designer.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldButton;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListener;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+
+import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.List;
+
+public class VanChartFunnelRichTextFieldListPane extends VanChartFieldListPane {
+
+    public VanChartFunnelRichTextFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+        super(fieldAttrPane, richEditorPane);
+    }
+
+    protected void initDefaultFieldButton() {
+        VanChartFieldListener fieldListener = getFieldListener();
+
+        VanChartFieldButton categoryNameButton = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name"),
+                new AttrTooltipCategoryFormat(), false, fieldListener);
+
+        VanChartFieldButton seriesNameButton = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Series_Name"),
+                new AttrTooltipNameFormat(), false, fieldListener);
+
+        VanChartFieldButton valueButton = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Use_Value"),
+                new AttrTooltipValueFormat(), false, fieldListener);
+
+        VanChartFieldButton percentButton = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Value_Conversion"),
+                new AttrTooltipPercentFormat(), false, fieldListener);
+
+        setCategoryNameButton(categoryNameButton);
+        setSeriesNameButton(seriesNameButton);
+        setValueButton(valueButton);
+        setPercentButton(percentButton);
+    }
+
+    protected void addDefaultFieldButton(JPanel fieldPane) {
+        fieldPane.add(getSeriesNameButton());
+        fieldPane.add(getValueButton());
+        fieldPane.add(getPercentButton());
+    }
+
+    protected List<VanChartFieldButton> getDefaultFieldButtonList() {
+        List<VanChartFieldButton> fieldButtonList = new ArrayList<>();
+
+        fieldButtonList.add(getSeriesNameButton());
+        fieldButtonList.add(getValueButton());
+        fieldButtonList.add(getPercentButton());
+
+        return fieldButtonList;
+    }
+
+}

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

@@ -1,17 +1,20 @@
 package com.fr.van.chart.funnel.designer.style;
 
+import com.fr.design.i18n.Toolkit;
+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.plugin.chart.base.format.AttrTooltipNameFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipPercentFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
 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.ValueFormatPaneWithCheckBox;
-import com.fr.van.chart.designer.component.format.ValueFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.richText.VanChartFieldAttrPane;
-import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+import com.fr.van.chart.designer.component.richText.VanChartRichTextPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -37,14 +40,6 @@ public class VanChartFunnelTooltipContentPane extends VanChartTooltipContentPane
         };
     }
 
-    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) {
         setCategoryNameFormatPane(new CategoryNameFormatPaneWithCheckBox(parent, showOnPane));
@@ -53,32 +48,34 @@ public class VanChartFunnelTooltipContentPane extends VanChartTooltipContentPane
         setPercentFormatPane(new FunnelPercentFormatPaneWithCheckBox(parent, showOnPane));
     }
 
-    @Override
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
-    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 void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+        return new VanChartRichTextPane(richEditorPane) {
-        VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
+
-                getRichTextSeriesNameFormatPane(),
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
-                getRichTextValueFormatPane(),
+                return new VanChartFunnelRichTextFieldListPane(fieldAttrPane, richEditor);
-                getRichTextPercentFormatPane()
+            }
-        };
 
-        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
+            protected AttrTooltipContent getInitialTooltipContent() {
-                attrTooltipContent.getRichTextSeriesFormat(),
+                return createAttrTooltip();
-                attrTooltipContent.getRichTextValueFormat(),
+            }
-                attrTooltipContent.getRichTextPercentFormat()
         };
+    }
 
-        setRichTextAttr(new AttrTooltipRichText());
+    protected String[] getRichTextFieldNames() {
-        populateRichTextFormat(formatPaneGroup, formatGroup);
+        return new String[]{
-        populateRichText(attrTooltipContent.getRichTextAttr());
+                Toolkit.i18nText("Fine-Design_Chart_Series_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_Use_Value"),
+                Toolkit.i18nText("Fine-Design_Chart_Value_Conversion")
+        };
+    }
 
-        checkRichEditorState(attrTooltipContent);
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
+        return new AttrTooltipFormat[]{
+                new AttrTooltipNameFormat(),
+                new AttrTooltipValueFormat(),
+                new AttrTooltipPercentFormat()
+        };
     }
 
     protected AttrTooltipContent createAttrTooltip() {

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

@@ -0,0 +1,107 @@
+package com.fr.van.chart.gantt.designer.style.tooltip;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.ui.ModernUIPane;
+import com.fr.plugin.chart.base.AttrTooltipContent;
+import com.fr.plugin.chart.base.format.AttrTooltipDurationFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipEndTimeFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipProcessesFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipProgressFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipSeriesFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipStartTimeFormat;
+import com.fr.plugin.chart.gantt.attr.AttrGanttTooltipContent;
+import com.fr.van.chart.designer.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldButton;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListener;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+
+import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.List;
+
+public class VanChartGanttRichTextFieldListPane extends VanChartFieldListPane {
+
+    private VanChartFieldButton richTextProcessesFormatPane;
+    private VanChartFieldButton richTextStartTimeFormatPane;
+    private VanChartFieldButton richTextEndTimeFormatPane;
+    private VanChartFieldButton richTextDurationFormatPane;
+    private VanChartFieldButton richTextProgressFormatPane;
+
+    public VanChartGanttRichTextFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+        super(fieldAttrPane, richEditorPane);
+    }
+
+    protected void initDefaultFieldButton() {
+        VanChartFieldListener listener = getFieldListener();
+
+        richTextProcessesFormatPane = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Project_Name"),
+                new AttrTooltipProcessesFormat(), false, listener);
+
+        setSeriesNameButton(new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Series_Name"),
+                new AttrTooltipSeriesFormat(), false, listener));
+
+        richTextStartTimeFormatPane = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Start_Time"),
+                new AttrTooltipStartTimeFormat(), false, listener);
+
+        richTextEndTimeFormatPane = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_End_Time"),
+                new AttrTooltipEndTimeFormat(), false, listener);
+
+        richTextDurationFormatPane = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Duration_Time"),
+                new AttrTooltipDurationFormat(), false, true, listener);
+
+        richTextProgressFormatPane = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Process"),
+                new AttrTooltipProgressFormat(), false, listener);
+    }
+
+    protected void addDefaultFieldButton(JPanel fieldPane) {
+        fieldPane.add(richTextProcessesFormatPane);
+        fieldPane.add(getSeriesNameButton());
+        fieldPane.add(richTextStartTimeFormatPane);
+        fieldPane.add(richTextEndTimeFormatPane);
+        fieldPane.add(richTextDurationFormatPane);
+        fieldPane.add(richTextProgressFormatPane);
+    }
+
+    protected List<VanChartFieldButton> getDefaultFieldButtonList() {
+        List<VanChartFieldButton> fieldButtonList = new ArrayList<>();
+
+        fieldButtonList.add(richTextProcessesFormatPane);
+        fieldButtonList.add(getSeriesNameButton());
+        fieldButtonList.add(richTextStartTimeFormatPane);
+        fieldButtonList.add(richTextEndTimeFormatPane);
+        fieldButtonList.add(richTextDurationFormatPane);
+        fieldButtonList.add(richTextProgressFormatPane);
+
+        return fieldButtonList;
+    }
+
+    public void populateDefaultField(AttrTooltipContent tooltipContent) {
+        super.populateDefaultField(tooltipContent);
+
+        if (tooltipContent instanceof AttrGanttTooltipContent) {
+            AttrGanttTooltipContent gantt = (AttrGanttTooltipContent) tooltipContent;
+
+            populateButtonFormat(richTextProcessesFormatPane, gantt.getRichTextProcessesFormat());
+            populateButtonFormat(richTextStartTimeFormatPane, gantt.getRichTextStartTimeFormat());
+            populateButtonFormat(richTextEndTimeFormatPane, gantt.getRichTextEndTimeFormat());
+            populateButtonFormat(richTextDurationFormatPane, gantt.getRichTextDurationFormat());
+            populateButtonFormat(richTextProgressFormatPane, gantt.getRichTextProgressFormat());
+        }
+    }
+
+    public void updateDefaultField(AttrTooltipContent tooltipContent) {
+        super.updateDefaultField(tooltipContent);
+
+        if (tooltipContent instanceof AttrGanttTooltipContent) {
+            AttrGanttTooltipContent gantt = (AttrGanttTooltipContent) tooltipContent;
+
+            updateButtonFormat(richTextProcessesFormatPane, gantt.getRichTextProcessesFormat());
+            updateButtonFormat(richTextStartTimeFormatPane, gantt.getRichTextStartTimeFormat());
+            updateButtonFormat(richTextEndTimeFormatPane, gantt.getRichTextEndTimeFormat());
+            updateButtonFormat(richTextDurationFormatPane, gantt.getRichTextDurationFormat());
+            updateButtonFormat(richTextProgressFormatPane, gantt.getRichTextProgressFormat());
+        }
+    }
+
+}

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

@@ -1,10 +1,11 @@
 package com.fr.van.chart.gantt.designer.style.tooltip;
 
 import com.fr.design.i18n.Toolkit;
+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.AttrTooltipDurationFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipEndTimeFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipProcessesFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipProgressFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipSeriesFormat;
@@ -12,14 +13,15 @@ import com.fr.plugin.chart.base.format.AttrTooltipStartTimeFormat;
 import com.fr.plugin.chart.gantt.attr.AttrGanttTooltipContent;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
 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.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+import com.fr.van.chart.designer.component.richText.VanChartRichTextPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
 import java.awt.Component;
-import java.util.Map;
 
 /**
  * Created by hufan on 2017/1/13.
@@ -31,12 +33,6 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
     private VanChartFormatComBoxWithCheckBox durationFormatPane;
     private VanChartFormatPaneWithCheckBox progressFormatPane;
 
-    private VanChartFormatPaneWithoutCheckBox richTextProcessesFormatPane;
-    private VanChartDateFormatPaneWithoutCheckBox richTextStartTimeFormatPane;
-    private VanChartDateFormatPaneWithoutCheckBox richTextEndTimeFormatPane;
-    private VanChartFormatComBoxWithoutCheckBox richTextDurationFormatPane;
-    private VanChartFormatPaneWithoutCheckBox richTextProgressFormatPane;
-
     public VanChartGanttTooltipContentPane(VanChartStylePane parent, JPanel showOnPane) {
         super(parent, showOnPane);
     }
@@ -70,28 +66,39 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
         };
     }
 
-    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
-        richTextProcessesFormatPane = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane){
+
-            protected String getCheckBoxText() {
+        return new VanChartRichTextPane(richEditorPane) {
-                return Toolkit.i18nText("Fine-Design_Chart_Project_Name");
+
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                return new VanChartGanttRichTextFieldListPane(fieldAttrPane, richEditor);
             }
-        };
+
-        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
+            protected AttrTooltipContent getInitialTooltipContent() {
-        richTextStartTimeFormatPane = new VanChartDateFormatPaneWithoutCheckBox(parent, showOnPane){
+                return createAttrTooltip();
-            protected String getCheckBoxText() {
-                return Toolkit.i18nText("Fine-Design_Chart_Start_Time");
             }
         };
-        richTextEndTimeFormatPane = new VanChartDateFormatPaneWithoutCheckBox(parent, showOnPane){
+    }
-            protected String getCheckBoxText() {
+
-                return Toolkit.i18nText("Fine-Design_Chart_End_Time");
+    protected String[] getRichTextFieldNames() {
-            }
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Project_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_Series_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_Start_Time"),
+                Toolkit.i18nText("Fine-Design_Chart_End_Time"),
+                Toolkit.i18nText("Fine-Design_Chart_Duration_Time"),
+                Toolkit.i18nText("Fine-Design_Chart_Process")
         };
-        richTextDurationFormatPane = new VanChartFormatComBoxWithoutCheckBox();
+    }
-        richTextProgressFormatPane = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane){
+
-            protected String getCheckBoxText() {
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
-                return Toolkit.i18nText("Fine-Design_Chart_Process");
+        return new AttrTooltipFormat[]{
-            }
+                new AttrTooltipProcessesFormat(),
+                new AttrTooltipSeriesFormat(),
+                new AttrTooltipStartTimeFormat(),
+                new AttrTooltipEndTimeFormat(),
+                new AttrTooltipDurationFormat(),
+                new AttrTooltipProgressFormat()
         };
     }
 
@@ -106,17 +113,6 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
         };
     }
 
-    protected Component[][] getRichTextComponents() {
-        return new Component[][]{
-                new Component[]{richTextProcessesFormatPane,null},
-                new Component[]{getRichTextSeriesNameFormatPane(),null},
-                new Component[]{richTextStartTimeFormatPane,null},
-                new Component[]{richTextEndTimeFormatPane,null},
-                new Component[]{richTextDurationFormatPane, null},
-                new Component[]{richTextProgressFormatPane, null}
-        };
-    }
-
     protected double[] getRowSize(double p){
         return new double[]{p,p,p,p,p,p};
     }
@@ -135,43 +131,6 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
         }
     }
 
-    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
-        if(attrTooltipContent instanceof AttrGanttTooltipContent){
-            setRichTextAttr(new AttrTooltipRichText());
-
-            AttrGanttTooltipContent ganttTooltipContent = (AttrGanttTooltipContent) attrTooltipContent;
-            Map<String, String> params = getRichTextAttr().getParams();
-
-            AttrTooltipProcessesFormat processesFormat = ganttTooltipContent.getRichTextProcessesFormat();
-            richTextProcessesFormatPane.populate(processesFormat);
-            richTextProcessesFormatPane.updateFormatParams(params, processesFormat.getJs());
-
-            AttrTooltipSeriesFormat seriesFormat = ganttTooltipContent.getRichTextSeriesFormat();
-            getRichTextSeriesNameFormatPane().populate(seriesFormat);
-            getRichTextSeriesNameFormatPane().updateFormatParams(params, seriesFormat.getJs());
-
-            AttrTooltipStartTimeFormat startTimeFormat = ganttTooltipContent.getRichTextStartTimeFormat();
-            richTextStartTimeFormatPane.populate(startTimeFormat);
-            richTextStartTimeFormatPane.updateFormatParams(params, startTimeFormat.getJs());
-
-            AttrTooltipEndTimeFormat endTimeFormat = ganttTooltipContent.getRichTextEndTimeFormat();
-            richTextEndTimeFormatPane.populate(endTimeFormat);
-            richTextEndTimeFormatPane.updateFormatParams(params, endTimeFormat.getJs());
-
-            AttrTooltipDurationFormat durationFormat = ganttTooltipContent.getRichTextDurationFormat();
-            richTextDurationFormatPane.populate(durationFormat);
-            richTextDurationFormatPane.updateFormatParams(params, durationFormat.getJs());
-
-            AttrTooltipProgressFormat progressFormat = ganttTooltipContent.getRichTextProgressFormat();
-            richTextProgressFormatPane.populate(progressFormat);
-            richTextProgressFormatPane.updateFormatParams(params, progressFormat.getJs());
-
-            populateRichText(attrTooltipContent.getRichTextAttr());
-
-            checkRichEditorState(attrTooltipContent);
-        }
-    }
-
     protected void updateFormatPane(AttrTooltipContent attrTooltipContent) {
         if (attrTooltipContent instanceof AttrGanttTooltipContent){
             AttrGanttTooltipContent ganttTooltipContent = (AttrGanttTooltipContent) attrTooltipContent;
@@ -184,16 +143,18 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
         }
     }
 
-    protected void updateRichEditor(AttrTooltipContent attrTooltipContent) {
+    protected void updateTooltipFormat(AttrTooltipContent target, AttrTooltipContent source) {
-        if(attrTooltipContent instanceof AttrGanttTooltipContent) {
+        super.updateTooltipFormat(target, source);
-            AttrGanttTooltipContent ganttTooltipContent = (AttrGanttTooltipContent) attrTooltipContent;
+
+        if (target instanceof AttrGanttTooltipContent && source instanceof AttrGanttTooltipContent) {
+            AttrGanttTooltipContent targetGantt = (AttrGanttTooltipContent) target;
+            AttrGanttTooltipContent sourceGantt = (AttrGanttTooltipContent) source;
 
-            richTextProcessesFormatPane.update(ganttTooltipContent.getRichTextProcessesFormat());
+            targetGantt.setRichTextProcessesFormat(sourceGantt.getRichTextProcessesFormat());
-            getRichTextSeriesNameFormatPane().update(ganttTooltipContent.getRichTextSeriesFormat());
+            targetGantt.setRichTextStartTimeFormat(sourceGantt.getRichTextStartTimeFormat());
-            richTextStartTimeFormatPane.update(ganttTooltipContent.getRichTextStartTimeFormat());
+            targetGantt.setRichTextEndTimeFormat(sourceGantt.getRichTextEndTimeFormat());
-            richTextEndTimeFormatPane.update(ganttTooltipContent.getRichTextEndTimeFormat());
+            targetGantt.setRichTextDurationFormat(sourceGantt.getRichTextDurationFormat());
-            richTextDurationFormatPane.update(ganttTooltipContent.getRichTextDurationFormat());
+            targetGantt.setRichTextProgressFormat(sourceGantt.getRichTextProgressFormat());
-            richTextProgressFormatPane.update(ganttTooltipContent.getRichTextProgressFormat());
         }
     }
 

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

@@ -1,6 +1,7 @@
 package com.fr.van.chart.map.designer.style.label;
 
 import com.fr.design.i18n.Toolkit;
+import com.fr.design.ui.ModernUIPane;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.base.format.AttrTooltipAreaNameFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipFormat;
@@ -14,7 +15,12 @@ import com.fr.van.chart.designer.component.format.MapAreaNameFormatPaneWithCheck
 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.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+import com.fr.van.chart.designer.component.richText.VanChartRichTextPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
+import com.fr.van.chart.map.designer.style.VanChartMapRichTextFieldListPane;
 
 import javax.swing.JPanel;
 
@@ -35,6 +41,20 @@ public class VanChartMapLabelContentPane extends VanChartLabelContentPane {
         setPercentFormatPane(new PercentFormatPaneWithCheckBox(parent, showOnPane));
     }
 
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+
+        return new VanChartRichTextPane(richEditorPane) {
+
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                return new VanChartMapRichTextFieldListPane(fieldAttrPane, richEditor);
+            }
+
+            protected AttrTooltipContent getInitialTooltipContent() {
+                return createAttrTooltip();
+            }
+        };
+    }
+
     protected String[] getRichTextFieldNames() {
         return new String[]{
                 Toolkit.i18nText("Fine-Design_Chart_Area_Name"),

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

@@ -3,9 +3,7 @@ package com.fr.van.chart.map.designer.style.tooltip;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.base.format.AttrTooltipAreaNameFormat;
 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;
@@ -35,14 +33,6 @@ public class VanChartMapRefreshTooltipContentPane extends VanChartMapTooltipCont
         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[]{getCategoryNameFormatPane(), null},
@@ -54,17 +44,6 @@ public class VanChartMapRefreshTooltipContentPane extends VanChartMapTooltipCont
         };
     }
 
-    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}
-        };
-    }
-
     @Override
     protected AttrTooltipContent createAttrTooltip() {
         AttrTooltipContent content = new AttrTooltipContent();

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

@@ -1,6 +1,7 @@
 package com.fr.van.chart.map.designer.style.tooltip;
 
 import com.fr.design.i18n.Toolkit;
+import com.fr.design.ui.ModernUIPane;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.base.format.AttrTooltipAreaNameFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipFormat;
@@ -13,7 +14,12 @@ import com.fr.van.chart.designer.component.format.MapAreaNameFormatPaneWithCheck
 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.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+import com.fr.van.chart.designer.component.richText.VanChartRichTextPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
+import com.fr.van.chart.map.designer.style.VanChartMapRichTextFieldListPane;
 
 import javax.swing.JPanel;
 
@@ -33,6 +39,20 @@ public class VanChartMapTooltipContentPane extends VanChartTooltipContentPane {
         setPercentFormatPane(new PercentFormatPaneWithCheckBox(parent, showOnPane));
     }
 
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+
+        return new VanChartRichTextPane(richEditorPane) {
+
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                return new VanChartMapRichTextFieldListPane(fieldAttrPane, richEditor);
+            }
+
+            protected AttrTooltipContent getInitialTooltipContent() {
+                return createAttrTooltip();
+            }
+        };
+    }
+
     protected String[] getRichTextFieldNames() {
         return new String[]{
                 Toolkit.i18nText("Fine-Design_Chart_Area_Name"),

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

@@ -0,0 +1,41 @@
+package com.fr.van.chart.map.line;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.ui.ModernUIPane;
+import com.fr.plugin.chart.base.format.AttrTooltipPercentFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipSeriesFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipStartAndEndNameFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
+import com.fr.van.chart.designer.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldButton;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListener;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+
+public class VanChartLineMapRichTextFieldListPane extends VanChartFieldListPane {
+
+    public VanChartLineMapRichTextFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+        super(fieldAttrPane, richEditorPane);
+    }
+
+    protected void initDefaultFieldButton() {
+        VanChartFieldListener fieldListener = getFieldListener();
+
+        VanChartFieldButton categoryNameButton = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Start_And_End"),
+                new AttrTooltipStartAndEndNameFormat(), false, fieldListener);
+
+        VanChartFieldButton seriesNameButton = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Series_Name"),
+                new AttrTooltipSeriesFormat(), false, fieldListener);
+
+        VanChartFieldButton valueButton = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Use_Value"),
+                new AttrTooltipValueFormat(), false, fieldListener);
+
+        VanChartFieldButton percentButton = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Use_Percent"),
+                new AttrTooltipPercentFormat(), false, fieldListener);
+
+        setCategoryNameButton(categoryNameButton);
+        setSeriesNameButton(seriesNameButton);
+        setValueButton(valueButton);
+        setPercentButton(percentButton);
+    }
+}

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

@@ -1,15 +1,21 @@
 package com.fr.van.chart.map.line;
 
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.ui.ModernUIPane;
 import com.fr.plugin.chart.base.AttrTooltipContent;
+import com.fr.plugin.chart.base.format.AttrTooltipFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipPercentFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipSeriesFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipStartAndEndNameFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
 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.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+import com.fr.van.chart.designer.component.richText.VanChartRichTextPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -30,12 +36,36 @@ public class VanChartLineMapTooltipContentPane extends VanChartTooltipContentPan
         setPercentFormatPane(new PercentFormatPaneWithCheckBox(parent, showOnPane));
     }
 
-    @Override
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
-    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+
-        setRichTextCategoryNameFormatPane(new StartAndEndNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        return new VanChartRichTextPane(richEditorPane) {
-        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
+
-        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
-        setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
+                return new VanChartLineMapRichTextFieldListPane(fieldAttrPane, richEditor);
+            }
+
+            protected AttrTooltipContent getInitialTooltipContent() {
+                return createAttrTooltip();
+            }
+        };
+    }
+
+    protected String[] getRichTextFieldNames() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Start_And_End"),
+                Toolkit.i18nText("Fine-Design_Chart_Series_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_Use_Value"),
+                Toolkit.i18nText("Fine-Design_Chart_Use_Percent")
+        };
+    }
+
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
+        return new AttrTooltipFormat[]{
+                new AttrTooltipStartAndEndNameFormat(),
+                new AttrTooltipSeriesFormat(),
+                new AttrTooltipValueFormat(),
+                new AttrTooltipPercentFormat()
+        };
     }
 
     @Override

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

@@ -1,13 +1,21 @@
 package com.fr.van.chart.multilayer.style;
 
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.ui.ModernUIPane;
 import com.fr.plugin.chart.base.AttrTooltipContent;
+import com.fr.plugin.chart.base.format.AttrTooltipFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipPercentFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipSeriesFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
 import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat;
 import com.fr.plugin.chart.type.TextAlign;
 import com.fr.van.chart.designer.component.VanChartLabelContentPane;
 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.ValueFormatPaneWithCheckBox;
-import com.fr.van.chart.designer.component.format.ValueFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+import com.fr.van.chart.designer.component.richText.VanChartRichTextPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -28,12 +36,35 @@ public class VanChartMultiPieLabelContentPane extends VanChartLabelContentPane {
         setPercentFormatPane(new PercentFormatPaneWithCheckBox(parent, showOnPane));
     }
 
-    @Override
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
-    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        return new VanChartRichTextPane(richEditorPane) {
-        setRichTextCategoryNameFormatPane(new MultiPieLevelNameFormatPaneWithoutCheckBox(parent, showOnPane));
+
-        setRichTextSeriesNameFormatPane(new MultiPieSeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
-        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
+                return new VanChartMultiPieRichTextFieldListPane(fieldAttrPane, richEditor);
-        setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
+            }
+
+            protected AttrTooltipContent getInitialTooltipContent() {
+                return createAttrTooltip();
+            }
+        };
+    }
+
+    protected String[] getRichTextFieldNames() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Level_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_Use_Value"),
+                Toolkit.i18nText("Fine-Design_Chart_Use_Percent")
+        };
+    }
+
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
+        return new AttrTooltipFormat[]{
+                new AttrTooltipMultiLevelNameFormat(),
+                new AttrTooltipSeriesFormat(),
+                new AttrTooltipValueFormat(),
+                new AttrTooltipPercentFormat()
+        };
     }
 
     protected AttrTooltipContent createAttrTooltip() {

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

@@ -0,0 +1,41 @@
+package com.fr.van.chart.multilayer.style;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.ui.ModernUIPane;
+import com.fr.plugin.chart.base.format.AttrTooltipPercentFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipSeriesFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
+import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat;
+import com.fr.van.chart.designer.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldButton;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListener;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+
+public class VanChartMultiPieRichTextFieldListPane extends VanChartFieldListPane {
+
+    public VanChartMultiPieRichTextFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+        super(fieldAttrPane, richEditorPane);
+    }
+
+    protected void initDefaultFieldButton() {
+        VanChartFieldListener fieldListener = getFieldListener();
+
+        VanChartFieldButton categoryNameButton = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Level_Name"),
+                new AttrTooltipMultiLevelNameFormat(), false, fieldListener);
+
+        VanChartFieldButton seriesNameButton = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"),
+                new AttrTooltipSeriesFormat(), false, fieldListener);
+
+        VanChartFieldButton valueButton = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Use_Value"),
+                new AttrTooltipValueFormat(), false, fieldListener);
+
+        VanChartFieldButton percentButton = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Use_Percent"),
+                new AttrTooltipPercentFormat(), false, fieldListener);
+
+        setCategoryNameButton(categoryNameButton);
+        setSeriesNameButton(seriesNameButton);
+        setValueButton(valueButton);
+        setPercentButton(percentButton);
+    }
+}

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

@@ -1,12 +1,20 @@
 package com.fr.van.chart.multilayer.style;
 
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.ui.ModernUIPane;
 import com.fr.plugin.chart.base.AttrTooltipContent;
+import com.fr.plugin.chart.base.format.AttrTooltipFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipPercentFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipSeriesFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
 import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
 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.ValueFormatPaneWithCheckBox;
-import com.fr.van.chart.designer.component.format.ValueFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+import com.fr.van.chart.designer.component.richText.VanChartRichTextPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -27,12 +35,35 @@ public class VanChartMultiPieTooltipContentPane extends VanChartTooltipContentPa
         setPercentFormatPane(new PercentFormatPaneWithCheckBox(parent, showOnPane));
     }
 
-    @Override
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
-    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        return new VanChartRichTextPane(richEditorPane) {
-        setRichTextCategoryNameFormatPane(new MultiPieLevelNameFormatPaneWithoutCheckBox(parent, showOnPane));
+
-        setRichTextSeriesNameFormatPane(new MultiPieSeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
-        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
+                return new VanChartMultiPieRichTextFieldListPane(fieldAttrPane, richEditor);
-        setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
+            }
+
+            protected AttrTooltipContent getInitialTooltipContent() {
+                return createAttrTooltip();
+            }
+        };
+    }
+
+    protected String[] getRichTextFieldNames() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Level_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_Use_Value"),
+                Toolkit.i18nText("Fine-Design_Chart_Use_Percent")
+        };
+    }
+
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
+        return new AttrTooltipFormat[]{
+                new AttrTooltipMultiLevelNameFormat(),
+                new AttrTooltipSeriesFormat(),
+                new AttrTooltipValueFormat(),
+                new AttrTooltipPercentFormat()
+        };
     }
 
     @Override

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

@@ -31,14 +31,6 @@ public class VanChartMutiPieRefreshTooltipContentPane extends VanChartMultiPieTo
         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){
         return new double[]{p,p,p,p,p,p};
     }
@@ -53,16 +45,4 @@ public class VanChartMutiPieRefreshTooltipContentPane extends VanChartMultiPieTo
                 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/pie/style/VanChartPieCategoryLabelContentPane.java

@@ -1,16 +1,20 @@
 package com.fr.van.chart.pie.style;
 
+import com.fr.design.i18n.Toolkit;
 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.AttrTooltipCategoryFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipSummaryValueFormat;
 import com.fr.plugin.chart.pie.attr.PieCategoryLabelContent;
 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.SummaryValueFormatPaneWithCheckBox;
-import com.fr.van.chart.designer.component.format.SummaryValueFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.richText.VanChartFieldAttrPane;
-import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+import com.fr.van.chart.designer.component.richText.VanChartRichTextPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -25,8 +29,6 @@ public class VanChartPieCategoryLabelContentPane extends VanChartLabelContentPan
 
     private SummaryValueFormatPaneWithCheckBox summaryValueFormatPane;
 
-    private SummaryValueFormatPaneWithoutCheckBox richTextSummaryValueFormatPane;
-
     public VanChartPieCategoryLabelContentPane(VanChartStylePane parent, JPanel showOnPane, boolean inCondition) {
         super(parent, showOnPane, inCondition);
     }
@@ -42,25 +44,39 @@ public class VanChartPieCategoryLabelContentPane extends VanChartLabelContentPan
         summaryValueFormatPane = new SummaryValueFormatPaneWithCheckBox(parent, showOnPane);
     }
 
-    @Override
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
-    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+
-        setRichTextCategoryNameFormatPane(new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        return new VanChartRichTextPane(richEditorPane) {
-        richTextSummaryValueFormatPane = new SummaryValueFormatPaneWithoutCheckBox(parent, showOnPane);
+
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                return new VanChartPieCategoryRichTextFieldListPane(fieldAttrPane, richEditor);
+            }
+
+            protected AttrTooltipContent getInitialTooltipContent() {
+                return createAttrTooltip();
+            }
+        };
     }
 
-    @Override
+    protected String[] getRichTextFieldNames() {
-    protected Component[][] getPaneComponents() {
+        return new String[]{
-        return new Component[][]{
+                Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name"),
-                new Component[]{getCategoryNameFormatPane(), null},
+                Toolkit.i18nText("Fine-Design_Chart_Use_Summary_Value")
-                new Component[]{summaryValueFormatPane, null},
+        };
+    }
+
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
+        return new AttrTooltipFormat[]{
+                new AttrTooltipCategoryFormat(),
+                new AttrTooltipSummaryValueFormat()
         };
     }
 
     @Override
-    protected Component[][] getRichTextComponents() {
+    protected Component[][] getPaneComponents() {
         return new Component[][]{
-                new Component[]{getRichTextCategoryNameFormatPane(), null},
+                new Component[]{getCategoryNameFormatPane(), null},
-                new Component[]{richTextSummaryValueFormatPane, null},
+                new Component[]{summaryValueFormatPane, null},
         };
     }
 
@@ -81,23 +97,15 @@ public class VanChartPieCategoryLabelContentPane extends VanChartLabelContentPan
         summaryValueFormatPane.populate(pieCategoryLabelContent.getSummaryValueFormat());
     }
 
-    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+    protected void updateTooltipFormat(AttrTooltipContent target, AttrTooltipContent source) {
-        PieCategoryLabelContent pieCategoryLabelContent = (PieCategoryLabelContent) attrTooltipContent;
+        super.updateTooltipFormat(target, source);
-        VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
-                getRichTextCategoryNameFormatPane(),
-                richTextSummaryValueFormatPane
-        };
-
-        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
-                pieCategoryLabelContent.getRichTextCategoryFormat(),
-                pieCategoryLabelContent.getRichTextSummaryValueFormat()
-        };
 
-        setRichTextAttr(new AttrTooltipRichText());
+        if (target instanceof PieCategoryLabelContent && source instanceof PieCategoryLabelContent) {
-        populateRichTextFormat(formatPaneGroup, formatGroup);
+            PieCategoryLabelContent targetPieCategory = (PieCategoryLabelContent) target;
-        populateRichText(pieCategoryLabelContent.getRichTextAttr());
+            PieCategoryLabelContent sourcePieCategory = (PieCategoryLabelContent) source;
 
-        checkRichEditorState(pieCategoryLabelContent);
+            targetPieCategory.setRichTextSummaryValueFormat(sourcePieCategory.getRichTextSummaryValueFormat());
+        }
     }
 
     @Override
@@ -107,12 +115,6 @@ public class VanChartPieCategoryLabelContentPane extends VanChartLabelContentPan
         summaryValueFormatPane.update(pieCategoryLabelContent.getSummaryValueFormat());
     }
 
-    protected void updateRichEditor(AttrTooltipContent attrTooltipContent) {
-        PieCategoryLabelContent pieCategoryLabelContent = (PieCategoryLabelContent) attrTooltipContent;
-        super.updateRichEditor(pieCategoryLabelContent);
-        richTextSummaryValueFormatPane.update(pieCategoryLabelContent.getRichTextSummaryValueFormat());
-    }
-
     @Override
     public void setDirty(boolean isDirty) {
         getCategoryNameFormatPane().setDirty(isDirty);

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

@@ -0,0 +1,70 @@
+package com.fr.van.chart.pie.style;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.ui.ModernUIPane;
+import com.fr.plugin.chart.base.AttrTooltipContent;
+import com.fr.plugin.chart.base.format.AttrTooltipSummaryValueFormat;
+import com.fr.plugin.chart.pie.attr.PieCategoryLabelContent;
+import com.fr.van.chart.designer.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldButton;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListener;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+
+import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.List;
+
+public class VanChartPieCategoryRichTextFieldListPane extends VanChartFieldListPane {
+
+    private VanChartFieldButton summaryValueButton;
+
+    public VanChartPieCategoryRichTextFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+        super(fieldAttrPane, richEditorPane);
+    }
+
+    protected void initDefaultFieldButton() {
+        super.initDefaultFieldButton();
+
+        VanChartFieldListener listener = getFieldListener();
+
+        summaryValueButton = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Use_Summary_Value"),
+                new AttrTooltipSummaryValueFormat(), false, listener);
+    }
+
+    protected boolean supportAddField() {
+        return false;
+    }
+
+    protected void addDefaultFieldButton(JPanel fieldPane) {
+        fieldPane.add(getCategoryNameButton());
+        fieldPane.add(summaryValueButton);
+    }
+
+    protected List<VanChartFieldButton> getDefaultFieldButtonList() {
+        List<VanChartFieldButton> fieldButtonList = new ArrayList<>();
+
+        fieldButtonList.add(getCategoryNameButton());
+        fieldButtonList.add(summaryValueButton);
+
+        return fieldButtonList;
+    }
+
+    public void populateDefaultField(AttrTooltipContent tooltipContent) {
+        super.populateDefaultField(tooltipContent);
+
+        if (tooltipContent instanceof PieCategoryLabelContent) {
+            PieCategoryLabelContent pieCategory = (PieCategoryLabelContent) tooltipContent;
+            populateButtonFormat(summaryValueButton, pieCategory.getRichTextSummaryValueFormat());
+        }
+    }
+
+    public void updateDefaultField(AttrTooltipContent tooltipContent) {
+        super.updateDefaultField(tooltipContent);
+
+        if (tooltipContent instanceof PieCategoryLabelContent) {
+            PieCategoryLabelContent pieCategory = (PieCategoryLabelContent) tooltipContent;
+            updateButtonFormat(summaryValueButton, pieCategory.getRichTextSummaryValueFormat());
+        }
+    }
+}

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

@@ -1,12 +1,20 @@
 package com.fr.van.chart.pie.style;
 
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.ui.ModernUIPane;
+import com.fr.plugin.chart.base.AttrTooltipContent;
+import com.fr.plugin.chart.base.format.AttrTooltipFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipPercentFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipSeriesFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
 import com.fr.van.chart.designer.component.VanChartLabelContentPane;
 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.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+import com.fr.van.chart.designer.component.richText.VanChartRichTextPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -35,11 +43,34 @@ public class VanChartPieValueLabelContentPane extends VanChartLabelContentPane {
         setPercentFormatPane(new PercentFormatPaneWithCheckBox(parent, showOnPane));
     }
 
-    @Override
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
-    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+
-        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        return new VanChartRichTextPane(richEditorPane) {
-        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
+
-        setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                return new VanChartPieValueRichTextFieldListPane(fieldAttrPane, richEditor);
+            }
+
+            protected AttrTooltipContent getInitialTooltipContent() {
+                return createAttrTooltip();
+            }
+        };
+    }
+
+    protected String[] getRichTextFieldNames() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Series_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_Use_Value"),
+                Toolkit.i18nText("Fine-Design_Chart_Use_Percent")
+        };
+    }
+
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
+        return new AttrTooltipFormat[]{
+                new AttrTooltipSeriesFormat(),
+                new AttrTooltipValueFormat(),
+                new AttrTooltipPercentFormat()
+        };
     }
 
     @Override
@@ -56,15 +87,6 @@ public class VanChartPieValueLabelContentPane extends VanChartLabelContentPane {
         };
     }
 
-    @Override
-    protected Component[][] getRichTextComponents() {
-        return new Component[][]{
-                new Component[]{getRichTextSeriesNameFormatPane(), null},
-                new Component[]{getRichTextValueFormatPane(), null},
-                new Component[]{getRichTextPercentFormatPane(), null}
-        };
-    }
-
     @Override
     public void setDirty(boolean isDirty) {
         getSeriesNameFormatPane().setDirty(isDirty);

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

@@ -0,0 +1,34 @@
+package com.fr.van.chart.pie.style;
+
+import com.fr.design.ui.ModernUIPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldButton;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+
+import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.List;
+
+public class VanChartPieValueRichTextFieldListPane extends VanChartFieldListPane {
+
+    public VanChartPieValueRichTextFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+        super(fieldAttrPane, richEditorPane);
+    }
+
+    protected void addDefaultFieldButton(JPanel fieldPane) {
+        fieldPane.add(getSeriesNameButton());
+        fieldPane.add(getValueButton());
+        fieldPane.add(getPercentButton());
+    }
+
+    protected List<VanChartFieldButton> getDefaultFieldButtonList() {
+        List<VanChartFieldButton> fieldButtonList = new ArrayList<>();
+
+        fieldButtonList.add(getSeriesNameButton());
+        fieldButtonList.add(getValueButton());
+        fieldButtonList.add(getPercentButton());
+
+        return fieldButtonList;
+    }
+}

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

@@ -1,13 +1,9 @@
 package com.fr.van.chart.scatter;
 
 import com.fr.plugin.chart.base.AttrTooltipContent;
-import com.fr.plugin.chart.base.format.AttrTooltipFormat;
 import com.fr.plugin.chart.scatter.attr.ScatterAttrTooltipContent;
 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.VanChartFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -19,7 +15,6 @@ import java.awt.Component;
 public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterTooltipContentPane {
 
     private ChangedValueFormatPaneWithCheckBox changedSizeFormatPane;
-    private ChangedValueFormatPaneWithoutCheckBox richTextChangedSizeFormatPane;
 
     public VanChartScatterRefreshTooltipContentPane(VanChartStylePane parent, JPanel showOnPane) {
         super(null, showOnPane);
@@ -33,14 +28,6 @@ public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterToo
         setChangedPercentFormatPane(changedPercentFormatPane);
     }
 
-    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        super.initRichTextFormatPane(parent, showOnPane);
-
-        richTextChangedSizeFormatPane = new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane);
-        ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane = new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane);
-        setRichTextChangedPercentFormatPane(richTextChangedPercentFormatPane);
-    }
-
     protected boolean supportRichEditor() {
         return false;
     }
@@ -60,12 +47,6 @@ public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterToo
         };
     }
 
-    @Override
-    protected Component[][] getRichTextComponents() {
-        return null;
-    }
-
-
     @Override
     protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
         super.populateFormatPane(attrTooltipContent);
@@ -77,27 +58,6 @@ public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterToo
         }
     }
 
-    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
-        super.populateRichEditor(attrTooltipContent);
-
-        if (attrTooltipContent instanceof ScatterAttrTooltipContent) {
-            ScatterAttrTooltipContent scatterAttrTooltipContent = (ScatterAttrTooltipContent) attrTooltipContent;
-
-            VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
-                    richTextChangedSizeFormatPane,
-                    getRichTextChangedPercentFormatPane()
-            };
-
-            AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
-                    scatterAttrTooltipContent.getRichTextChangeSizeFormat(),
-                    scatterAttrTooltipContent.getRichTextChangedSizePercentFormat()
-            };
-
-            populateRichTextFormat(formatPaneGroup, formatGroup);
-            populateRichText(attrTooltipContent.getRichTextAttr());
-        }
-    }
-
     @Override
     protected void updateFormatPane(AttrTooltipContent attrTooltipContent) {
         super.updateFormatPane(attrTooltipContent);
@@ -108,16 +68,6 @@ public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterToo
         }
     }
 
-    protected void updateRichEditor(AttrTooltipContent attrTooltipContent) {
-        super.updateRichEditor(attrTooltipContent);
-
-        if (attrTooltipContent instanceof ScatterAttrTooltipContent) {
-            ScatterAttrTooltipContent scatterAttrTooltipContent = (ScatterAttrTooltipContent) attrTooltipContent;
-            richTextChangedSizeFormatPane.update(scatterAttrTooltipContent.getRichTextChangeSizeFormat());
-            getRichTextChangedPercentFormatPane().update(scatterAttrTooltipContent.getRichTextChangedSizePercentFormat());
-        }
-    }
-
     @Override
     public void setDirty(boolean isDirty) {
         super.setDirty(isDirty);

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

@@ -1,9 +1,7 @@
 package com.fr.van.chart.structure.desinger.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;
@@ -28,16 +26,6 @@ public class VanChartStructureRefreshTooltipContentPane extends VanChartStructur
         setChangedPercentFormatPane(changedPercentFormatPane);
     }
 
-    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        super.initRichTextFormatPane(parent, showOnPane);
-
-        ChangedValueFormatPaneWithoutCheckBox richTextChangedValueFormatPane = new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane);
-        ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane = new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane);
-
-        setRichTextChangedValueFormatPane(richTextChangedValueFormatPane);
-        setRichTextChangedPercentFormatPane(richTextChangedPercentFormatPane);
-    }
-
     protected boolean supportRichEditor() {
         return false;
     }
@@ -55,14 +43,4 @@ public class VanChartStructureRefreshTooltipContentPane extends VanChartStructur
                 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[]{getRichTextChangedPercentFormatPane(), null}
-        };
-    }
 }

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

@@ -0,0 +1,61 @@
+package com.fr.van.chart.structure.desinger.style;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.ui.ModernUIPane;
+import com.fr.plugin.chart.base.format.AttrTooltipPercentFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipSeriesFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
+import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat;
+import com.fr.van.chart.designer.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldButton;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListener;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+
+import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.List;
+
+public class VanChartStructureRichTextFieldListPane extends VanChartFieldListPane {
+
+    public VanChartStructureRichTextFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+        super(fieldAttrPane, richEditorPane);
+    }
+
+    protected void initDefaultFieldButton() {
+        VanChartFieldListener fieldListener = getFieldListener();
+
+        VanChartFieldButton categoryNameButton = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Node_Name"),
+                new AttrTooltipMultiLevelNameFormat(), false, fieldListener);
+
+        VanChartFieldButton seriesNameButton = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"),
+                new AttrTooltipSeriesFormat(), false, fieldListener);
+
+        VanChartFieldButton valueButton = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Use_Value"),
+                new AttrTooltipValueFormat(), false, fieldListener);
+
+        VanChartFieldButton percentButton = new VanChartFieldButton(Toolkit.i18nText("Fine-Design_Chart_Use_Percent"),
+                new AttrTooltipPercentFormat(), false, fieldListener);
+
+        setCategoryNameButton(categoryNameButton);
+        setSeriesNameButton(seriesNameButton);
+        setValueButton(valueButton);
+        setPercentButton(percentButton);
+    }
+
+    protected void addDefaultFieldButton(JPanel fieldPane) {
+        fieldPane.add(getCategoryNameButton());
+        fieldPane.add(getSeriesNameButton());
+        fieldPane.add(getValueButton());
+    }
+
+    protected List<VanChartFieldButton> getDefaultFieldButtonList() {
+        List<VanChartFieldButton> fieldButtonList = new ArrayList<>();
+
+        fieldButtonList.add(getCategoryNameButton());
+        fieldButtonList.add(getSeriesNameButton());
+        fieldButtonList.add(getValueButton());
+
+        return fieldButtonList;
+    }
+}

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

@@ -2,20 +2,21 @@ package com.fr.van.chart.structure.desinger.style;
 
 
 import com.fr.design.i18n.Toolkit;
+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.plugin.chart.base.format.AttrTooltipSeriesFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
 import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat;
 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.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.richText.VanChartFieldAttrPane;
-import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+import com.fr.van.chart.designer.component.richText.VanChartRichTextPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -38,15 +39,6 @@ public class VanChartStructureTooltipContentPane extends VanChartTooltipContentP
         };
     }
 
-    @Override
-    protected Component[][] getRichTextComponents() {
-        return new Component[][]{
-                new Component[]{getRichTextCategoryNameFormatPane(), null},
-                new Component[]{getRichTextSeriesNameFormatPane(), null},
-                new Component[]{getRichTextValueFormatPane(), null}
-        };
-    }
-
     @Override
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
         CategoryNameFormatPaneWithCheckBox categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane) {
@@ -70,44 +62,34 @@ public class VanChartStructureTooltipContentPane extends VanChartTooltipContentP
         setPercentFormatPane(percentFormatPane);
     }
 
-    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
-        CategoryNameFormatPaneWithoutCheckBox richTextCategoryNameFormatPane = new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane) {
+
-            protected String getCheckBoxText() {
+        return new VanChartRichTextPane(richEditorPane) {
-                return Toolkit.i18nText("Fine-Design_Chart_Node_Name");
+
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                return new VanChartStructureRichTextFieldListPane(fieldAttrPane, richEditor);
             }
-        };
+
-        SeriesNameFormatPaneWithoutCheckBox richTextSeriesNameFormatPane = new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected AttrTooltipContent getInitialTooltipContent() {
-            protected String getCheckBoxText() {
+                return createAttrTooltip();
-                return Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name");
             }
         };
-        ValueFormatPaneWithoutCheckBox richTextValueFormatPane = new ValueFormatPaneWithoutCheckBox(parent, showOnPane);
-        PercentFormatPaneWithoutCheckBox richTextPercentFormatPane = new PercentFormatPaneWithoutCheckBox(parent, showOnPane);
-
-        setRichTextCategoryNameFormatPane(richTextCategoryNameFormatPane);
-        setRichTextSeriesNameFormatPane(richTextSeriesNameFormatPane);
-        setRichTextValueFormatPane(richTextValueFormatPane);
-        setRichTextPercentFormatPane(richTextPercentFormatPane);
     }
 
-    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+    protected String[] getRichTextFieldNames() {
-        VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
+        return new String[]{
-                getRichTextCategoryNameFormatPane(),
+                Toolkit.i18nText("Fine-Design_Chart_Node_Name"),
-                getRichTextSeriesNameFormatPane(),
+                Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"),
-                getRichTextValueFormatPane()
+                Toolkit.i18nText("Fine-Design_Chart_Use_Value")
         };
+    }
 
-        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
-                attrTooltipContent.getRichTextCategoryFormat(),
+        return new AttrTooltipFormat[]{
-                attrTooltipContent.getRichTextSeriesFormat(),
+                new AttrTooltipMultiLevelNameFormat(),
-                attrTooltipContent.getRichTextValueFormat()
+                new AttrTooltipSeriesFormat(),
+                new AttrTooltipValueFormat()
         };
-
-        setRichTextAttr(new AttrTooltipRichText());
-        populateRichTextFormat(formatPaneGroup, formatGroup);
-        populateRichText(attrTooltipContent.getRichTextAttr());
-
-        checkRichEditorState(attrTooltipContent);
     }
 
     @Override

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

@@ -3,9 +3,7 @@ package com.fr.van.chart.wordcloud.designer.style;
 
 import com.fr.design.i18n.Toolkit;
 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;
@@ -36,21 +34,6 @@ public class VanChartWordCloudRefreshTooltipContentPane extends VanChartWordClou
         setChangedPercentFormatPane(changedPercentFormatPane);
     }
 
-    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        super.initRichTextFormatPane(parent, showOnPane);
-
-        ChangedValueFormatPaneWithoutCheckBox richTextChangedValueFormatPane = new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane) {
-            protected String getCheckBoxText() {
-                return Toolkit.i18nText("Fine-Design_Chart_Change_Word_Value");
-            }
-        };
-
-        ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane = new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane);
-
-        setRichTextChangedValueFormatPane(richTextChangedValueFormatPane);
-        setRichTextChangedPercentFormatPane(richTextChangedPercentFormatPane);
-    }
-
     protected boolean supportRichEditor() {
         return false;
     }
@@ -69,15 +52,4 @@ public class VanChartWordCloudRefreshTooltipContentPane extends VanChartWordClou
                 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-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java

@@ -3,6 +3,8 @@ package com.fr.start.module;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.EnvChangeEntrance;
 import com.fr.design.constants.DesignerLaunchStatus;
+import com.fr.design.editlock.ConnectionLockChangeChecker;
+import com.fr.design.editlock.ServerTableDataLockChangeChecker;
 import com.fr.design.env.DesignerWorkspaceGenerator;
 import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.env.LocalDesignerWorkspaceInfo;
@@ -88,6 +90,12 @@ public class DesignerWorkspaceProvider extends Activator {
             }
         }
         pluginErrorRemind();
+        editLockCheckerStart();
+    }
+
+    private void editLockCheckerStart() {
+        ConnectionLockChangeChecker.getInstance().start();
+        ServerTableDataLockChangeChecker.getInstance().start();
     }
 
     private void pluginErrorRemind() {
@@ -102,6 +110,12 @@ public class DesignerWorkspaceProvider extends Activator {
     @Override
     public void stop() {
         // void
+        editLockCheckerStop();
+    }
+
+    private void editLockCheckerStop() {
+        ConnectionLockChangeChecker.getInstance().stop();
+        ServerTableDataLockChangeChecker.getInstance().stop();
     }
 
     @Override