From 0368ee251bf5936f59d1abee25cf506608b9c603 Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Thu, 21 Jan 2021 10:16:42 +0800
Subject: [PATCH 01/17] =?UTF-8?q?REPORT-43833=20=E3=80=9010.0.14=E3=80=91?=
 =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E6=95=B0=E6=8D=AE=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5/=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E5=A2=9E=E5=8A=A0=E9=94=81=E5=AE=9A=20=E3=80=90?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91=E8=BF=AD=E4=BB=A3?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=20=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D?=
 =?UTF-8?q?=E8=B7=AF=E3=80=91=E8=BF=AD=E4=BB=A3=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/actions/UpdateAction.java   | 52 +++++++-------
 .../actions/server/ConnectionListAction.java  | 39 +++++++++--
 .../actions/server/GlobalTableDataAction.java | 44 +++++++++++-
 .../design/data/BasicTableDataTreePane.java   | 23 +++++++
 .../connect/ConnectionComboBoxPanel.java      | 48 ++++++++++++-
 .../connect/ItemEditableComboBoxPanel.java    | 58 ++++++++--------
 .../editlock/ConnectionLockChangeChecker.java | 25 +++++++
 .../editlock/EditLockChangeChecker.java       | 67 ++++++++++++++++++
 .../design/editlock/EditLockChangeEvent.java  | 25 +++++++
 .../editlock/EditLockChangeListener.java      | 16 +++++
 .../com/fr/design/editlock/EditLockUtils.java | 69 +++++++++++++++++++
 .../ServerTableDataLockChangeChecker.java     | 23 +++++++
 .../fr/design/gui/ibutton/UILockButton.java   | 46 +++++++++++++
 .../fr/design/gui/imenu/UILockMenuItem.java   | 47 +++++++++++++
 .../fr/design/gui/imenu/UILockMenuItemUI.java | 28 ++++++++
 .../design/os/impl/DatabaseDialogAction.java  | 14 +++-
 .../images/m_web/connection_locked_normal.svg | 15 ++++
 .../fr/design/images/m_web/locked_normal.svg  | 14 ++++
 .../images/m_web/warningIcon_normal.svg       | 21 ++++++
 .../module/DesignerWorkspaceProvider.java     | 14 ++++
 20 files changed, 625 insertions(+), 63 deletions(-)
 create mode 100644 designer-base/src/main/java/com/fr/design/editlock/ConnectionLockChangeChecker.java
 create mode 100644 designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java
 create mode 100644 designer-base/src/main/java/com/fr/design/editlock/EditLockChangeEvent.java
 create mode 100644 designer-base/src/main/java/com/fr/design/editlock/EditLockChangeListener.java
 create mode 100644 designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java
 create mode 100644 designer-base/src/main/java/com/fr/design/editlock/ServerTableDataLockChangeChecker.java
 create mode 100644 designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java
 create mode 100644 designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItem.java
 create mode 100644 designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItemUI.java
 create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_web/connection_locked_normal.svg
 create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_web/locked_normal.svg
 create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_web/warningIcon_normal.svg

diff --git a/designer-base/src/main/java/com/fr/design/actions/UpdateAction.java b/designer-base/src/main/java/com/fr/design/actions/UpdateAction.java
index bb4ba4ccc..5c12ff29c 100644
--- a/designer-base/src/main/java/com/fr/design/actions/UpdateAction.java
+++ b/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();
-			// 添加一个名字作为自动化测试用
-			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);
+			object = initButton(button, UIButton.class.getName());
+		}
 
-			button.registerKeyboardAction(this, this.getAccelerator(), JComponent.WHEN_IN_FOCUSED_WINDOW);
+		return (JComponent) object;
+	}
 
-			this.putValue(UIButton.class.getName(), button);
-			button.setText(StringUtils.EMPTY);
-			button.setEnabled(this.isEnabled());
+	protected JComponent initButton(UIButton button, String name) {
+		// 添加一个名字作为自动化测试用
+		button.setName(getName());
+		button.set4ToolbarButton();
 
-			//peter:产生tooltip
-			button.setToolTipText(getToolTipText());
-			object = button;
+		//设置属性.
+		Integer mnemonicInteger = (Integer) this.getValue(Action.MNEMONIC_KEY);
+		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);
diff --git a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java
index 820de79e5..45502c073 100644
--- a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java
@@ -1,19 +1,25 @@
 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.ibutton.UILockButton;
+import com.fr.design.gui.imenu.UILockMenuItem;
+import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.menu.MenuKeySet;
+import com.fr.stable.StringUtils;
 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.workspace.server.lock.editlock.LockItem;
 
-import javax.swing.*;
+import javax.swing.KeyStroke;
 import java.awt.event.ActionEvent;
 import java.util.Map;
 
@@ -53,8 +59,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 +110,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, StringUtils.EMPTY, 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;
+    }
 }
diff --git a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
index 468fb1f98..14795066d 100644
--- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
+++ b/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,18 +12,24 @@ 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;
 import com.fr.file.TableDataConfig;
 
+import com.fr.stable.StringUtils;
 import com.fr.transaction.CallBackAdaptor;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.WorkerFacade;
+import com.fr.workspace.server.lock.editlock.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 +71,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 +103,8 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
                     globalTableDataDialog.setDoOKSucceed(false);
                     return;
                 }
-
+                // 关闭服务器数据集页面，为其解锁
+                EditLockUtils.unlock(LockItem.SERVER_TABLE_DATA);
                 DesignTableDataManager.clearGlobalDs();
                 // 保存时 移除服务器数据集列名缓存
                 for (String name : tableDataConfig.getTableDatas().keySet()) {
@@ -117,6 +131,13 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
                     }
                 }));
             }
+
+            @Override
+            public void doCancel() {
+                super.doCancel();
+                // 关闭服务器数据集页面，为其解锁
+                EditLockUtils.unlock(LockItem.SERVER_TABLE_DATA);
+            }
         });
         globalTableDataDialog.setVisible(true);
     }
@@ -166,4 +187,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, StringUtils.EMPTY, 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;
+    }
 }
diff --git a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
index 83740f685..34482d0d2 100644
--- a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
+++ b/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;
+        }
     }
 
     /**
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
index f4a7910b1..91813418b 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
+++ b/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.workspace.server.lock.editlock.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,25 @@ 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.setIcon(IconUtils.readIcon("/com/fr/design/images/m_web/connection"));
+        editButton.setPreferredSize(buttonSize);
+        editButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent evt) {
+                editItems();
+            }
+        });
+        ConnectionLockChangeChecker.getInstance().addEditLockChangeListener((UILockButton) editButton);
+        return editButton;
+    }
+
     /*
      * 刷新ComboBox.items
      */
@@ -97,6 +125,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 +145,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 +166,13 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
                 }));
 
             }
+
+            @Override
+            public void doCancel() {
+                // 关闭定义数据连接页面，为其解锁
+                super.doCancel();
+                EditLockUtils.unlock(LockItem.CONNECTION);
+            }
         });
         connectionListDialog.setVisible(true);
         refreshItems();
@@ -158,4 +202,4 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ItemEditableComboBoxPanel.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ItemEditableComboBoxPanel.java
index 1c61eea26..f06d1405b 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ItemEditableComboBoxPanel.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ItemEditableComboBoxPanel.java
@@ -12,7 +12,7 @@ import java.awt.event.ActionListener;
 
 public abstract class ItemEditableComboBoxPanel extends JPanel {
 	/**
-	 * 
+	 *
 	 */
 	private static final long serialVersionUID = 1L;
 
@@ -21,37 +21,29 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 			return "";
 		}
 	};
-	
+
 	protected UIComboBox itemComboBox;
 	protected UIButton editButton;
     protected UIButton refreshButton;
-	
+
 	public ItemEditableComboBoxPanel() {
 		super();
-		
+
 		initComponents();
 	}
-	
+
 	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) {
@@ -59,32 +51,44 @@ 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
 	 */
 	public void addComboBoxActionListener(ActionListener l) {
 		itemComboBox.addActionListener(l);
 	}
-	
+
 	/*
 	 * 刷新itemComboBox的内容
 	 */
 	protected void refreshItems() {
 		// 记录原来选中的Item,重新加载后需要再次选中
 		Object lastSelectedItem = itemComboBox.getSelectedItem();
-		
+
 		DefaultComboBoxModel model = ((DefaultComboBoxModel) itemComboBox.getModel());
 		model.removeAllElements();
-		
+
 		// 先加EMPTY,再加items
 		model.addElement(EMPTY);
-		
+
 		java.util.Iterator<String> itemIt = items();
 		while(itemIt.hasNext()) {
 			model.addElement(itemIt.next());
 		}
-		
+
 		// 再次选中之前选中的Item
 		int idx = model.getIndexOf(lastSelectedItem);
 		if(idx < 0) {
@@ -92,16 +96,16 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 		}
 		itemComboBox.setSelectedIndex(idx);
 	}
-	
+
 	/*
 	 * 得到其中的itemComboBox所选中的Item
 	 */
 	public String getSelectedItem() {
 		Object selected = itemComboBox.getSelectedItem();
-		
+
 		return selected instanceof String ? (String)selected : null;
 	}
-	
+
 	/*
 	 * 选中name项
 	 */
@@ -109,14 +113,14 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 		DefaultComboBoxModel model = ((DefaultComboBoxModel) itemComboBox.getModel());
 		model.setSelectedItem(name);
 	}
-	
+
 	/*
 	 * 刷新ComboBox.items
 	 */
 	protected abstract java.util.Iterator<String> items();
-	
+
 	/*
 	 * 弹出对话框编辑Items
 	 */
 	protected abstract void editItems();
-}
\ No newline at end of file
+}
diff --git a/designer-base/src/main/java/com/fr/design/editlock/ConnectionLockChangeChecker.java b/designer-base/src/main/java/com/fr/design/editlock/ConnectionLockChangeChecker.java
new file mode 100644
index 000000000..ac80cd53c
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/editlock/ConnectionLockChangeChecker.java
@@ -0,0 +1,25 @@
+package com.fr.design.editlock;
+
+
+import com.fr.workspace.server.lock.editlock.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;
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java b/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java
new file mode 100644
index 000000000..13ac921e3
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java
@@ -0,0 +1,67 @@
+package com.fr.design.editlock;
+
+import com.fr.concurrent.NamedThreadFactory;
+import com.fr.log.FineLoggerFactory;
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.lock.editlock.EditLockOperator;
+import com.fr.workspace.server.lock.editlock.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() {
+        for (EditLockChangeListener listener : this.listeners) {
+            listener.updateLockedState(new EditLockChangeEvent(isLocked));
+        }
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeEvent.java b/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeEvent.java
new file mode 100644
index 000000000..66420fd0b
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeListener.java b/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeListener.java
new file mode 100644
index 000000000..dcabe87cc
--- /dev/null
+++ b/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);
+}
diff --git a/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java b/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java
new file mode 100644
index 000000000..20708462d
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java
@@ -0,0 +1,69 @@
+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.workspace.WorkContext;
+import com.fr.workspace.server.lock.editlock.EditLockOperator;
+import com.fr.workspace.server.lock.editlock.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 = IconUtils.readIcon("/com/fr/design/images/m_web/warningIcon");
+
+    /**
+     * 数据连接锁定中
+     */
+    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-Engine_Report_Tooltips");
+
+    /**
+     * 已经被锁，跳出弹窗提示
+     */
+    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);
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/editlock/ServerTableDataLockChangeChecker.java b/designer-base/src/main/java/com/fr/design/editlock/ServerTableDataLockChangeChecker.java
new file mode 100644
index 000000000..a3f2bbbf4
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/editlock/ServerTableDataLockChangeChecker.java
@@ -0,0 +1,23 @@
+package com.fr.design.editlock;
+
+import com.fr.workspace.server.lock.editlock.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;
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java
new file mode 100644
index 000000000..aa643b6c1
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java
@@ -0,0 +1,46 @@
+package com.fr.design.gui.ibutton;
+
+import com.fr.design.editlock.EditLockChangeEvent;
+import com.fr.design.editlock.EditLockChangeListener;
+
+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;
+    }
+
+    @Override
+    public void updateLockedState(EditLockChangeEvent event) {
+        this.setIcon(event.isLocked() ? lockedIcon : normalIcon);
+        this.setToolTipText(event.isLocked() ? lockedTooltips : normalTooltips);
+        this.repaint();
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItem.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItem.java
new file mode 100644
index 000000000..092b76516
--- /dev/null
+++ b/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.workspace.server.lock.editlock.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();
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItemUI.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItemUI.java
new file mode 100644
index 000000000..c0f70795b
--- /dev/null
+++ b/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);
+        }
+
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java b/designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java
index acd906897..3d343ab93 100644
--- a/designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java
+++ b/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.workspace.server.lock.editlock.LockItem;
 import static com.fr.design.actions.server.ConnectionListAction.doWithDatasourceManager;
 
 /**
@@ -53,6 +52,8 @@ public class DatabaseDialogAction implements OSBasedAction {
                     databaseListDialog.setDoOKSucceed(false);
                     return;
                 }
+                // 定义数据连接弹窗关闭后，解锁
+                EditLockUtils.unlock(LockItem.CONNECTION);
                 Configurations.modify(new WorkerFacade(ConnectionConfig.class) {
                     @Override
                     public void run() {
@@ -71,6 +72,13 @@ public class DatabaseDialogAction implements OSBasedAction {
                     }
                 }));
             }
+
+            @Override
+            public void doCancel() {
+                super.doCancel();
+                // 定义数据连接弹窗关闭后，解锁
+                EditLockUtils.unlock(LockItem.CONNECTION);
+            }
         });
         databaseListDialog.setVisible(true);
     }
diff --git a/designer-base/src/main/resources/com/fr/design/images/m_web/connection_locked_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_web/connection_locked_normal.svg
new file mode 100644
index 000000000..b1b9d1792
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/m_web/locked_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_web/locked_normal.svg
new file mode 100644
index 000000000..b3b2ac74f
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/m_web/warningIcon_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_web/warningIcon_normal.svg
new file mode 100644
index 000000000..b7748925d
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/m_web/warningIcon_normal.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="46px" height="41px" viewBox="0 0 46 41" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_WarningIcon_normal</title>
+    <defs>
+        <polygon id="path-1" points="0 41 46 41 46 0 0 0"></polygon>
+    </defs>
+    <g id="远程设计数据连接/服务器数据集增加锁定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="弹窗/提示" transform="translate(-11.000000, -42.000000)">
+            <g id="Group" transform="translate(10.000000, 38.000000)">
+                <g id="Page-1" transform="translate(1.000000, 4.000000)">
+                    <path d="M3.7061,41 C0.4041,41 -0.9459,38.646 0.7051,35.771 L19.9981,2.157 C21.6491,-0.719 24.3511,-0.719 26.0011,2.157 L45.2951,35.771 C46.9461,38.646 45.5961,41 42.2941,41 L3.7061,41 Z" id="Fill-1" fill="#FBB03B"></path>
+                    <mask id="mask-2" fill="white">
+                        <use xlink:href="#path-1"></use>
+                    </mask>
+                    <g id="Clip-4"></g>
+                    <path d="M21,35 L25,35 L25,31 L21,31 L21,35 Z M26,13 L25,29 L21,29 L20,13 L26,13 Z" id="Fill-3" fill="#FFFFFF" mask="url(#mask-2)"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java
index a7ef4f108..0a572e672 100644
--- a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java
+++ b/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

From 389483541d0ae4c56af540024925973d33281693 Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Thu, 21 Jan 2021 14:36:38 +0800
Subject: [PATCH 02/17] =?UTF-8?q?REPORT-43833=20=E3=80=9010.0.14=E3=80=91?=
 =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E6=95=B0=E6=8D=AE=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5/=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E5=A2=9E=E5=8A=A0=E9=94=81=E5=AE=9A=20=E3=80=90?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91=E8=87=AA=E6=B5=8B?=
 =?UTF-8?q?+=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9Bbug=20=E3=80=90=E6=94=B9?=
 =?UTF-8?q?=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E8=87=AA=E6=B5=8B+?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../actions/server/ConnectionListAction.java  |   2 +-
 .../actions/server/GlobalTableDataAction.java |   2 +-
 .../connect/ConnectionComboBoxPanel.java      |   1 -
 .../com/fr/design/editlock/EditLockUtils.java |  14 ++++++++++--
 .../fr/design/gui/ibutton/UILockButton.java   |   9 ++++++++
 .../fr/design/images/m_web/warningIcon.png    | Bin 0 -> 1190 bytes
 .../images/m_web/warningIcon_normal.svg       |  21 ------------------
 7 files changed, 23 insertions(+), 26 deletions(-)
 create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_web/warningIcon.png
 delete mode 100644 designer-base/src/main/resources/com/fr/design/images/m_web/warningIcon_normal.svg

diff --git a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java
index 45502c073..1fd555e82 100644
--- a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java
@@ -115,7 +115,7 @@ public class ConnectionListAction extends UpdateAction {
     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, StringUtils.EMPTY, LockItem.CONNECTION);
+            UILockMenuItem menuItem = new UILockMenuItem(this, EditLockUtils.CONNECTION_LOCKED_TOOLTIPS, null, LockItem.CONNECTION);
             // 设置名字用作单元测
             menuItem.setName(getName());
             setPressedIcon4Button(menuItem);
diff --git a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
index 14795066d..44d38db9f 100644
--- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
@@ -192,7 +192,7 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
     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, StringUtils.EMPTY, LockItem.SERVER_TABLE_DATA);
+            UILockMenuItem menuItem = new UILockMenuItem(this, EditLockUtils.SERVER_TABLEDATA_LOCKED_TOOLTIPS, null, LockItem.SERVER_TABLE_DATA);
             // 设置名字用作单元测
             menuItem.setName(getName());
             setPressedIcon4Button(menuItem);
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
index 91813418b..a5ab12ff9 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
@@ -73,7 +73,6 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
                 EditLockUtils.CONNECTION_LOCKED_TOOLTIPS,
                 StringUtils.EMPTY
         );
-        editButton.setIcon(IconUtils.readIcon("/com/fr/design/images/m_web/connection"));
         editButton.setPreferredSize(buttonSize);
         editButton.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent evt) {
diff --git a/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java b/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java
index 20708462d..baa3543f8 100644
--- a/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java
+++ b/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java
@@ -5,6 +5,7 @@ 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.workspace.server.lock.editlock.LockItem;
@@ -32,7 +33,10 @@ public class EditLockUtils {
      */
     public static final @Nullable Image LOCKED_IMAGE = SVGLoader.load("/com/fr/design/images/m_web/locked_normal.svg");
 
-    public static final Icon TOOLTIPS_ICON = IconUtils.readIcon("/com/fr/design/images/m_web/warningIcon");
+    /**
+     * 提示弹窗中的提示标志
+     */
+    public static final Icon TOOLTIPS_ICON = IOUtils.readIcon("/com/fr/design/images/m_web/warningIcon.png");
 
     /**
      * 数据连接锁定中
@@ -44,9 +48,15 @@ public class EditLockUtils {
      */
     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-Engine_Report_Tooltips");
+    /**
+     * 提示弹窗中的标题
+     */
+    public static final String TOOLTIPS = Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Title_Hint");
 
     /**
      * 已经被锁，跳出弹窗提示
diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java
index aa643b6c1..b5534f609 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java
@@ -2,6 +2,8 @@ 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.workspace.server.lock.editlock.LockItem;
 
 import javax.swing.Icon;
 
@@ -35,6 +37,13 @@ public class UILockButton extends UIButton implements EditLockChangeListener {
         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
diff --git a/designer-base/src/main/resources/com/fr/design/images/m_web/warningIcon.png b/designer-base/src/main/resources/com/fr/design/images/m_web/warningIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..41c7c703a2d614f1a7321ae76f1f78be8f9ea3fe
GIT binary patch
literal 1190
zcmV;X1X=ruP)<h;3K|Lk000e1NJLTq001rk001cn1^@s6O1vA700004XF*Lt006O%
z3;baP000DCNkl<ZSP9jb?~4^x7{||<d#|opNQB_pF9>1-1EWA`z1MZ43<~dJBuW(d
zqR2O)A<?cPn*GqSP~Y`G*qhn0Aa_BD-Reaz66}S(l;Xw;`zGDiopa9P^Q=3UnLE#!
zIkR`d>%N(DzUO(q=QGcqIdkqvQSu)ENE2)w17r4+we-BR-j1J7NGYMrsbraE<Q0zB
zPY45}313g1tTm^`5?Ys?Qo$i;Y|`5Nilz19TsVoT$l7K(a_RTD-c36(K{rN}t2CVM
zgeILdCDa*em-SZ~xC-iTA>yDF3}B1$8+)wd1qVu5D)7s$ReGj%6$Ct<H9tO}*DGuL
zpOJ&-{>zGU87rmY>PG96JZOT!9p?!%^UudFV0kfJR~&xa_LvUCs{rDGyvb->N-<Zd
z)du8im;Q2zx5ac_aUH6!U7-nrV(~^#+JId3t||_}(2LrrX@n`{gH?x$6oaxk{hKRj
zXWX(YPH#x1^_im31VA|oB<4b)8;-*-8(jO1cMxGy+^kR=V6zSyZx_mm1uyH4;iv7Z
z_57`CSh@8vufk1SGJjY4Ru9NmFWf4cTrHYF@#^;67`_f!=<1G(_@1mKZA~atFr3t|
zhd2JHnxCU{&5_h#j!<~1zz;7yiRZk7R^Ra7^bn^lMM;2z<e5&&Rtke_wQvd_sy>@7
zgf~+|oE8P)IcAj(Z+{i_U9W|};rvhop?77PGvI>LVkQW`8-jX0CgnDr!2ynWwEg8e
za?66#I*gPSxIG?o=5Y?x<CA;wX?nh6zI2zXE~lk3;RWqazMGOQf)hCS&4)1m3yViW
z=GHT(C6c0!6kjgQ6)D!M6S#ue!??EBSzY1-Ty;4up0m`ZIh33|#0;gRTyQvFe+pj|
z2U3|ffm_d<X358`_9L3pGTfGP!L=6OU?o<zGx8c-bve!ALv!Jrr!2#5ITJkehlbH;
zXFJ-V!L4Ub%d)~b-w1>HwyYQ{_}#5ZpUz5V$GBy|X>4*#G}+su72E_9@8kBjF=pk~
z<dy}e<+<V9CYXHB7RG|Z#LH{&sQj5NDO2YlIW5!V?jRn*J|`9~lm%CF^G9%<t>qH(
zG+>qmr{($3I57|l7n=fyVC&O(V*8K_cG9@&a+;GF{<uaKV(JV}oyYML+P8S<S<xBj
z+&2qC`Gw9)nbyQYOc>OR2PS?2h5nXT@CU+$ctFpzrPy8@nVyJv+TeIvt*G(VWn5Sr
zqQT`}t0Pm1)KdNfQvO+O_HUH(oF?=38aIAxUm4H|;xao}P!qI1h%6Vu@oexgenR^+
z5_|Ou296Ue@hyVmA^s>n1dsG8aKuH7#7cb${_ubn;T7C7Q#(wQ&`VeR;;Sm6_H0$d
z!YJO!eF04cqylTPFzVsw)7N{cqE0Nx?BTxM@%6?j_1*>{vj?8|?%q-qpPiT&UqITg
z?>9oci9eg3!)@`w;#U8Eh7|H9e%t*6x54i#BU5MZ0CBX*Zs}O8*#H0l07*qoM6N<$
Ef^m~eUjP6A

literal 0
HcmV?d00001

diff --git a/designer-base/src/main/resources/com/fr/design/images/m_web/warningIcon_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_web/warningIcon_normal.svg
deleted file mode 100644
index b7748925d..000000000
--- a/designer-base/src/main/resources/com/fr/design/images/m_web/warningIcon_normal.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="46px" height="41px" viewBox="0 0 46 41" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>icon_WarningIcon_normal</title>
-    <defs>
-        <polygon id="path-1" points="0 41 46 41 46 0 0 0"></polygon>
-    </defs>
-    <g id="远程设计数据连接/服务器数据集增加锁定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="弹窗/提示" transform="translate(-11.000000, -42.000000)">
-            <g id="Group" transform="translate(10.000000, 38.000000)">
-                <g id="Page-1" transform="translate(1.000000, 4.000000)">
-                    <path d="M3.7061,41 C0.4041,41 -0.9459,38.646 0.7051,35.771 L19.9981,2.157 C21.6491,-0.719 24.3511,-0.719 26.0011,2.157 L45.2951,35.771 C46.9461,38.646 45.5961,41 42.2941,41 L3.7061,41 Z" id="Fill-1" fill="#FBB03B"></path>
-                    <mask id="mask-2" fill="white">
-                        <use xlink:href="#path-1"></use>
-                    </mask>
-                    <g id="Clip-4"></g>
-                    <path d="M21,35 L25,35 L25,31 L21,31 L21,35 Z M26,13 L25,29 L21,29 L20,13 L26,13 Z" id="Fill-3" fill="#FFFFFF" mask="url(#mask-2)"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file

From a97241863ef39822f4aa25bf79d340d3d7d4104e Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Thu, 21 Jan 2021 16:25:20 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/designer/component/VanChartTooltipContentPane.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
index f2c566230..c4c5fa9f5 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
@@ -522,7 +522,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
         if (tableFieldNames != null) {
             for (String fieldName : tableFieldNames) {
-                params.put(fieldName, fieldName);
+                params.put(fieldName, "${" + fieldName + "_" + fieldName.hashCode() + "}");
             }
         }
 

From c5cae1d8865bf3320967b907c96428fd6a257957 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Thu, 21 Jan 2021 16:25:51 +0800
Subject: [PATCH 04/17] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=A4=9A=E5=B1=82?=
 =?UTF-8?q?=E9=A5=BC=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VanChartMultiPieLabelContentPane.java     | 47 +++++++++++++++----
 ...VanChartMultiPieRichTextFieldListPane.java | 41 ++++++++++++++++
 .../VanChartMultiPieTooltipContentPane.java   | 47 +++++++++++++++----
 3 files changed, 119 insertions(+), 16 deletions(-)
 create mode 100644 designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieRichTextFieldListPane.java

diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieLabelContentPane.java
index 73e766afc..b62655a26 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieLabelContentPane.java
+++ b/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 void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        setRichTextCategoryNameFormatPane(new MultiPieLevelNameFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextSeriesNameFormatPane(new MultiPieSeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+        return new VanChartRichTextPane(richEditorPane) {
+
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                return new VanChartMultiPieRichTextFieldListPane(fieldAttrPane, richEditor);
+            }
+
+            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() {
diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieRichTextFieldListPane.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieRichTextFieldListPane.java
new file mode 100644
index 000000000..2a0aea819
--- /dev/null
+++ b/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);
+    }
+}
diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieTooltipContentPane.java
index 1fbe0870a..76d536d5b 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieTooltipContentPane.java
+++ b/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 void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        setRichTextCategoryNameFormatPane(new MultiPieLevelNameFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextSeriesNameFormatPane(new MultiPieSeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+        return new VanChartRichTextPane(richEditorPane) {
+
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                return new VanChartMultiPieRichTextFieldListPane(fieldAttrPane, richEditor);
+            }
+
+            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

From 22e2d7cb9266795bbbe1fb69d391064a57de4087 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Thu, 21 Jan 2021 16:34:43 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../label/VanChartMapLabelContentPane.java    | 20 +++++++++++++++++++
 .../VanChartMapTooltipContentPane.java        | 20 +++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/label/VanChartMapLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/label/VanChartMapLabelContentPane.java
index baec70ca9..ce3e34ba7 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/label/VanChartMapLabelContentPane.java
+++ b/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"),
diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipContentPane.java
index 03f720bf7..718cfc358 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipContentPane.java
+++ b/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"),

From f29003889f7d59b9ed179b9a27405446c6defce8 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Thu, 21 Jan 2021 16:50:58 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=B5=81=E5=90=91?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VanChartLineMapRichTextFieldListPane.java | 41 ++++++++++++++++
 .../VanChartLineMapTooltipContentPane.java    | 48 +++++++++++++++----
 2 files changed, 80 insertions(+), 9 deletions(-)
 create mode 100644 designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapRichTextFieldListPane.java

diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapRichTextFieldListPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapRichTextFieldListPane.java
new file mode 100644
index 000000000..0a1e2bbb6
--- /dev/null
+++ b/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);
+    }
+}
diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapTooltipContentPane.java
index 9dbc696a6..04ab53b6a 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapTooltipContentPane.java
+++ b/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 void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        setRichTextCategoryNameFormatPane(new StartAndEndNameFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+
+        return new VanChartRichTextPane(richEditorPane) {
+
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                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

From db2aa5788ec11f0a9d8b10ba3cfc48034e18501a Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Thu, 21 Jan 2021 19:40:48 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=BC=8F=E6=96=97?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../style/VanChartFunnelLabelContentPane.java | 57 +++++++++--------
 .../VanChartFunnelRichTextFieldListPane.java  | 62 +++++++++++++++++++
 .../VanChartFunnelTooltipContentPane.java     | 57 +++++++++--------
 3 files changed, 124 insertions(+), 52 deletions(-)
 create mode 100644 designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelRichTextFieldListPane.java

diff --git a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelLabelContentPane.java
index a97225d55..e785b562b 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelLabelContentPane.java
+++ b/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.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;
@@ -54,32 +57,34 @@ public class VanChartFunnelLabelContentPane extends VanChartLabelContentPane {
         setPercentFormatPane(new FunnelPercentFormatPaneWithCheckBox(parent, showOnPane));
     }
 
-    @Override
-    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        setRichTextCategoryNameFormatPane(new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextPercentFormatPane(new FunnelPercentFormatPaneWithoutCheckBox(parent, showOnPane));
-    }
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
 
-    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
-        VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
-                getRichTextSeriesNameFormatPane(),
-                getRichTextValueFormatPane(),
-                getRichTextPercentFormatPane()
-        };
+        return new VanChartRichTextPane(richEditorPane) {
+
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                return new VanChartFunnelRichTextFieldListPane(fieldAttrPane, richEditor);
+            }
 
-        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
-                attrTooltipContent.getRichTextSeriesFormat(),
-                attrTooltipContent.getRichTextValueFormat(),
-                attrTooltipContent.getRichTextPercentFormat()
+            protected AttrTooltipContent getInitialTooltipContent() {
+                return createAttrTooltip();
+            }
         };
+    }
 
-        setRichTextAttr(new AttrTooltipRichText());
-        populateRichTextFormat(formatPaneGroup, formatGroup);
-        populateRichText(attrTooltipContent.getRichTextAttr());
+    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_Value_Conversion")
+        };
+    }
 
-        checkRichEditorState(attrTooltipContent);
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
+        return new AttrTooltipFormat[]{
+                new AttrTooltipNameFormat(),
+                new AttrTooltipValueFormat(),
+                new AttrTooltipPercentFormat()
+        };
     }
 
     protected AttrTooltipContent createAttrTooltip() {
diff --git a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelRichTextFieldListPane.java b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelRichTextFieldListPane.java
new file mode 100644
index 000000000..c63f112a7
--- /dev/null
+++ b/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;
+    }
+
+}
diff --git a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelTooltipContentPane.java
index 247194ec4..e15c62e0c 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelTooltipContentPane.java
+++ b/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.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;
@@ -53,32 +56,34 @@ public class VanChartFunnelTooltipContentPane extends VanChartTooltipContentPane
         setPercentFormatPane(new FunnelPercentFormatPaneWithCheckBox(parent, showOnPane));
     }
 
-    @Override
-    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        setRichTextCategoryNameFormatPane(new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextPercentFormatPane(new FunnelPercentFormatPaneWithoutCheckBox(parent, showOnPane));
-    }
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
 
-    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
-        VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
-                getRichTextSeriesNameFormatPane(),
-                getRichTextValueFormatPane(),
-                getRichTextPercentFormatPane()
-        };
+        return new VanChartRichTextPane(richEditorPane) {
+
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                return new VanChartFunnelRichTextFieldListPane(fieldAttrPane, richEditor);
+            }
 
-        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
-                attrTooltipContent.getRichTextSeriesFormat(),
-                attrTooltipContent.getRichTextValueFormat(),
-                attrTooltipContent.getRichTextPercentFormat()
+            protected AttrTooltipContent getInitialTooltipContent() {
+                return createAttrTooltip();
+            }
         };
+    }
 
-        setRichTextAttr(new AttrTooltipRichText());
-        populateRichTextFormat(formatPaneGroup, formatGroup);
-        populateRichText(attrTooltipContent.getRichTextAttr());
+    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_Value_Conversion")
+        };
+    }
 
-        checkRichEditorState(attrTooltipContent);
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
+        return new AttrTooltipFormat[]{
+                new AttrTooltipNameFormat(),
+                new AttrTooltipValueFormat(),
+                new AttrTooltipPercentFormat()
+        };
     }
 
     protected AttrTooltipContent createAttrTooltip() {

From 7b271caeba1a2d19c15c6fd6e06ab445bd943672 Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Thu, 21 Jan 2021 20:04:58 +0800
Subject: [PATCH 08/17] =?UTF-8?q?REPORT-43833=20=E3=80=9010.0.14=E3=80=91?=
 =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E6=95=B0=E6=8D=AE=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5/=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E5=A2=9E=E5=8A=A0=E9=94=81=E5=AE=9A=20=E5=B0=86?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=85=B3=E9=97=AD=E5=90=8E=E8=A7=A3=E9=94=81?=
 =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C=EF=BC=8C=E6=94=BE=E5=88=B0afterComm?=
 =?UTF-8?q?it=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/actions/server/GlobalTableDataAction.java   | 4 ++--
 .../main/java/com/fr/design/os/impl/DatabaseDialogAction.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
index 44d38db9f..d41af3205 100644
--- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
@@ -103,8 +103,6 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
                     globalTableDataDialog.setDoOKSucceed(false);
                     return;
                 }
-                // 关闭服务器数据集页面，为其解锁
-                EditLockUtils.unlock(LockItem.SERVER_TABLE_DATA);
                 DesignTableDataManager.clearGlobalDs();
                 // 保存时 移除服务器数据集列名缓存
                 for (String name : tableDataConfig.getTableDatas().keySet()) {
@@ -128,6 +126,8 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
                         // 刷新共有数据集
                         TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter());
                         fireDSChanged(globalTableDataPane.getDsChangedNameMap());
+                        // 关闭服务器数据集页面，为其解锁
+                        EditLockUtils.unlock(LockItem.SERVER_TABLE_DATA);
                     }
                 }));
             }
diff --git a/designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java b/designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java
index 3d343ab93..ae0f8d1cb 100644
--- a/designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java
+++ b/designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java
@@ -52,8 +52,6 @@ public class DatabaseDialogAction implements OSBasedAction {
                     databaseListDialog.setDoOKSucceed(false);
                     return;
                 }
-                // 定义数据连接弹窗关闭后，解锁
-                EditLockUtils.unlock(LockItem.CONNECTION);
                 Configurations.modify(new WorkerFacade(ConnectionConfig.class) {
                     @Override
                     public void run() {
@@ -69,6 +67,8 @@ public class DatabaseDialogAction implements OSBasedAction {
                     @Override
                     public void afterCommit() {
                         DesignerContext.getDesignerBean("databasename").refreshBeanElement();
+                        // 定义数据连接弹窗关闭后，解锁
+                        EditLockUtils.unlock(LockItem.CONNECTION);
                     }
                 }));
             }

From 7cc2ffb8fdb68e1c3621ab48b0dfc5400fd86cb8 Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Thu, 21 Jan 2021 20:10:13 +0800
Subject: [PATCH 09/17] =?UTF-8?q?REPORT-43833=20=E3=80=9010.0.14=E3=80=91?=
 =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E6=95=B0=E6=8D=AE=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5/=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E5=A2=9E=E5=8A=A0=E9=94=81=E5=AE=9A=20=E5=B0=86?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=BB=84=E4=BB=B6=E7=9A=84=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=94=BE=E5=88=B0EDT=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/editlock/EditLockChangeChecker.java    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java b/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java
index 13ac921e3..951bea334 100644
--- a/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java
+++ b/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java
@@ -1,6 +1,7 @@
 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;
@@ -60,8 +61,13 @@ public abstract class EditLockChangeChecker {
     }
 
     private void fireChange() {
-        for (EditLockChangeListener listener : this.listeners) {
-            listener.updateLockedState(new EditLockChangeEvent(isLocked));
-        }
+        UIUtil.invokeLaterIfNeeded(new Runnable() {
+            @Override
+            public void run() {
+                for (EditLockChangeListener listener : EditLockChangeChecker.this.listeners) {
+                    listener.updateLockedState(new EditLockChangeEvent(isLocked));
+                }
+            }
+        });
     }
 }

From 43642548e66fa90a094c1361e9a39e12fb04735a Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Fri, 22 Jan 2021 09:29:14 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=A1=86=E6=9E=B6?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...anChartStructureRichTextFieldListPane.java | 61 ++++++++++++++++++
 .../VanChartStructureTooltipContentPane.java  | 63 ++++++++-----------
 2 files changed, 88 insertions(+), 36 deletions(-)
 create mode 100644 designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureRichTextFieldListPane.java

diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureRichTextFieldListPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureRichTextFieldListPane.java
new file mode 100644
index 000000000..49f81968c
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java
index f5999391f..f0252fab7 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java
+++ b/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.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;
@@ -70,44 +71,34 @@ public class VanChartStructureTooltipContentPane extends VanChartTooltipContentP
         setPercentFormatPane(percentFormatPane);
     }
 
-    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        CategoryNameFormatPaneWithoutCheckBox richTextCategoryNameFormatPane = new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane) {
-            protected String getCheckBoxText() {
-                return Toolkit.i18nText("Fine-Design_Chart_Node_Name");
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+
+        return new VanChartRichTextPane(richEditorPane) {
+
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                return new VanChartStructureRichTextFieldListPane(fieldAttrPane, richEditor);
             }
-        };
-        SeriesNameFormatPaneWithoutCheckBox richTextSeriesNameFormatPane = new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane) {
-            protected String getCheckBoxText() {
-                return Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name");
+
+            protected AttrTooltipContent getInitialTooltipContent() {
+                return createAttrTooltip();
             }
         };
-        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) {
-        VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
-                getRichTextCategoryNameFormatPane(),
-                getRichTextSeriesNameFormatPane(),
-                getRichTextValueFormatPane()
+    protected String[] getRichTextFieldNames() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Node_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_Use_Value")
         };
+    }
 
-        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
-                attrTooltipContent.getRichTextCategoryFormat(),
-                attrTooltipContent.getRichTextSeriesFormat(),
-                attrTooltipContent.getRichTextValueFormat()
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
+        return new AttrTooltipFormat[]{
+                new AttrTooltipMultiLevelNameFormat(),
+                new AttrTooltipSeriesFormat(),
+                new AttrTooltipValueFormat()
         };
-
-        setRichTextAttr(new AttrTooltipRichText());
-        populateRichTextFormat(formatPaneGroup, formatGroup);
-        populateRichText(attrTooltipContent.getRichTextAttr());
-
-        checkRichEditorState(attrTooltipContent);
     }
 
     @Override

From e5585ff488ed78cd428a8a23ba4606243d7a61ea Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Fri, 22 Jan 2021 15:16:45 +0800
Subject: [PATCH 11/17] =?UTF-8?q?REPORT-43833=20=E3=80=9010.0.14=E3=80=91?=
 =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E6=95=B0=E6=8D=AE=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5/=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E5=A2=9E=E5=8A=A0=E9=94=81=E5=AE=9A=201.=20=E5=B0=86?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=AE=9E=E7=8E=B0=E4=BD=9C=E4=B8=BA=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=AE=9E=E7=8E=B0=EF=BC=8C=E6=B3=A8=E5=86=8C=E8=B5=B7?=
 =?UTF-8?q?=E6=9D=A5=EF=BC=8C=E4=BB=A5=E5=85=BC=E5=AE=B9=E8=BF=9C=E7=A8=8B?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E8=80=81=E7=89=88=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=202.=20=E4=B9=8B=E5=89=8D=E6=B8=85?=
 =?UTF-8?q?=E7=90=86=E8=84=8F=E6=95=B0=E6=8D=AE=E7=9A=84=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E6=9C=89=E7=82=B9=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=B8=BA=EF=BC=9A=E4=B8=BALockItem=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E5=8F=98=E9=87=8Fbirth=EF=BC=8C=E4=BB=A3=E8=A1=A8=E5=85=B6?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=EF=BC=8C=E5=B9=B6=E4=B8=94?=
 =?UTF-8?q?=E4=BC=9A=E4=B8=BA=E6=AF=8F=E4=B8=AAClientID=E5=9C=A8=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=E6=9C=8D=E5=8A=A1=E4=B8=AD=E5=AD=98=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AAkey=3DclientID=EF=BC=8Cvalue=3DLockItem?=
 =?UTF-8?q?=E7=9A=84=E9=94=AE=E5=80=BC=E5=AF=B9=EF=BC=8C=E5=9C=A8=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=85=A5=E6=97=B6=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E6=AF=8F=E9=9A=9430s=E6=9B=B4=E6=96=B0=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=EF=BC=8C=E7=94=A8=E6=88=B7=E7=99=BB?=
 =?UTF-8?q?=E5=87=BA=E6=97=B6=E6=B8=85=E9=99=A4=EF=BC=8C=E5=B9=B6=E4=B8=94?=
 =?UTF-8?q?=E5=9C=A8=E8=BD=AE=E8=AF=A2=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E6=A3=80=E6=9F=A5=E5=BD=93=E5=89=8D=E5=90=84=E4=B8=AA?=
 =?UTF-8?q?LockItem=E5=AF=B9=E5=BA=94=E7=9A=84=E6=9C=8D=E5=8A=A1=E4=B8=8B?=
 =?UTF-8?q?=E8=BF=99=E4=B8=AA=E9=94=AE=E5=80=BC=E5=AF=B9=E9=87=8Cvalue?=
 =?UTF-8?q?=E7=9A=84birth=E6=98=AF=E5=90=A6=E8=B6=85=E6=97=B6=E4=BA=86?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E8=B6=85=E6=97=B6=EF=BC=8C=E6=B8=85?=
 =?UTF-8?q?=E7=90=86=E8=84=8F=E6=95=B0=E6=8D=AE=203.=20=E5=B0=86=E4=B9=8B?=
 =?UTF-8?q?=E5=89=8D=E4=BD=BF=E7=94=A8=E7=9A=84applyForService=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAapplyForCleanableService=EF=BC=8C=E4=BE=BF?=
 =?UTF-8?q?=E4=BA=8E=E9=9B=86=E7=BE=A4=E9=87=8D=E5=90=AF=E6=97=B6=E6=B8=85?=
 =?UTF-8?q?=E7=90=86=E6=9C=8D=E5=8A=A1=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/actions/server/ConnectionListAction.java    | 4 +---
 .../com/fr/design/actions/server/GlobalTableDataAction.java   | 3 +--
 .../design/data/datapane/connect/ConnectionComboBoxPanel.java | 2 +-
 .../com/fr/design/editlock/ConnectionLockChangeChecker.java   | 2 +-
 .../java/com/fr/design/editlock/EditLockChangeChecker.java    | 2 +-
 .../src/main/java/com/fr/design/editlock/EditLockUtils.java   | 2 +-
 .../fr/design/editlock/ServerTableDataLockChangeChecker.java  | 2 +-
 .../src/main/java/com/fr/design/gui/ibutton/UILockButton.java | 2 +-
 .../src/main/java/com/fr/design/gui/imenu/UILockMenuItem.java | 2 +-
 .../main/java/com/fr/design/os/impl/DatabaseDialogAction.java | 2 +-
 10 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java
index 1fd555e82..4742f337c 100644
--- a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java
@@ -8,16 +8,14 @@ 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.ibutton.UILockButton;
 import com.fr.design.gui.imenu.UILockMenuItem;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.menu.MenuKeySet;
-import com.fr.stable.StringUtils;
 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.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 
 import javax.swing.KeyStroke;
 import java.awt.event.ActionEvent;
diff --git a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
index d41af3205..ab85a14dc 100644
--- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
@@ -22,11 +22,10 @@ import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.file.TableDataConfig;
 
-import com.fr.stable.StringUtils;
 import com.fr.transaction.CallBackAdaptor;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.WorkerFacade;
-import com.fr.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 
 import javax.swing.KeyStroke;
 import java.awt.Dimension;
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
index a5ab12ff9..afd65f3e5 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
@@ -21,7 +21,7 @@ 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.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 
 import javax.swing.SwingUtilities;
 import java.awt.Dimension;
diff --git a/designer-base/src/main/java/com/fr/design/editlock/ConnectionLockChangeChecker.java b/designer-base/src/main/java/com/fr/design/editlock/ConnectionLockChangeChecker.java
index ac80cd53c..8eb6a4aa9 100644
--- a/designer-base/src/main/java/com/fr/design/editlock/ConnectionLockChangeChecker.java
+++ b/designer-base/src/main/java/com/fr/design/editlock/ConnectionLockChangeChecker.java
@@ -1,7 +1,7 @@
 package com.fr.design.editlock;
 
 
-import com.fr.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 
 /**
  * @author Yvan
diff --git a/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java b/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java
index 951bea334..8f276dfe8 100644
--- a/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java
+++ b/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java
@@ -5,7 +5,7 @@ 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.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java b/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java
index baa3543f8..2ab10fb92 100644
--- a/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java
+++ b/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java
@@ -8,7 +8,7 @@ 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.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.Icon;
diff --git a/designer-base/src/main/java/com/fr/design/editlock/ServerTableDataLockChangeChecker.java b/designer-base/src/main/java/com/fr/design/editlock/ServerTableDataLockChangeChecker.java
index a3f2bbbf4..e38a4e940 100644
--- a/designer-base/src/main/java/com/fr/design/editlock/ServerTableDataLockChangeChecker.java
+++ b/designer-base/src/main/java/com/fr/design/editlock/ServerTableDataLockChangeChecker.java
@@ -1,6 +1,6 @@
 package com.fr.design.editlock;
 
-import com.fr.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 
 /**
  * @author Yvan
diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java
index b5534f609..77b5516f5 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java
@@ -3,7 +3,7 @@ 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.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 
 import javax.swing.Icon;
 
diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItem.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItem.java
index 092b76516..c609e5d5c 100644
--- a/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItem.java
+++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItem.java
@@ -2,7 +2,7 @@ package com.fr.design.gui.imenu;
 
 import com.fr.design.editlock.EditLockChangeEvent;
 import com.fr.design.editlock.EditLockChangeListener;
-import com.fr.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 
 import javax.swing.Action;
 
diff --git a/designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java b/designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java
index ae0f8d1cb..057b561fa 100644
--- a/designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java
+++ b/designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java
@@ -11,7 +11,7 @@ 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.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 import static com.fr.design.actions.server.ConnectionListAction.doWithDatasourceManager;
 
 /**

From 6475734917184e419ea9d31da723540556c4fde7 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Fri, 22 Jan 2021 15:47:50 +0800
Subject: [PATCH 12/17] =?UTF-8?q?=E9=80=82=E9=85=8D=E7=94=98=E7=89=B9?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../richText/VanChartFieldAttrPane.java       |  52 +++++--
 .../richText/VanChartFieldButton.java         |  31 +++++
 .../richText/VanChartFieldListPane.java       |  18 ++-
 .../VanChartGanttRichTextFieldListPane.java   | 107 ++++++++++++++
 .../VanChartGanttTooltipContentPane.java      | 131 ++++++------------
 5 files changed, 238 insertions(+), 101 deletions(-)
 create mode 100644 designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttRichTextFieldListPane.java

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldAttrPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldAttrPane.java
index 89c3cd73e..5cab5485f 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldAttrPane.java
+++ b/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[][] components = new Component[][]{
+        Component[][] intervalTimeComponents = new Component[][]{
+                new Component[]{null, null},
+                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) {
-        fieldDataFunction.addActionListener(listener);
+        formatPane = new JPanel(new BorderLayout());
+        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();
     }
 }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldButton.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldButton.java
index 74bf77030..1e76d616c 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldButton.java
+++ b/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();
     }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldListPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldListPane.java
index 2d6b4b579..60a0b1158 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldListPane.java
+++ b/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;
@@ -242,10 +244,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 +261,7 @@ public class VanChartFieldListPane extends JPanel {
                 }
 
                 fieldButton.setFormat(fieldAttrPane.updateFormat());
+                fieldButton.setIntervalTimeFormat(fieldAttrPane.updateIntervalTime());
                 fieldButton.setDataFunction(fieldAttrPane.updateDataFunction());
 
                 if (tableFieldNameList.contains(fieldName)) {
@@ -276,7 +282,7 @@ public class VanChartFieldListPane extends JPanel {
             }
         });
 
-        fieldAttrPane.registerChangeListener(new UIObserverListener() {
+        fieldAttrPane.registerFormatListener(new UIObserverListener() {
             public void doChange() {
                 fieldListener.updateFieldFormatPane();
             }
@@ -317,6 +323,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 +388,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());
+        }
     }
 }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttRichTextFieldListPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttRichTextFieldListPane.java
new file mode 100644
index 000000000..6332c6757
--- /dev/null
+++ b/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());
+        }
+    }
+
+}
diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java
index d724deff5..6868a0c87 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java
+++ b/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) {
-        richTextProcessesFormatPane = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane){
-            protected String getCheckBoxText() {
-                return Toolkit.i18nText("Fine-Design_Chart_Project_Name");
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+
+        return new VanChartRichTextPane(richEditorPane) {
+
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                return new VanChartGanttRichTextFieldListPane(fieldAttrPane, richEditor);
             }
-        };
-        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
-        richTextStartTimeFormatPane = new VanChartDateFormatPaneWithoutCheckBox(parent, showOnPane){
-            protected String getCheckBoxText() {
-                return Toolkit.i18nText("Fine-Design_Chart_Start_Time");
+
+            protected AttrTooltipContent getInitialTooltipContent() {
+                return createAttrTooltip();
             }
         };
-        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() {
-                return Toolkit.i18nText("Fine-Design_Chart_Process");
-            }
+    }
+
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
+        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) {
-        if(attrTooltipContent instanceof AttrGanttTooltipContent) {
-            AttrGanttTooltipContent ganttTooltipContent = (AttrGanttTooltipContent) attrTooltipContent;
+    protected void updateTooltipFormat(AttrTooltipContent target, AttrTooltipContent source) {
+        super.updateTooltipFormat(target, source);
+
+        if (target instanceof AttrGanttTooltipContent && source instanceof AttrGanttTooltipContent) {
+            AttrGanttTooltipContent targetGantt = (AttrGanttTooltipContent) target;
+            AttrGanttTooltipContent sourceGantt = (AttrGanttTooltipContent) source;
 
-            richTextProcessesFormatPane.update(ganttTooltipContent.getRichTextProcessesFormat());
-            getRichTextSeriesNameFormatPane().update(ganttTooltipContent.getRichTextSeriesFormat());
-            richTextStartTimeFormatPane.update(ganttTooltipContent.getRichTextStartTimeFormat());
-            richTextEndTimeFormatPane.update(ganttTooltipContent.getRichTextEndTimeFormat());
-            richTextDurationFormatPane.update(ganttTooltipContent.getRichTextDurationFormat());
-            richTextProgressFormatPane.update(ganttTooltipContent.getRichTextProgressFormat());
+            targetGantt.setRichTextProcessesFormat(sourceGantt.getRichTextProcessesFormat());
+            targetGantt.setRichTextStartTimeFormat(sourceGantt.getRichTextStartTimeFormat());
+            targetGantt.setRichTextEndTimeFormat(sourceGantt.getRichTextEndTimeFormat());
+            targetGantt.setRichTextDurationFormat(sourceGantt.getRichTextDurationFormat());
+            targetGantt.setRichTextProgressFormat(sourceGantt.getRichTextProgressFormat());
         }
     }
 

From 137adaaef28135d7b1b63d4258a5c86a3526af1b Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Fri, 22 Jan 2021 17:14:50 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E9=80=82=E9=85=8D=E7=AE=B1=E5=9E=8B?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ChartBoxRichTextDetailedFieldListPane.java | 135 ++++++++++
 ...anChartBoxRichTextResultFieldListPane.java |  41 +++
 .../box/VanChartBoxTooltipContentPane.java    | 234 +++++++-----------
 3 files changed, 259 insertions(+), 151 deletions(-)
 create mode 100644 designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxRichTextDetailedFieldListPane.java
 create mode 100644 designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxRichTextResultFieldListPane.java

diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxRichTextDetailedFieldListPane.java b/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxRichTextDetailedFieldListPane.java
new file mode 100644
index 000000000..d780a44eb
--- /dev/null
+++ b/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());
+        }
+    }
+
+}
diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxRichTextResultFieldListPane.java b/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxRichTextResultFieldListPane.java
new file mode 100644
index 000000000..9816967ff
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java
index 25eb587d8..64501bd9a 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java
+++ b/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;
@@ -25,12 +25,15 @@ import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckB
 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 {
 
@@ -55,9 +58,6 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     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);
@@ -155,14 +155,74 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         return commonPanel;
     }
 
-    protected JPanel createRichFormatPanel() {
-        JPanel richFormatPanel = new JPanel(new BorderLayout());
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+
+        return new VanChartRichTextPane(richEditorPane) {
+
+            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")
+        };
+    }
 
-        richFormatPanel.add(createRichTextCateAndSeriesPane(), BorderLayout.NORTH);
-        richFormatPanel.add(createRichTextDataNumberPane(), BorderLayout.CENTER);
-        richFormatPanel.add(createRichTextDataDetailPane(), BorderLayout.SOUTH);
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
+        if (detailed) {
+            return new AttrTooltipFormat[]{
+                    new AttrTooltipCategoryFormat(),
+                    new AttrTooltipSeriesFormat(),
+                    new AttrTooltipDataNumberFormat(),
+                    new AttrTooltipDataMaxFormat(),
+                    new AttrTooltipDataQ3Format(),
+                    new AttrTooltipDataMedianFormat(),
+                    new AttrTooltipDataQ1Format(),
+                    new AttrTooltipDataMinFormat(),
+                    new AttrTooltipDataOutlierFormat()
+            };
+        }
 
-        return richFormatPanel;
+        return new AttrTooltipFormat[]{
+                new AttrTooltipCategoryFormat(),
+                new AttrTooltipSeriesFormat(),
+                new AttrTooltipDataMaxFormat(),
+                new AttrTooltipDataQ3Format(),
+                new AttrTooltipDataMedianFormat(),
+                new AttrTooltipDataQ1Format(),
+                new AttrTooltipDataMinFormat()
+        };
     }
 
     protected Component[][] getRichTextComponents() {
@@ -249,72 +309,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 +356,21 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         }
     }
 
-    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
-        setRichTextAttr(new AttrTooltipRichText());
-        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
-        };
-    }
+    protected void updateTooltipFormat(AttrTooltipContent target, AttrTooltipContent source) {
+        super.updateTooltipFormat(target, source);
 
-    private AttrTooltipFormat[] getFormatGroup(AttrBoxTooltipContent boxTooltipContent) {
-        AttrTooltipDataNumberFormat richTextNumber = boxTooltipContent.getRichTextNumber();
-        AttrTooltipDataMaxFormat richTextMaxFormat = boxTooltipContent.getRichTextMax();
-        AttrTooltipDataQ3Format richTextQ3Format = boxTooltipContent.getRichTextQ3();
-        AttrTooltipDataMedianFormat richTextMedianFormat = boxTooltipContent.getRichTextMedian();
-        AttrTooltipDataQ1Format richTextQ1Format = boxTooltipContent.getRichTextQ1();
-        AttrTooltipDataMinFormat richTextMinFormat = boxTooltipContent.getRichTextMin();
-        AttrTooltipDataOutlierFormat richTextOutlierFormat = boxTooltipContent.getRichTextOutlier();
+        if (target instanceof AttrBoxTooltipContent && source instanceof AttrBoxTooltipContent) {
+            AttrBoxTooltipContent targetGantt = (AttrBoxTooltipContent) target;
+            AttrBoxTooltipContent sourceGantt = (AttrBoxTooltipContent) source;
 
-        if (detailed) {
-            return new AttrTooltipFormat[]{
-                    richTextNumber, richTextMaxFormat, richTextQ3Format, richTextMedianFormat,
-                    richTextQ1Format, richTextMinFormat, richTextOutlierFormat
-            };
+            targetGantt.setRichTextNumber(sourceGantt.getRichTextNumber());
+            targetGantt.setRichTextMax(sourceGantt.getRichTextMax());
+            targetGantt.setRichTextQ3(sourceGantt.getRichTextQ3());
+            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 +392,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);
     }
 }

From af29f516ef6e45e286b7aedcd55e60e6897f4a22 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Sun, 24 Jan 2021 16:14:15 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E9=80=82=E9=85=8D=E9=A5=BC=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VanChartPieCategoryLabelContentPane.java  | 80 ++++++++++---------
 ...ChartPieCategoryRichTextFieldListPane.java | 66 +++++++++++++++
 .../VanChartPieValueLabelContentPane.java     | 47 +++++++++--
 ...VanChartPieValueRichTextFieldListPane.java | 34 ++++++++
 ...ChartScatterRefreshTooltipContentPane.java | 21 -----
 5 files changed, 180 insertions(+), 68 deletions(-)
 create mode 100644 designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieCategoryRichTextFieldListPane.java
 create mode 100644 designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieValueRichTextFieldListPane.java

diff --git a/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieCategoryLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieCategoryLabelContentPane.java
index e5b55d749..73c63bbee 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieCategoryLabelContentPane.java
+++ b/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.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;
@@ -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 void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        setRichTextCategoryNameFormatPane(new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane));
-        richTextSummaryValueFormatPane = new SummaryValueFormatPaneWithoutCheckBox(parent, showOnPane);
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+
+        return new VanChartRichTextPane(richEditorPane) {
+
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                return new VanChartPieCategoryRichTextFieldListPane(fieldAttrPane, richEditor);
+            }
+
+            protected AttrTooltipContent getInitialTooltipContent() {
+                return createAttrTooltip();
+            }
+        };
     }
 
-    @Override
-    protected Component[][] getPaneComponents() {
-        return new Component[][]{
-                new Component[]{getCategoryNameFormatPane(), null},
-                new Component[]{summaryValueFormatPane, null},
+    protected String[] getRichTextFieldNames() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_Use_Summary_Value")
+        };
+    }
+
+    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[]{richTextSummaryValueFormatPane, null},
+                new Component[]{getCategoryNameFormatPane(), null},
+                new Component[]{summaryValueFormatPane, null},
         };
     }
 
@@ -81,23 +97,15 @@ public class VanChartPieCategoryLabelContentPane extends VanChartLabelContentPan
         summaryValueFormatPane.populate(pieCategoryLabelContent.getSummaryValueFormat());
     }
 
-    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
-        PieCategoryLabelContent pieCategoryLabelContent = (PieCategoryLabelContent) attrTooltipContent;
-        VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
-                getRichTextCategoryNameFormatPane(),
-                richTextSummaryValueFormatPane
-        };
-
-        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
-                pieCategoryLabelContent.getRichTextCategoryFormat(),
-                pieCategoryLabelContent.getRichTextSummaryValueFormat()
-        };
+    protected void updateTooltipFormat(AttrTooltipContent target, AttrTooltipContent source) {
+        super.updateTooltipFormat(target, source);
 
-        setRichTextAttr(new AttrTooltipRichText());
-        populateRichTextFormat(formatPaneGroup, formatGroup);
-        populateRichText(pieCategoryLabelContent.getRichTextAttr());
+        if (target instanceof PieCategoryLabelContent && source instanceof PieCategoryLabelContent) {
+            PieCategoryLabelContent targetPieCategory = (PieCategoryLabelContent) target;
+            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);
diff --git a/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieCategoryRichTextFieldListPane.java b/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieCategoryRichTextFieldListPane.java
new file mode 100644
index 000000000..deb62c01c
--- /dev/null
+++ b/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieCategoryRichTextFieldListPane.java
@@ -0,0 +1,66 @@
+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 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());
+        }
+    }
+}
diff --git a/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieValueLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieValueLabelContentPane.java
index ddc6e6631..6fdc4e584 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieValueLabelContentPane.java
+++ b/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 void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+
+        return new VanChartRichTextPane(richEditorPane) {
+
+            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
diff --git a/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieValueRichTextFieldListPane.java b/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieValueRichTextFieldListPane.java
new file mode 100644
index 000000000..072b3a801
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterRefreshTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterRefreshTooltipContentPane.java
index e5416b1c2..742df9634 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterRefreshTooltipContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterRefreshTooltipContentPane.java
@@ -77,27 +77,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);

From 0e48e287219beae43059fa54ce6b53c67cc26b29 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Sun, 24 Jan 2021 21:49:45 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=98=EF=BC=8C=E6=B8=85=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../box/VanChartBoxTooltipContentPane.java    | 66 -------------
 .../VanChartRefreshTooltipContentPane.java    | 22 -----
 .../component/VanChartTooltipContentPane.java | 99 -------------------
 ...efreshTooltipContentPaneWithOutSeries.java | 18 ----
 .../TooltipContentPaneWithOutSeries.java      | 53 +++++-----
 .../VanChartFieldListPaneWithOutSeries.java   | 34 +++++++
 .../style/VanChartFunnelLabelContentPane.java |  8 --
 ...nChartFunnelRefreshTooltipContentPane.java | 18 ----
 .../VanChartFunnelTooltipContentPane.java     |  8 --
 .../VanChartMapRefreshTooltipContentPane.java | 21 ----
 ...ChartMutiPieRefreshTooltipContentPane.java | 20 ----
 .../VanChartPieValueLabelContentPane.java     |  9 --
 ...ChartScatterRefreshTooltipContentPane.java | 29 ------
 ...artStructureRefreshTooltipContentPane.java | 22 -----
 .../VanChartStructureTooltipContentPane.java  |  9 --
 ...artWordCloudRefreshTooltipContentPane.java | 28 ------
 16 files changed, 65 insertions(+), 399 deletions(-)
 create mode 100644 designer-chart/src/main/java/com/fr/van/chart/designer/component/tooltip/VanChartFieldListPaneWithOutSeries.java

diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java
index 64501bd9a..4e7a657d6 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java
@@ -20,11 +20,8 @@ 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;
@@ -47,14 +44,6 @@ 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;
 
@@ -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());
 
@@ -225,20 +173,6 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         };
     }
 
-    protected Component[][] getRichTextComponents() {
-        return new Component[][]{
-                new Component[]{getRichTextCategoryNameFormatPane(), null},
-                new Component[]{getRichTextSeriesNameFormatPane(), null},
-                new Component[]{richTextNumber, null},
-                new Component[]{richTextMax, null},
-                new Component[]{richTextQ3, null},
-                new Component[]{richTextMedian, null},
-                new Component[]{richTextQ1, null},
-                new Component[]{richTextMin, null},
-                new Component[]{richTextOutlier, null}
-        };
-    }
-
     protected double[] getRowSize(double p) {
         return new double[]{p, p, p, p, p, p, p, p, p, p, p, p};
     }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRefreshTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRefreshTooltipContentPane.java
index 7ecb797d6..93ef14761 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRefreshTooltipContentPane.java
+++ b/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}
-        };
-    }
-
 }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
index c4c5fa9f5..7b22b02c8 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
+++ b/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;
@@ -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;
     }
@@ -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
@@ -863,27 +785,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;
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/tooltip/RefreshTooltipContentPaneWithOutSeries.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/tooltip/RefreshTooltipContentPaneWithOutSeries.java
index ca7479cc0..48d2e55cb 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/tooltip/RefreshTooltipContentPaneWithOutSeries.java
+++ b/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}
-        };
-    }
 }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/tooltip/TooltipContentPaneWithOutSeries.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/tooltip/TooltipContentPaneWithOutSeries.java
index 8724429f3..ab2f0a179 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/tooltip/TooltipContentPaneWithOutSeries.java
+++ b/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() {
-        return new Component[][]{
-                new Component[]{getRichTextCategoryNameFormatPane(), null},
-                new Component[]{getRichTextValueFormatPane(), null},
-                new Component[]{getRichTextPercentFormatPane(), null}
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+
+        return new VanChartRichTextPane(richEditorPane) {
+
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                return new VanChartFieldListPaneWithOutSeries(fieldAttrPane, richEditor);
+            }
+
+            protected AttrTooltipContent getInitialTooltipContent() {
+                return createAttrTooltip();
+            }
         };
     }
 
-    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
-        VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
-                getRichTextCategoryNameFormatPane(),
-                getRichTextValueFormatPane(),
-                getRichTextPercentFormatPane()
+    protected String[] getRichTextFieldNames() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_Use_Value"),
+                Toolkit.i18nText("Fine-Design_Chart_Use_Percent")
         };
+    }
 
-        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
-                attrTooltipContent.getRichTextCategoryFormat(),
-                attrTooltipContent.getRichTextValueFormat(),
-                attrTooltipContent.getRichTextPercentFormat()
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
+        return new AttrTooltipFormat[]{
+                new AttrTooltipCategoryFormat(),
+                new AttrTooltipValueFormat(),
+                new AttrTooltipPercentFormat()
         };
-
-        setRichTextAttr(new AttrTooltipRichText());
-        populateRichTextFormat(formatPaneGroup, formatGroup);
-        populateRichText(attrTooltipContent.getRichTextAttr());
-
-        checkRichEditorState(attrTooltipContent);
     }
 }
\ No newline at end of file
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/tooltip/VanChartFieldListPaneWithOutSeries.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/tooltip/VanChartFieldListPaneWithOutSeries.java
new file mode 100644
index 000000000..c651dbf89
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelLabelContentPane.java
index e785b562b..55c3e3e78 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelLabelContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelLabelContentPane.java
@@ -41,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));
diff --git a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelRefreshTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelRefreshTooltipContentPane.java
index b7f817eb3..bb3b8bea3 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelRefreshTooltipContentPane.java
+++ b/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}
-        };
-    }
 }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelTooltipContentPane.java
index e15c62e0c..e8c741b14 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelTooltipContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelTooltipContentPane.java
@@ -40,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));
diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapRefreshTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapRefreshTooltipContentPane.java
index 7dca0fb3b..dff8a04d5 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapRefreshTooltipContentPane.java
+++ b/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();
diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMutiPieRefreshTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMutiPieRefreshTooltipContentPane.java
index f375fa78f..f2e3534de 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMutiPieRefreshTooltipContentPane.java
+++ b/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}
-        };
-    }
-
 }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieValueLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieValueLabelContentPane.java
index 6fdc4e584..f8c094aa5 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieValueLabelContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieValueLabelContentPane.java
@@ -87,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);
diff --git a/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterRefreshTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterRefreshTooltipContentPane.java
index 742df9634..dea075650 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterRefreshTooltipContentPane.java
+++ b/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);
@@ -87,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);
diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureRefreshTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureRefreshTooltipContentPane.java
index ea09ff3c8..cfbaefc02 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureRefreshTooltipContentPane.java
+++ b/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}
-        };
-    }
 }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java
index f0252fab7..a2cb16308 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java
@@ -39,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) {
diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudRefreshTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudRefreshTooltipContentPane.java
index cab4d8558..5d0ff9f92 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudRefreshTooltipContentPane.java
+++ b/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}
-        };
-    }
 }

From 860bd0fc981c6fc947f4093dd5e7cece54405c8a Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Sun, 24 Jan 2021 22:22:19 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=8C=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=82=E6=95=B0=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/VanChartTooltipContentPane.java | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
index 7b22b02c8..947c63684 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
@@ -47,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;
 
@@ -450,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());
@@ -691,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());
@@ -728,7 +713,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         updateLabelType(attrTooltipContent);
         updateFormatPane(attrTooltipContent);
         if (supportRichEditor()) {
-            // updateRichEditor(attrTooltipContent);
             updateTooltipFormat(attrTooltipContent, this.richTextTooltipContent);
             updateTooltipRichText(attrTooltipContent);
         }

From e115ec56e0fc38237569c04e14388444beaf6590 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Sun, 24 Jan 2021 23:29:55 +0800
Subject: [PATCH 17/17] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=83=A8=E5=88=86=E5=9B=BE=E8=A1=A8=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/van/chart/designer/PlotFactory.java    | 15 +++++++++++++++
 .../component/richText/VanChartFieldListPane.java |  6 +++++-
 .../richText/VanChartRichEditorPane.java          |  8 ++++++++
 .../VanChartPieCategoryRichTextFieldListPane.java |  4 ++++
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java b/designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java
index 0f9db09fa..3167b5f59 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java
+++ b/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 {
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldListPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldListPane.java
index 60a0b1158..6e0e587be 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldListPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldListPane.java
@@ -54,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;
@@ -133,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);
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartRichEditorPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartRichEditorPane.java
index dcec83deb..69c93926c 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartRichEditorPane.java
+++ b/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) {
diff --git a/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieCategoryRichTextFieldListPane.java b/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieCategoryRichTextFieldListPane.java
index deb62c01c..15361b490 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieCategoryRichTextFieldListPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/pie/style/VanChartPieCategoryRichTextFieldListPane.java
@@ -32,6 +32,10 @@ public class VanChartPieCategoryRichTextFieldListPane extends VanChartFieldListP
                 new AttrTooltipSummaryValueFormat(), false, listener);
     }
 
+    protected boolean supportAddField() {
+        return false;
+    }
+
     protected void addDefaultFieldButton(JPanel fieldPane) {
         fieldPane.add(getCategoryNameButton());
         fieldPane.add(summaryValueButton);