Merging in latest from upstream (DESIGN/design:refs/heads/feature/x)

* commit '81f43d92dbc03dc93e63de947007ee80e68d94af': (74 commits)
  REPORT-47193 插件管理提示弹窗优化
  REPORT-47193 插件管理提示弹窗优化
  REPORT-43833 【10.0.14】远程设计数据连接/服务器数据集增加锁定 漏掉了这个panel，将解锁放到aftercommit()中
  REPORT-45901 【10.0.14】oem设计器多开接口 --加上端口限制
  REPORT-45901 【10.0.14】设计器多开接口
  REPORT-43833 【10.0.14】远程设计数据连接/服务器数据集增加锁定 【问题原因】在设计器启动的过程中，UILockButton会调用isLocked方法，此时工作空间对象池中还没有对象，因此获取到的operator是null，会报npe 【改动方案】做个判断
  CHART-17983 仪表盘目标值默认 && CHART-18024 数据集改变，监听重复导致结果错误
  CHART-18050 使用双列网格布局代替流式布局，补充国际化
  CHART-18050 富文本弹窗界面设置为可拖拽大小
  CHART-17775 删除无用方法
  CHART-18006 design 插件 提示下载地图资源
  CHART-17775 像素 & 百分比控件优化
  新增字段支持部分图表类型
  调整富文本参数顺序
  适配仪表盘，清理代码
  适配饼图
  适配箱型图
  REPORT-44666 fix 无用import
  REPORT-44666 多屏情况下 部分弹窗显示在另一块屏幕
  适配甘特图
  ...

designer-base/src/main/java/com/fr/base/svg/IconUtils.java

@@ -35,8 +35,13 @@ public class IconUtils {
         if (resource.contains(SUFFIX_SEPARATOR)) {
             // 判断是否以.svg结尾
             if (resource.endsWith(ICON_SUFFIX_SVG)) {
+                if (IOUtils.readResource(resource) != null) {
                     return SVGIcon.readSVGIcon(resource);
                 }
+                // 适配某些插件里是_normal.png、_selected.png的情况
+                String pngResource = resource.replace(ICON_SUFFIX_SVG, ICON_SUFFIX_PNG);
+                return IOUtils.readIcon(pngResource);
+            }
             return IOUtils.readIcon(resource);
         }
         // 文件无后缀时

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

@@ -15,10 +15,12 @@ import com.fr.design.env.DesignerWorkspaceType;
 import com.fr.design.env.LocalDesignerWorkspaceInfo;
 import com.fr.design.env.RemoteDesignerWorkspaceInfo;
 import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.fun.DesignerPortProvider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.locale.impl.ProductImproveMark;
 import com.fr.design.mainframe.vcs.VcsConfigManager;
 import com.fr.design.notification.SnapChatConfig;
+import com.fr.design.port.DesignerPortContext;
 import com.fr.design.update.push.DesignerPushUpdateConfigManager;
 import com.fr.design.style.color.ColorSelectConfigManager;
 import com.fr.design.utils.DesignUtils;
@@ -42,6 +44,7 @@ import com.fr.stable.ListMap;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
+import com.fr.stable.bridge.StableFactory;
 import com.fr.stable.core.UUID;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.stable.xml.XMLPrintWriter;
@@ -842,6 +845,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
      * 返回Jetty服务器的端口号
      */
     public int getEmbedServerPort() {
+        int embeddedServerPort = DesignerPortContext.getEmbeddedServerPort();
+        if (embeddedServerPort >= DesignerPort.MIN_PORT && embeddedServerPort <= DesignerPort.MAX_PORT) {
+            return embeddedServerPort;
+        }
         return this.jettyServerPort;
     }
 

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

@@ -146,7 +146,7 @@ public class EnvChangeEntrance {
                 template.refreshToolArea();
             }
             showServiceDialog(selectedEnv);
-            pluginErrorRemind(selectedEnv);
+            pluginErrorRemind();
         } catch (WorkspaceAuthException | RegistEditionException e) {
             // String title = Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed");
             // String title = Toolkit.i18nText("Fine-Design_Basic_Lic_Does_Not_Support_Remote");
@@ -302,18 +302,24 @@ public class EnvChangeEntrance {
 
     /**
      * 插件启动错误信息提示
-     * @param selectedEnv 选择的工作环境
      */
-    public void pluginErrorRemind(DesignerWorkspaceInfo selectedEnv) {
-        if (selectedEnv.getType() == DesignerWorkspaceType.Remote) {
+    public void pluginErrorRemind() {
+        if (!WorkContext.getCurrent().isLocal()) {
             return;
         }
 
         String content = PluginErrorRemindHandler.pluginErrorContent();
         if (StringUtils.isNotEmpty(content)) {
+            // 该操作需要在当前awt操作之后执行，使用SwingUtilities.invokeLater将其置于awt操作对列末尾
+            // 若使用UIUtil.invokeLaterIfNeeded，会立即执行，影响其他UI操作
+            SwingUtilities.invokeLater(new Runnable() {
+               @Override
+               public void run() {
                    PluginErrorRemindDialog dialog = new PluginErrorRemindDialog(DesignerContext.getDesignerFrame(), content);
                    dialog.setVisible(true);
                }
+            });
+        }
     }
 
     /**
@@ -431,7 +437,7 @@ public class EnvChangeEntrance {
 
     public void chooseEnv(final String envName) {
         final EnvListPane envListPane = new EnvListPane();
-        final BasicDialog envListDialog = envListPane.showWindow(SwingUtilities.getWindowAncestor(DesignerContext.getDesignerFrame()));
+        final BasicDialog envListDialog = envListPane.showWindow(DesignerContext.getDesignerFrame());
 
         envListPane.populateEnvManager(envName);
         envListDialog.addDialogActionListener(new DialogActionAdapter() {

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

@@ -39,6 +39,23 @@ public class PluginClassRefreshManager {
         }
     };
 
+    private final PluginEventListener beforeAllPluginActive = new PluginEventListener() {
+        @Override
+        public void on(PluginEvent event) {
+            PluginListenerRegistration.getInstance().stopListen(pluginAfterRunEventListener);
+        }
+    };
+
+    private final PluginEventListener afterAllPluginsActive = new PluginEventListener() {
+        @Override
+        public void on(PluginEvent event) {
+            PluginListenerRegistration.getInstance().listen(PluginEventType.AfterRun, pluginAfterRunEventListener);
+            if (DesignerLaunchStatus.getStatus() != DesignerLaunchStatus.WORKSPACE_INIT_COMPLETE) {
+                HistoryTemplateListCache.getInstance().reloadAllEditingTemplate();
+            }
+        }
+    };
+
 
     public static PluginClassRefreshManager getInstance() {
         return INSTANCE;
@@ -50,29 +67,20 @@ public class PluginClassRefreshManager {
     }
 
     private PluginClassRefreshManager() {
-        PluginListenerRegistration.getInstance().listen(PluginEventType.BeforeAllActive, new PluginEventListener() {
-            @Override
-            public void on(PluginEvent event) {
-                removePluginListener();
-            }
-        });
-        PluginListenerRegistration.getInstance().listen(PluginEventType.AfterAllActive, new PluginEventListener() {
-            @Override
-            public void on(PluginEvent event) {
-                addPluginListener();
-                if (DesignerLaunchStatus.getStatus() != DesignerLaunchStatus.WORKSPACE_INIT_COMPLETE) {
-                    HistoryTemplateListCache.getInstance().reloadAllEditingTemplate();
-                }
-            }
-        });
+        PluginListenerRegistration.getInstance().listen(PluginEventType.BeforeAllActive, beforeAllPluginActive);
+        PluginListenerRegistration.getInstance().listen(PluginEventType.AfterAllActive, afterAllPluginsActive);
     }
 
     public void removePluginListener() {
         PluginListenerRegistration.getInstance().stopListen(this.pluginAfterRunEventListener);
+        PluginListenerRegistration.getInstance().stopListen(this.beforeAllPluginActive);
+        PluginListenerRegistration.getInstance().stopListen(this.afterAllPluginsActive);
     }
 
     public void addPluginListener() {
         PluginListenerRegistration.getInstance().listen(PluginEventType.AfterRun, this.pluginAfterRunEventListener);
+        PluginListenerRegistration.getInstance().listen(PluginEventType.BeforeAllActive, beforeAllPluginActive);
+        PluginListenerRegistration.getInstance().listen(PluginEventType.AfterAllActive, afterAllPluginsActive);
     }
 
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -26,6 +26,7 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.ui.util.UIUtil;
+import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.function.TIME;
 import com.fr.general.FRFont;
 import com.fr.log.FineLoggerFactory;
@@ -168,6 +169,7 @@ public class PreviewTablePane extends BasicPane {
         this.add(new JScrollPane(preveiwTable), BorderLayout.CENTER);
         if (this.dialog == null) {
             this.dialog = this.showWindow(new JFrame());
+            GUICoreUtils.centerWindow(DesignerContext.getDesignerFrame(), this.dialog);
         }
         progressBar = new AutoProgressBar(this, Toolkit.i18nText("Fine-Design_Basic_Loading_Data"), "", 0, 100) {
             public void doMonitorCanceled() {

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

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

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

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

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

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

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

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

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

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

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

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

designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java

@@ -44,40 +44,32 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
             FineLoggerFactory.getLogger().info(successInfo);
             FineJOptionPane.showMessageDialog(null, successInfo);
         } else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) {
-            int rv = FineJOptionPane.showOptionDialog(
+            int rv = FineJOptionPane.showConfirmDialog(
                     null,
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Dependence"),
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
-                    FineJOptionPane.YES_NO_CANCEL_OPTION,
-                    FineJOptionPane.INFORMATION_MESSAGE,
-                    null,
-                    FineJOptionPane.OPTION_YES_NO_CANCEL,
-                    null
+                    Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Dependence"),
+                    Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
+                    FineJOptionPane.OK_CANCEL_OPTION,
+                    FineJOptionPane.INFORMATION_MESSAGE
             );
-            if (rv == FineJOptionPane.NO_OPTION || rv == FineJOptionPane.CANCEL_OPTION || rv == FineJOptionPane.CLOSED_OPTION) {
-                return;
-            }
+            if (rv == FineJOptionPane.OK_OPTION) {
                 List<PluginTask> pluginTasks = result.getPreTasks();
                 for(PluginTask pluginTask : pluginTasks){
                     PluginMarker marker = pluginTask.getMarker();
                     PluginOperateUtils.installPluginOnline(marker, jsCallback);
                 }
                 PluginManager.getController().install(zipFile, new InstallFromDiskCallback(zipFile, jsCallback));
+            }
         } else if(result.errorCode() == PluginErrorCode.HasLowerPluginWhenInstall){
-            int rv = FineJOptionPane.showOptionDialog(
+            int rv = FineJOptionPane.showConfirmDialog(
                     null,
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Install_Lower"),
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
-                    FineJOptionPane.YES_NO_CANCEL_OPTION,
-                    FineJOptionPane.INFORMATION_MESSAGE,
-                    null,
-                    FineJOptionPane.OPTION_YES_NO_CANCEL,
-                    null
+                    FineJOptionPane.OK_CANCEL_OPTION,
+                    FineJOptionPane.INFORMATION_MESSAGE
             );
-            if (rv == FineJOptionPane.NO_OPTION || rv == FineJOptionPane.CANCEL_OPTION || rv == FineJOptionPane.CLOSED_OPTION) {
-                return;
-            }
+            if (rv == FineJOptionPane.OK_OPTION) {
                 PluginOperateUtils.updatePluginFromDisk(zipFile, jsCallback);
+            }
         }else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"));

designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java

@@ -41,22 +41,20 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
             FineLoggerFactory.getLogger().info(successInfo);
             FineJOptionPane.showMessageDialog(null, successInfo);
         } else if(result.errorCode() == PluginErrorCode.HasLowerPluginWhenInstall){
-            int rv = FineJOptionPane.showOptionDialog(
+            int rv = FineJOptionPane.showConfirmDialog(
                     null,
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Install_Lower"),
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
-                    FineJOptionPane.YES_NO_CANCEL_OPTION,
-                    FineJOptionPane.INFORMATION_MESSAGE,
-                    null,
-                    FineJOptionPane.OPTION_YES_NO_CANCEL,
-                    null
+                    FineJOptionPane.OK_CANCEL_OPTION,
+                    FineJOptionPane.INFORMATION_MESSAGE
             );
-            if (rv == FineJOptionPane.NO_OPTION || rv == FineJOptionPane.CANCEL_OPTION || rv == FineJOptionPane.CLOSED_OPTION) {
-                jsCallback.execute("success");
-                return;
-            }
+            if (rv == FineJOptionPane.OK_OPTION) {
                 PluginMarker pluginMarker = result.getCurrentTask().getMarker();
                 PluginOperateUtils.updatePluginOnline(pluginMarker, jsCallback);
+            }
+            else {
+                jsCallback.execute("success");
+            }
         } else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"));

designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java

@@ -31,20 +31,16 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
             FineLoggerFactory.getLogger().info(successInfo);
             FineJOptionPane.showMessageDialog(null, successInfo);
         }else if (result.errorCode() == PluginErrorCode.NeedUninstallDependingPluginFirst) {
-            int rv = FineJOptionPane.showOptionDialog(
+            int rv = FineJOptionPane.showConfirmDialog(
                     null,
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Dependence"),
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
-                    FineJOptionPane.YES_NO_CANCEL_OPTION,
-                    FineJOptionPane.INFORMATION_MESSAGE,
-                    null,
-                    FineJOptionPane.OPTION_YES_NO_CANCEL,
-                    null
+                    FineJOptionPane.OK_CANCEL_OPTION,
+                    FineJOptionPane.INFORMATION_MESSAGE
             );
-            if (rv == FineJOptionPane.CANCEL_OPTION || rv == FineJOptionPane.CLOSED_OPTION) {
-                return;
-            }
+            if (rv == FineJOptionPane.OK_OPTION) {
                 PluginManager.getController().uninstall(pluginMarker, true, new UninstallPluginCallback(pluginMarker, jsCallback));
+            }
         } else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Failed"));

designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java

@@ -43,40 +43,32 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
             FineLoggerFactory.getLogger().info(successInfo);
             FineJOptionPane.showMessageDialog(null, successInfo);
         } else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) {
-            int rv = FineJOptionPane.showOptionDialog(
+            int rv = FineJOptionPane.showConfirmDialog(
                     null,
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Dependence"),
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
-                    FineJOptionPane.YES_NO_CANCEL_OPTION,
-                    FineJOptionPane.INFORMATION_MESSAGE,
-                    null,
-                    FineJOptionPane.OPTION_YES_NO_CANCEL,
-                    null
+                    FineJOptionPane.OK_CANCEL_OPTION,
+                    FineJOptionPane.INFORMATION_MESSAGE
             );
-            if (rv == FineJOptionPane.NO_OPTION || rv == FineJOptionPane.CANCEL_OPTION || rv == FineJOptionPane.CLOSED_OPTION) {
-                return;
-            }
+            if (rv == FineJOptionPane.OK_OPTION) {
                 List<PluginTask> pluginTasks = result.getPreTasks();
                 for(PluginTask pluginTask : pluginTasks){
                     PluginMarker marker = pluginTask.getMarker();
                     PluginOperateUtils.updatePluginOnline(marker, jsCallback);
                 }
                 PluginManager.getController().update(zipFile, new UpdateFromDiskCallback(zipFile, jsCallback));
+            }
         } else if(result.errorCode() == PluginErrorCode.NoPluginToUpdate){
-            int rv = FineJOptionPane.showOptionDialog(
+            int rv = FineJOptionPane.showConfirmDialog(
                     null,
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_No_Plugin_Update"),
                     Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
-                    FineJOptionPane.YES_NO_CANCEL_OPTION,
-                    FineJOptionPane.INFORMATION_MESSAGE,
-                    null,
-                    FineJOptionPane.OPTION_YES_NO_CANCEL,
-                    null
+                    FineJOptionPane.OK_CANCEL_OPTION,
+                    FineJOptionPane.INFORMATION_MESSAGE
             );
-            if (rv == FineJOptionPane.NO_OPTION || rv == FineJOptionPane.CANCEL_OPTION || rv == FineJOptionPane.CLOSED_OPTION) {
-                return;
-            }
+            if (rv == FineJOptionPane.OK_OPTION) {
                 PluginOperateUtils.installPluginFromDisk(zipFile, jsCallback);
+            }
         }else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Failed"));

designer-base/src/main/java/com/fr/design/fun/DesignerLifecycleMonitor.java

@@ -0,0 +1,31 @@
+package com.fr.design.fun;
+
+/**
+ * 设计器生命周期接口
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/1/26
+ */
+public interface DesignerLifecycleMonitor {
+
+    String MARK_STRING = "DesignerLifecycleMonitor";
+
+    int CURRENT_LEVEL = 1;
+
+    /**
+     * 设计器启动之前
+     */
+    void beforeStart();
+
+    /**
+     * 设计器启动完成 界面出现之后
+     */
+    void afterStart();
+
+    /**
+     * 设计器关闭退出之前
+     */
+    void beforeStop();
+
+}

designer-base/src/main/java/com/fr/design/fun/DesignerPortProvider.java

@@ -0,0 +1,31 @@
+package com.fr.design.fun;
+
+/**
+ * 设计器所有端口获取
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/1/18
+ */
+public interface DesignerPortProvider {
+
+    String MARK_STRING = "DesignerPortProvider";
+
+    int CURRENT_LEVEL = 1;
+
+
+    /**
+     * 设计器自身端口
+     *
+     * @return
+     */
+    int messagePort();
+
+    /**
+     * 内置服务器端口
+     *
+     * @return
+     */
+    int embeddedServerPort();
+
+}

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

@@ -247,7 +247,7 @@ public abstract class UIListControlPane extends UIControlPane implements ListCon
             resultPos.x = listPos.x + nameableList.getParent().getWidth();
         }
         // 如果右侧显示不下，可以向左移动
-        int maxX = Toolkit.getDefaultToolkit().getScreenSize().width - popupEditDialog.getWidth() - EDIT_RANGE;
+        int maxX = frame.getLocationOnScreen().x + frame.getWidth() - popupEditDialog.getWidth() - EDIT_RANGE;
         if (resultPos.x > maxX) {
             resultPos.x = maxX;
         }

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

@@ -0,0 +1,24 @@
+package com.fr.design.gui.frpane;
+
+import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.ispinner.chart.UISpinnerWithPercent;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2021-01-21
+ */
+public class UINumberDragPaneWithPercent extends UINumberDragPane {
+
+    public UINumberDragPaneWithPercent(double minValue, double maxValue) {
+        super(minValue, maxValue);
+    }
+
+    public UINumberDragPaneWithPercent(double minValue, double maxValue, double dierta) {
+        super(minValue, maxValue, dierta);
+    }
+
+    protected UISpinner createUISpinner(double minValue, double maxValue, double dierta) {
+        return new UISpinnerWithPercent(minValue, maxValue, dierta, minValue);
+    }
+}

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

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

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

@@ -166,6 +166,9 @@ public class UIModeControlContainer extends JLayeredPane {
             }
             // 拖动的距离，为正值表示往下拖动，为负值表示往上拖动
             int deltaY = e.getY();
+            if (toolPaneY < 0) {
+                toolPaneY = 0;
+            }
             toolPaneY += deltaY;
             onResize(toolPaneY);
             refreshContainer();

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

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

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

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

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

@@ -13,15 +13,28 @@ import com.fr.stable.CommonUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 
-import com.fr.stable.collections.utils.MathUtils;
-import javax.swing.*;
+import javax.swing.ButtonModel;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.plaf.ButtonUI;
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
 
 public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver {
 
@@ -46,6 +59,9 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
      */
     private int numberFieldColumns;
 
+    public UISpinner() {
+
+    }
 
     public UISpinner(double minValue, double maxValue, double dierta) {
         init(minValue, maxValue, dierta);
@@ -56,7 +72,7 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
         textField.setValue(defaultValue);
     }
 
-    private void init(double minValue, double maxValue, double dierta) {
+    protected void init(double minValue, double maxValue, double dierta) {
         this.minValue = minValue;
         this.maxValue = maxValue;
         this.dierta = dierta;

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

@@ -0,0 +1,15 @@
+package com.fr.design.gui.ispinner.chart;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2021-01-21
+ */
+public class UISpinnerWithPercent extends UISpinnerWithUnit {
+
+    private static final String UNIT = "%";
+
+    public UISpinnerWithPercent(double minValue, double maxValue, double dierta, double defaultValue) {
+        super(minValue, maxValue, dierta, defaultValue, UNIT);
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.fr.design.gui.ispinner.chart;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2021-01-21
+ */
+public class UISpinnerWithPx extends UISpinnerWithUnit {
+
+    private static final String UNIT = "px";
+
+    public UISpinnerWithPx(double defaultValue) {
+        this(0, Double.MAX_VALUE, 1, defaultValue);
+    }
+
+    public UISpinnerWithPx(double minValue, double maxValue, double dierta, double defaultValue) {
+        super(minValue, maxValue, dierta, defaultValue, UNIT);
+        this.getTextField().canFillNegativeNumber(false);
+    }
+}

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

@@ -0,0 +1,26 @@
+package com.fr.design.gui.ispinner.chart;
+
+import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.itextfield.UINumberField;
+import com.fr.design.gui.itextfield.UINumberFieldWithUnit;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2021-01-20
+ */
+public class UISpinnerWithUnit extends UISpinner {
+
+    private String unit;
+
+    public UISpinnerWithUnit(double minValue, double maxValue, double dierta, double defaultValue, String unit) {
+        this.unit = unit;
+        init(minValue, maxValue, dierta);
+        getTextField().setValue(defaultValue);
+    }
+
+    @Override
+    protected UINumberField initNumberField() {
+        return new UINumberFieldWithUnit(3, unit);
+    }
+}

designer-base/src/main/java/com/fr/design/gui/itextfield/UINumberField.java

@@ -1,16 +1,15 @@
 package com.fr.design.gui.itextfield;
 
 import com.fr.base.Utils;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.general.ComparatorUtils;
 import com.fr.stable.CoreConstants;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.PlainDocument;
-import java.awt.*;
+import java.awt.Dimension;
+import java.awt.Toolkit;
 
 /**
  * Number Field.
@@ -193,7 +192,6 @@ public class UINumberField extends UITextField {
             if (!fillNegativeNumber && strNew.contains("-")) {
                 return true;
             }
-            boolean noChange = false;
             boolean isMinus = strNew.startsWith("-");
             strNew = strNew.replaceFirst("-", StringUtils.EMPTY); // 控制能输入负数
             String strIntPart;
@@ -207,25 +205,27 @@ public class UINumberField extends UITextField {
             }
             if (isOverMaxOrMinValue(strIntPart, strDecPart, strNew)) {
                 Toolkit.getDefaultToolkit().beep();
-                noChange = true;
+                return true;
+            }
+            return checkNumber(strNew, isMinus);
         }
 
+        protected boolean checkNumber(String strValue, boolean isMinus) {
             try {
-                if (!ComparatorUtils.equals(strNew, StringUtils.EMPTY) && !ComparatorUtils.equals(strNew, "-")) {// 控制能输入负数
-                    double d = Double.parseDouble(strNew) * (isMinus ? -1 : 1);
+                if (!ComparatorUtils.equals(strValue, StringUtils.EMPTY) && !ComparatorUtils.equals(strValue, "-")) {// 控制能输入负数
+                    double d = Double.parseDouble(strValue) * (isMinus ? -1 : 1);
                     if (d < minValue || d > maxValue) {
                         throw new Exception();
                     }
                 }
             } catch (Exception e) {
                 Toolkit.getDefaultToolkit().beep();
-                noChange = true;
+                return true;
             }
-
-            return noChange;
+            return false;
         }
 
-        private boolean isOverMaxOrMinValue(String strIntPart, String strDecPart, String strNew) {
+        protected boolean isOverMaxOrMinValue(String strIntPart, String strDecPart, String strNew) {
             boolean checkLength = strIntPart.length() > maxIntegerLength
                     || strDecPart.length() > maxDecimalLength;
             return checkLength || (strNew.length() > 1 && ComparatorUtils.equals(strNew.substring(0, 1), "0") && !ComparatorUtils.equals(strNew.substring(1, 2), "."));

designer-base/src/main/java/com/fr/design/gui/itextfield/UINumberFieldWithUnit.java

@@ -0,0 +1,114 @@
+package com.fr.design.gui.itextfield;
+
+import com.fr.base.Utils;
+import com.fr.general.ComparatorUtils;
+import com.fr.stable.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.awt.Toolkit;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2021-01-20
+ * 这个控件不会限制输入的数字大小，但是同样不允许输入数字之外的字符
+ */
+public class UINumberFieldWithUnit extends UINumberField {
+
+    private String unit;
+
+    private List<String> unitList = new ArrayList<>();
+
+    public UINumberFieldWithUnit(int columns, String unit) {
+        super(columns);
+        this.unit = unit;
+        initUnitList();
+    }
+
+    //对单位的字符进行组合
+    private void initUnitList() {
+        char[] chars = unit.toCharArray();
+        Set<String> set = new LinkedHashSet<>();
+        initUnitList(chars, 0, StringUtils.EMPTY, set);
+        unitList.addAll(set);
+        Collections.sort(unitList, Comparator.comparing(String::length));
+    }
+
+    private void initUnitList(char[] chars, int index, String str, Set<String> set) {
+        if (index == chars.length) {
+            return;
+        }
+        for (int i = index; i < chars.length; i++) {
+            String newStr = str + chars[i];
+            set.add(newStr);
+            initUnitList(chars, i + 1, newStr, set);
+        }
+    }
+
+    public void setFieldDocument() {
+        setDocument(new NumberDocumentNoLimit());
+    }
+
+    public void setValue(double value) {
+        this.setText(Utils.doubleToString(value) + unit);
+    }
+
+    public double getValue() throws NumberFormatException {
+        try {
+            String text = this.getText();
+            if (StringUtils.isEmpty(text)) {
+                return 0;
+            }
+
+            return Double.parseDouble(text.replace(getEndString(text), StringUtils.EMPTY));
+        } catch (NumberFormatException numberFormatException) {
+            return UINumberField.ERROR_VALUE;
+        }
+    }
+
+    private String getEndString(String text) {
+        int size = unitList.size();
+        for (int i = size - 1; i >= 0; i--) {
+            String unit = unitList.get(i);
+            if (text.endsWith(unit)) {
+                return unit;
+
+            }
+        }
+        return StringUtils.EMPTY;
+    }
+
+    class NumberDocumentNoLimit extends NumberDocument {
+
+        public boolean checkString(int offset, String s, String str) {
+            return (ComparatorUtils.equals(s, "F")
+                    || ComparatorUtils.equals(s, "f")
+                    || ComparatorUtils.equals(s, "D")
+                    || ComparatorUtils.equals(s, "d")
+                    || (ComparatorUtils.equals(s, ".") && getMaxDecimalLength() == 0));
+
+        }
+
+        protected boolean isOverMaxOrMinValue(String strIntPart, String strDecPart, String strNew) {
+            return super.isOverMaxOrMinValue(strIntPart, strDecPart, strNew.replaceFirst(getEndString(strNew), StringUtils.EMPTY));
+        }
+
+        protected boolean checkNumber(String strValue, boolean isMinus) {
+            try {
+                if (ComparatorUtils.equals(strValue, StringUtils.EMPTY) || ComparatorUtils.equals(strValue, "-")) {
+                    return false;
+                }
+                Double.parseDouble(strValue.replaceFirst(getEndString(strValue), StringUtils.EMPTY));
+            } catch (Exception e) {
+                Toolkit.getDefaultToolkit().beep();
+                return true;
+            }
+            return false;
+        }
+    }
+}

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

@@ -99,7 +99,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
 
     public enum PropertyMode {
         REPORT,  // 报表
-        REPORT_PARA,  // 报表参数面板
+        REPORT_PARA_WIDGET,  //报表参数面板中的控件
+        REPORT_PARA(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings")),  // 报表参数面板
         REPORT_FLOAT,  // 报表悬浮元素
         FORM(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings")),  // 表单
         FORM_REPORT,  // 表单报表块
@@ -272,27 +273,27 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         propertyItemMap = new LinkedHashMap<>();  // 有序map
         // 单元格元素
         PropertyItem cellElement = new PropertyItem(KEY_CELL_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Element"),
-                "cellelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
+                "cellelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
         // 单元格属性
         PropertyItem cellAttr = new PropertyItem(KEY_CELL_ATTR, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Attributes"),
-                "cellattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
+                "cellattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
         // 悬浮元素
         PropertyItem floatElement = new PropertyItem(KEY_FLOAT_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Float_Element"),
-                "floatelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
+                "floatelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.POLY_REPORT});
         // 控件设置
         PropertyItem widgetSettings = new PropertyItem(KEY_WIDGET_SETTINGS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings"),
-                "widgetsettings", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.FORM, PropertyMode.POLY},
-                new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.FORM, PropertyMode.POLY_REPORT, PropertyMode.POLY_CHART});
+                "widgetsettings", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.FORM, PropertyMode.POLY},
+                new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.FORM, PropertyMode.POLY_REPORT, PropertyMode.POLY_CHART});
         // 条件属性
         PropertyItem conditionAttr = new PropertyItem(KEY_CONDITION_ATTR, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"),
-                "conditionattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
+                "conditionattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
         // 超级链接
         PropertyItem hyperlink = new PropertyItem(KEY_HYPERLINK, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hyperlink"),
-                "hyperlink", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
+                "hyperlink", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
         // 组件库
         PropertyItem widgetLib = new PropertyItem(KEY_WIDGET_LIB, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Library"),

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

@@ -340,17 +340,24 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
 
     public void refreshResource(FILE file) {
 
-        try {
-            this.template = JTemplateFactory.asIOFile(file, this.suffix());
-            setTarget(this.template);
-
+        setTargetByFile(file);
+        UIUtil.invokeLaterIfNeeded(new Runnable() {
+            @Override
+            public void run() {
                 // 先移除旧的。
                 removeCenterPane();
                 // 加入新的
                 addCenterPane();
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+
+                refreshToolArea();
+            }
+        });
+
     }
+
+    private void setTargetByFile(FILE file) {
+        this.template = JTemplateFactory.asIOFile(file, this.suffix());
+        setTarget(this.template);
     }
 
     private void addCenterPane() {

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileParamSettingPane.java

@@ -12,6 +12,7 @@ import com.fr.form.ui.mobile.MobileParamStyle;
 import com.fr.general.ComparatorUtils;
 import com.fr.report.ExtraReportClassManager;
 import com.fr.report.fun.MobileParamStyleProvider;
+import com.fr.report.mobile.EmptyMobileParamStyle;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Component;
@@ -103,7 +104,10 @@ public class MobileParamSettingPane extends BasicPane {
                 if (ComparatorUtils.equals(mobileParamStyle.disPlayName(), provider.displayName())) {
                     String displayName = provider.displayName();
                     paramStyleList.setSelectedIndex(i);
+                    // 如果是兼容空类型 无须填充面板
+                    if (!(mobileParamStyle instanceof EmptyMobileParamStyle)) {
                         map.get(displayName).populateBean(mobileParamStyle);
+                    }
                     card.show(right, displayName);
                     return;
                 }

designer-base/src/main/java/com/fr/design/monitor/DesignerLifecycleMonitorContext.java

@@ -0,0 +1,47 @@
+package com.fr.design.monitor;
+
+import com.fr.design.fun.DesignerLifecycleMonitor;
+import com.fr.stable.bridge.StableFactory;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/1/27
+ */
+public class DesignerLifecycleMonitorContext {
+
+    private static DesignerLifecycleMonitor monitor;
+
+    static {
+        DesignerLifecycleMonitor designerLifecycleMonitor = StableFactory.getMarkedInstanceObjectFromClass(DesignerLifecycleMonitor.MARK_STRING, DesignerLifecycleMonitor.class);
+        if (designerLifecycleMonitor != null) {
+            monitor = designerLifecycleMonitor;
+        } else {
+            monitor = new EmptyDesignerLifecycleMonitor();
+        }
+    }
+
+    public static DesignerLifecycleMonitor getMonitor() {
+        return monitor;
+    }
+
+    static class EmptyDesignerLifecycleMonitor implements DesignerLifecycleMonitor {
+
+        @Override
+        public void beforeStart() {
+
+        }
+
+        @Override
+        public void afterStart() {
+
+        }
+
+        @Override
+        public void beforeStop() {
+
+        }
+    }
+
+
+}

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

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

designer-base/src/main/java/com/fr/design/port/DesignerPortContext.java

@@ -0,0 +1,32 @@
+package com.fr.design.port;
+
+import com.fr.design.fun.DesignerPortProvider;
+import com.fr.stable.bridge.StableFactory;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/1/27
+ */
+public class DesignerPortContext {
+
+    private static int messagePort = -1;
+
+    private static int embeddedServerPort = -1;
+
+    static {
+        DesignerPortProvider designerPortProvider = StableFactory.getMarkedInstanceObjectFromClass(DesignerPortProvider.MARK_STRING, DesignerPortProvider.class);
+        if (designerPortProvider != null) {
+            messagePort = designerPortProvider.messagePort();
+            embeddedServerPort = designerPortProvider.embeddedServerPort();
+        }
+    }
+
+    public static int getMessagePort() {
+        return messagePort;
+    }
+
+    public static int getEmbeddedServerPort() {
+        return embeddedServerPort;
+    }
+}

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

@@ -85,6 +85,7 @@ public class ExpandFileChooser extends JFileChooser {
     @Override
     public int showDialog(Component parent, String approveButtonText) {
         dialog.setModal(true);
+        GUICoreUtils.centerWindow(parent, dialog);
         dialog.setVisible(true);
         return retVal;
     }

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

@@ -206,6 +206,10 @@ public class ColorAdjustPane extends JPanel implements UIObserver {
                 public void setVisible(boolean b) {
                     super.setVisible(b);
                 }
+
+                protected boolean selectRealTime() {
+                    return false;
+                }
             };
             colorPane.addChangeListener(new ChangeListener() {
                 public void stateChanged(ChangeEvent e) {

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

@@ -115,12 +115,16 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
         row1Pane.setPreferredSize(new Dimension(135, 24));  // 宽度为 16 * 8 + 7
 
         // 最近使用
-        UsedColorPane usedColorPane = new UsedColorPane(1, 8, 1, this, true, true);
+        UsedColorPane usedColorPane = new UsedColorPane(1, 8, 1, this, true, selectRealTime());
         usedColorPane.getPane().setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 8));
         row1Pane.add(usedColorPane.getPane());
         return row1Pane;
     }
 
+    protected boolean selectRealTime() {
+        return true;
+    }
+
     protected Color[] getColorArray() {
         return ColorFactory.MenuColors;
     }

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

@@ -4,19 +4,21 @@ import com.fr.common.report.ReportState;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.RestartHelper;
 import com.fr.design.dialog.TipDialog;
+import com.fr.design.fun.DesignerPortProvider;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.port.DesignerPortContext;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.exit.DesignerExiter;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.IOUtils;
-import com.fr.process.ProcessEventPipe;
 import com.fr.process.engine.core.CarryMessageEvent;
 import com.fr.process.engine.core.FineProcessContext;
 import com.fr.stable.StringUtils;
+import com.fr.stable.bridge.StableFactory;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLReadable;
 import com.fr.stable.xml.XMLWriter;
@@ -35,8 +37,8 @@ import java.awt.event.ActionListener;
 public class DesignerPort implements XMLReadable, XMLWriter {
 
     public static final String XML_TAG = "DesignerPort";
-    private static final int MIN_PORT = 1024;
-    private static final int MAX_PORT = 65535;
+    public static final int MIN_PORT = 1024;
+    public static final int MAX_PORT = 65535;
 
     public static final  DesignerPort INSTANCE = new DesignerPort();
 
@@ -58,6 +60,10 @@ public class DesignerPort implements XMLReadable, XMLWriter {
     private int debugMessagePort = 51463;
 
     public int getMessagePort() {
+        int extraMessagePort = DesignerPortContext.getMessagePort();
+        if (extraMessagePort >= MIN_PORT && extraMessagePort <= MAX_PORT) {
+            return extraMessagePort;
+        }
         return messagePort;
     }
 

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

@@ -292,6 +292,24 @@ public final class GUICoreUtils {
 		return button;
 	}
 
+
+	/**
+	 * 将独立弹窗设置在中间位置 适应多屏 跟随设计器主界面
+	 * 可从父界面获取弹窗应该所在的矩形范围
+	 *
+	 * @param parent 独立弹窗的父窗口
+	 * @param win 弹窗自身
+	 */
+	public static void centerWindow(Component parent, Window win) {
+		Rectangle rectangle;
+		if (parent == null) {
+			rectangle = DesignerContext.getDesignerFrame().getGraphicsConfiguration().getBounds();
+		} else {
+			rectangle = parent.getGraphicsConfiguration().getBounds();
+		}
+		centerWindow(win, rectangle);
+	}
+
 	/**
 	 * 设置一个窗口
 	 *
@@ -301,7 +319,14 @@ public final class GUICoreUtils {
 		// Toolkit.getDefaultToolkit().getScreenSize()在有多个显示器也只能获取到主屏的大小
 		// getGraphicsConfiguration().getBounds()能获取多个屏时 设计器主体界面所在屏的大小和对应的坐标
 		Rectangle rectangle = win.getGraphicsConfiguration().getBounds();
+		centerWindow(win, rectangle);
+	}
 
+	/**
+	 * @param win
+	 * @param rectangle  窗口所在的一个矩形范围
+	 */
+	public static void centerWindow(Window win, Rectangle rectangle) {
 		Dimension screenSize = rectangle.getSize();
 
 		Dimension winSize = win.getSize();
@@ -315,6 +340,7 @@ public final class GUICoreUtils {
 		win.setLocation(rectangle.x + (screenSize.width - winSize.width) / 2, rectangle.y + (screenSize.height - winSize.height) / 2 - WINDOW_GAP);
 	}
 
+
 	/**
 	 * Gets window/frame to screen center.
 	 * @param owerWin 父窗口

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

@@ -6,7 +6,6 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.FRFont;
-import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 
 import javax.swing.BorderFactory;
@@ -14,52 +13,65 @@ import javax.swing.Icon;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JTextArea;
+import javax.swing.JTextPane;
+import javax.swing.text.SimpleAttributeSet;
+import javax.swing.text.StyleConstants;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Frame;
+import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.Locale;
 
 /**
  * 插件启动失败提示窗
  */
 public class PluginErrorRemindDialog extends JDialog implements ActionListener {
 
-    public PluginErrorRemindDialog(Frame parent, String areaText) {
+    private static final String SIM_HEI = "SimHei";
+
+    public PluginErrorRemindDialog(Frame parent, String text) {
         super(parent, true);
         //上面的标签面板
         JPanel topPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
         JPanel imagePanel = new JPanel();
-        Icon icon = IOUtils.readIcon("com/fr/design/images/warnings/warning5.png");
+        Icon icon = IOUtils.readIcon("com/fr/design/images/warnings/icon_WarningIcon_normal.png");
 
         JLabel imageLabel = new JLabel();
         imageLabel.setIcon(icon);
         imagePanel.add(imageLabel);
-        imagePanel.setPreferredSize(new Dimension(130, 100));
+        imagePanel.setPreferredSize(new Dimension(48, 48));
 
         JPanel verticalPanel = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true);
 
         JLabel label = new JLabel(Toolkit.i18nText("Fine-Design_Plugin_Error_Remind_Title"));
-        label.setFont(FRFont.getInstance().applySize(18).applyStyle(1));
-        label.setPreferredSize(new Dimension(650, 100));
+        label.setFont(FRFont.getInstance().applySize(16).applyName(SIM_HEI));
+        label.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 20));
 
         verticalPanel.add(label);
 
         topPanel.add(imagePanel, BorderLayout.WEST);
         topPanel.add(verticalPanel, BorderLayout.CENTER);
-        topPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 10));
+        topPanel.setPreferredSize(new Dimension(600, 73));
+        topPanel.setBorder(BorderFactory.createEmptyBorder(10, 20, 0, 20));
 
         //中间的文本域面板
         JPanel centerPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
-        centerPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
-        centerPanel.setPreferredSize(new Dimension(480, 320));
+        centerPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
+        centerPanel.setPreferredSize(new Dimension(580, 269));
+
+        JTextPane textPane = new JTextPane();
+
+        SimpleAttributeSet attributeSet = new SimpleAttributeSet();
+        StyleConstants.setFontFamily(attributeSet, SIM_HEI);
+        StyleConstants.setLineSpacing(attributeSet, 0.5f);
+        textPane.setParagraphAttributes(attributeSet, true);
 
-        JTextArea checkArea = new JTextArea(areaText);
-        checkArea.setEnabled(false);
-        centerPanel.add(checkArea, BorderLayout.CENTER);
+        textPane.setEditable(false);
+        textPane.setMargin(new Insets(10, 10, 10, 10));
+        textPane.setText(text);
+        centerPanel.add(textPane, BorderLayout.CENTER);
 
         UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Plugin_Error_Remind_Not_Deal_With"));
         UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Plugin_Error_Remind_Deal_With"));
@@ -69,7 +81,7 @@ public class PluginErrorRemindDialog extends JDialog implements ActionListener {
 
         // 按钮
         JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
-        buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
+        buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
         buttonPanel.add(cancelButton);
         buttonPanel.add(okButton);
 
@@ -80,7 +92,7 @@ public class PluginErrorRemindDialog extends JDialog implements ActionListener {
         this.add(topPanel, BorderLayout.NORTH);
         this.add(centerPanel, BorderLayout.CENTER);
         this.add(buttonPanel, BorderLayout.SOUTH);
-        this.setSize(new Dimension(GeneralContext.getLocale().equals(Locale.US) ? 750 : 600, 500));
+        this.setSize(new Dimension(600, 400));
 
         GUICoreUtils.centerWindow(this);
     }

designer-base/src/main/java/com/fr/exit/DesignerExiter.java

@@ -1,10 +1,9 @@
 package com.fr.exit;
 
 import com.fr.design.env.DesignerWorkspaceGenerator;
+import com.fr.design.monitor.DesignerLifecycleMonitorContext;
 import com.fr.process.engine.core.FineProcessContext;
 import com.fr.process.engine.core.FineProcessEngineEvent;
-import com.fr.stable.StableUtils;
-
 
 /**
  * @author hades
@@ -20,6 +19,7 @@ public class DesignerExiter {
     }
 
     public void execute() {
+        DesignerLifecycleMonitorContext.getMonitor().beforeStop();
         beforeExit();
         if (FineProcessContext.getParentPipe() != null) {
             FineProcessContext.getParentPipe().syncFire(FineProcessEngineEvent.DESTROY);

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

@@ -14,6 +14,7 @@ import com.fr.design.fun.DesignerStartOpenFileProcessor;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
+import com.fr.design.monitor.DesignerLifecycleMonitorContext;
 import com.fr.design.ui.util.UIUtil;
 import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
@@ -75,6 +76,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
         EventDispatcher.listen(DesignerLaunchStatus.STARTUP_COMPLETE, new Listener<Null>() {
             @Override
             public void on(Event event, Null param) {
+                DesignerLifecycleMonitorContext.getMonitor().afterStart();
                 EventDispatcher.stopListen(this);
                 // 启动完成 停止监听
                 ProcessEventPipe eventPipe = FineProcessContext.getParentPipe();

designer-base/src/main/resources/com/fr/design/images/gui/color/background_normal.svg

@@ -3,6 +3,5 @@
     <title>icon_文本背景色_normal</title>
     <g id="icon_文本背景色_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M9,0 L8.9993,1.656 L11.3546845,4.01296053 C12.496044,4.07957725 16,4.48860182 16,7 C16,10 13,12 13,12 C13,12 13.4489375,10.2042499 12.842809,7.81595247 L7.6363,13.021 L1.9793,7.364 L4.9993,4.344 L5,0 L9,0 Z M7.9993,2.756 L3.3933,7.364 L7.6363,11.606 L12.5054659,6.73651111 C12.4728171,6.64900228 12.4386503,6.56099677 12.4029036,6.47254402 L8.9993,3.07 L9,6 L8,6 L7.9993,2.756 Z M7.9993,1 L5.9993,1 L5.9993,3.344 L7.9993,1.344 L7.9993,1 Z" id="Combined-Shape" fill="#333334"></path>
-        <rect id="Rectangle" fill="#F87777" x="0" y="12" width="16" height="4"></rect>
     </g>
 </svg>

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

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

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

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

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

@@ -1,143 +1,140 @@
-//package com.fr.design;
-//
-////import com.fr.decision.webservice.v10.plugin.helper.PluginErrorRemindHandler;
-//import com.fr.design.env.DesignerWorkspaceInfo;
-//import com.fr.design.env.DesignerWorkspaceType;
-//import com.fr.design.env.LocalDesignerWorkspaceInfo;
-//import com.fr.design.env.RemoteDesignerWorkspaceInfo;
-//import com.fr.env.CheckServiceDialog;
-//import com.fr.env.PluginErrorRemindDialog;
-//import com.fr.invoke.Reflect;
-//import com.fr.workspace.connect.WorkspaceConnectionInfo;
-//import com.fr.workspace.engine.channel.http.FunctionalHttpRequest;
-//import org.easymock.EasyMock;
-//import org.junit.Assert;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.powermock.api.easymock.PowerMock;
-//import org.powermock.core.classloader.annotations.PrepareForTest;
-//import org.powermock.modules.junit4.PowerMockRunner;
-//
-//import java.awt.Frame;
-//
-///**
-// * @author: Maksim
-// * @Date: Created in 2020/3/5
-// * @Description:
-// */
-//@RunWith(PowerMockRunner.class)
-//@PrepareForTest({FunctionalHttpRequest.class,
-//        EnvChangeEntrance.class,
-//        CheckServiceDialog.class,
-//        DesignerEnvManager.class,
-//        PluginErrorRemindHandler.class})
-//public class EnvChangeEntranceTest {
-//
-//    @Test
-//    public void showServiceDialog() throws Exception {
-//        try {
-//            EnvChangeEntrance entrance = EnvChangeEntrance.getInstance();
-//            DesignerWorkspaceInfo selectedEnv = EasyMock.mock(DesignerWorkspaceInfo.class);
-//            WorkspaceConnectionInfo connectionInfo = EasyMock.mock(WorkspaceConnectionInfo.class);
-//
-//            String remoteBranch = "Build#persist-2020.02.15.01.01.12.12";
-//            EasyMock.expect(selectedEnv.getConnection()).andReturn(connectionInfo);
-//            EasyMock.expect(selectedEnv.getType()).andReturn(DesignerWorkspaceType.Remote);
-//            EasyMock.expect(selectedEnv.getRemindTime()).andReturn(null);
-//
-//            FunctionalHttpRequest request = EasyMock.mock(FunctionalHttpRequest.class);
-//            EasyMock.expect(request.getServiceList()).andReturn(null);
-//
-//            PowerMock.expectNew(FunctionalHttpRequest.class, connectionInfo).andReturn(request).anyTimes();
-//            EasyMock.expect(request.getServerBranch()).andReturn(remoteBranch);
-//
-//            CheckServiceDialog dialog = EasyMock.mock(CheckServiceDialog.class);
-//            PowerMock.expectNew(CheckServiceDialog.class, EasyMock.anyObject(Frame.class), EasyMock.anyString(), EasyMock.anyString(), EasyMock.anyString()).andReturn(dialog);
-//
-//            EasyMock.replay(request, selectedEnv, connectionInfo);
-//            PowerMock.replayAll();
-//
-//            entrance.showServiceDialog(selectedEnv);
-//
-//        }catch (Exception e){
-//            Assert.fail();
-//        }
-//    }
-//
-//    @Test
-//    public void testUpdateNotRememberPwdEnv() {
-//
-//        DesignerEnvManager manager = new DesignerEnvManager();
-//
-//        PowerMock.mockStatic(DesignerEnvManager.class);
-//        EasyMock.expect(DesignerEnvManager.getEnvManager()).andReturn(manager).anyTimes();
-//
-//        PowerMock.replayAll();
-//
-//        EnvChangeEntrance entrance = EnvChangeEntrance.getInstance();
-//
-//        manager.putEnv("test1", RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "password", "", "", true)));
-//        manager.putEnv("test2", RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "password", "", "", false)));
-//        manager.putEnv("test3", LocalDesignerWorkspaceInfo.create("name", "path"));
-//
-//        Reflect.on(entrance).call("updateNotRememberPwdEnv");
-//
-//        Assert.assertEquals(manager.getWorkspaceInfo("test1").getConnection(), RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "password", "", "", true)).getConnection());
-//        Assert.assertEquals(manager.getWorkspaceInfo("test2").getConnection(), RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "", "", "", false)).getConnection());
-//        Assert.assertEquals(manager.getWorkspaceInfo("test3").getName(), "name");
-//        Assert.assertEquals(manager.getWorkspaceInfo("test3").getPath(), "path");
-//
-//        PowerMock.verifyAll();
-//
-//    }
-//
-//    @Test
-//    public void testIsNotRememberPwd() {
-//        EnvChangeEntrance entrance = EnvChangeEntrance.getInstance();
-//
-//        DesignerWorkspaceInfo info1 = RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "password", "", "", true));
-//        DesignerWorkspaceInfo info2 = RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "111", "", "", false));
-//        DesignerWorkspaceInfo info3 = LocalDesignerWorkspaceInfo.create("name", "path");
-//        DesignerWorkspaceInfo info4 = null;
-//
-//        Assert.assertFalse(Reflect.on(entrance).call("isNotRememberPwd", info1).get());
-//        Assert.assertTrue(Reflect.on(entrance).call("isNotRememberPwd", info2).get());
-//        Assert.assertFalse(Reflect.on(entrance).call("isNotRememberPwd", info3).get());
-//        Assert.assertFalse(Reflect.on(entrance).call("isNotRememberPwd", info4).get());
-//    }
-//
-//    @Test
-//    public void testPluginErrorRemind() throws Exception {
-//
-//        try {
-//            DesignerWorkspaceInfo selectedEnv = EasyMock.mock(DesignerWorkspaceInfo.class);
-//            EasyMock.expect(selectedEnv.getType()).andReturn(DesignerWorkspaceType.Remote).once();
-//            EasyMock.expect(selectedEnv.getType()).andReturn(DesignerWorkspaceType.Local).times(2);
-//
-//            PowerMock.mockStatic(PluginErrorRemindHandler.class);
-//            EasyMock.expect(PluginErrorRemindHandler.pluginErrorContent()).andReturn("").once();
-//            EasyMock.expect(PluginErrorRemindHandler.pluginErrorContent()).andReturn("111").once();
-//
-//            PluginErrorRemindDialog dialog = EasyMock.mock(PluginErrorRemindDialog.class);
-//            PowerMock.expectNew(PluginErrorRemindDialog.class, EasyMock.anyObject(Frame.class), EasyMock.anyString()).andReturn(dialog).once();
-//
-//            dialog.setVisible(true);
-//            EasyMock.expectLastCall();
-//
-//            EasyMock.replay(selectedEnv, dialog);
-//            PowerMock.replayAll();
-//
-//            EnvChangeEntrance entrance = EnvChangeEntrance.getInstance();
-//
-//            entrance.pluginErrorRemind(selectedEnv);
-//            entrance.pluginErrorRemind(selectedEnv);
-//            entrance.pluginErrorRemind(selectedEnv);
-//
-//
-//            EasyMock.verify(selectedEnv, dialog);
-//            PowerMock.verifyAll();
-//        } catch (Exception e) {
-//            Assert.fail();
-//        }
-//    }
-//}
+package com.fr.design;
+
+import com.fr.decision.webservice.v10.plugin.helper.PluginErrorRemindHandler;
+import com.fr.design.env.DesignerWorkspaceInfo;
+import com.fr.design.env.DesignerWorkspaceType;
+import com.fr.design.env.LocalDesignerWorkspaceInfo;
+import com.fr.design.env.RemoteDesignerWorkspaceInfo;
+import com.fr.env.CheckServiceDialog;
+import com.fr.env.PluginErrorRemindDialog;
+import com.fr.invoke.Reflect;
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.Workspace;
+import com.fr.workspace.connect.WorkspaceConnectionInfo;
+import com.fr.workspace.engine.channel.http.FunctionalHttpRequest;
+import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.awt.Frame;
+
+/**
+ * @author: Maksim
+ * @Date: Created in 2020/3/5
+ * @Description:
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({FunctionalHttpRequest.class,
+        EnvChangeEntrance.class,
+        CheckServiceDialog.class,
+        DesignerEnvManager.class,
+        PluginErrorRemindHandler.class,
+        WorkContext.class})
+public class EnvChangeEntranceTest {
+
+    @Test
+    public void showServiceDialog() throws Exception {
+        try {
+            EnvChangeEntrance entrance = EnvChangeEntrance.getInstance();
+            DesignerWorkspaceInfo selectedEnv = EasyMock.mock(DesignerWorkspaceInfo.class);
+            WorkspaceConnectionInfo connectionInfo = EasyMock.mock(WorkspaceConnectionInfo.class);
+
+            String remoteBranch = "Build#persist-2020.02.15.01.01.12.12";
+            EasyMock.expect(selectedEnv.getConnection()).andReturn(connectionInfo);
+            EasyMock.expect(selectedEnv.getType()).andReturn(DesignerWorkspaceType.Remote);
+            EasyMock.expect(selectedEnv.getRemindTime()).andReturn(null);
+
+            FunctionalHttpRequest request = EasyMock.mock(FunctionalHttpRequest.class);
+            EasyMock.expect(request.getServiceList()).andReturn(null);
+
+            PowerMock.expectNew(FunctionalHttpRequest.class, connectionInfo).andReturn(request).anyTimes();
+            EasyMock.expect(request.getServerBranch()).andReturn(remoteBranch);
+
+            CheckServiceDialog dialog = EasyMock.mock(CheckServiceDialog.class);
+            PowerMock.expectNew(CheckServiceDialog.class, EasyMock.anyObject(Frame.class), EasyMock.anyString(), EasyMock.anyString(), EasyMock.anyString()).andReturn(dialog);
+
+            EasyMock.replay(request, selectedEnv, connectionInfo);
+            PowerMock.replayAll();
+
+            entrance.showServiceDialog(selectedEnv);
+
+        }catch (Exception e){
+            Assert.fail();
+        }
+    }
+
+    @Test
+    public void testUpdateNotRememberPwdEnv() {
+
+        DesignerEnvManager manager = new DesignerEnvManager();
+
+        PowerMock.mockStatic(DesignerEnvManager.class);
+        EasyMock.expect(DesignerEnvManager.getEnvManager()).andReturn(manager).anyTimes();
+
+        PowerMock.replayAll();
+
+        EnvChangeEntrance entrance = EnvChangeEntrance.getInstance();
+
+        manager.putEnv("test1", RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "password", "", "", true)));
+        manager.putEnv("test2", RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "password", "", "", false)));
+        manager.putEnv("test3", LocalDesignerWorkspaceInfo.create("name", "path"));
+
+        Reflect.on(entrance).call("updateNotRememberPwdEnv");
+
+        Assert.assertEquals(manager.getWorkspaceInfo("test1").getConnection(), RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "password", "", "", true)).getConnection());
+        Assert.assertEquals(manager.getWorkspaceInfo("test2").getConnection(), RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "", "", "", false)).getConnection());
+        Assert.assertEquals(manager.getWorkspaceInfo("test3").getName(), "name");
+        Assert.assertEquals(manager.getWorkspaceInfo("test3").getPath(), "path");
+
+        PowerMock.verifyAll();
+
+    }
+
+    @Test
+    public void testIsNotRememberPwd() {
+        EnvChangeEntrance entrance = EnvChangeEntrance.getInstance();
+
+        DesignerWorkspaceInfo info1 = RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "password", "", "", true));
+        DesignerWorkspaceInfo info2 = RemoteDesignerWorkspaceInfo.create(new WorkspaceConnectionInfo("url", "userName", "111", "", "", false));
+        DesignerWorkspaceInfo info3 = LocalDesignerWorkspaceInfo.create("name", "path");
+        DesignerWorkspaceInfo info4 = null;
+
+        Assert.assertFalse(Reflect.on(entrance).call("isNotRememberPwd", info1).get());
+        Assert.assertTrue(Reflect.on(entrance).call("isNotRememberPwd", info2).get());
+        Assert.assertFalse(Reflect.on(entrance).call("isNotRememberPwd", info3).get());
+        Assert.assertFalse(Reflect.on(entrance).call("isNotRememberPwd", info4).get());
+    }
+
+    @Test
+    public void testPluginErrorRemind() {
+
+        try {
+
+            Workspace workspace = EasyMock.mock(Workspace.class);
+            EasyMock.expect(workspace.isLocal()).andReturn(false).once();
+            EasyMock.expect(workspace.isLocal()).andReturn(true).once();
+            PowerMock.mockStatic(WorkContext.class);
+            EasyMock.expect(WorkContext.getCurrent()).andReturn(workspace).anyTimes();
+
+            PowerMock.mockStatic(PluginErrorRemindHandler.class);
+            EasyMock.expect(PluginErrorRemindHandler.pluginErrorContent()).andReturn("").once();
+
+            EasyMock.replay(workspace);
+            PowerMock.replayAll();
+
+            EnvChangeEntrance entrance = EnvChangeEntrance.getInstance();
+
+            entrance.pluginErrorRemind();
+            entrance.pluginErrorRemind();
+
+            EasyMock.verify(workspace);
+            PowerMock.verifyAll();
+        } catch (Exception e) {
+            Assert.fail();
+        }
+    }
+}

designer-base/src/test/java/com/fr/design/extra/PluginOperateUtilsTest.java

@@ -1,155 +1,155 @@
-//package com.fr.design.extra;
-//
-//import com.fr.invoke.Reflect;
-//import com.fr.json.JSONObject;
-//import com.fr.plugin.context.PluginContext;
-//import com.fr.plugin.context.PluginMarker;
-//import com.fr.plugin.context.PluginMarkerAdapter;
-//import com.fr.plugin.error.PluginErrorCode;
-//import com.fr.plugin.manage.PluginManager;
-//import com.fr.plugin.manage.control.PluginTask;
-//import com.fr.plugin.manage.control.PluginTaskResult;
-//import org.easymock.EasyMock;
-//import org.junit.Assert;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.powermock.api.easymock.PowerMock;
-//import org.powermock.core.classloader.annotations.PrepareForTest;
-//import org.powermock.modules.junit4.PowerMockRunner;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * @author Lucian.Chen
-// * @version 10.0
-// * Created by Lucian.Chen on 2020/12/17
-// */
-//@RunWith(PowerMockRunner.class)
-//@PrepareForTest({PluginManager.class, PluginUtils.class})
-//public class PluginOperateUtilsTest {
-//
-//    @Test
-//    public void testGetSuccessInfo() {
-//        PluginTaskResult pluginTaskResult = EasyMock.mock(PluginTaskResult.class);
-//        PluginTaskResult pluginTaskResult1 = EasyMock.mock(PluginTaskResult.class);
-//        PluginTaskResult pluginTaskResult2 = EasyMock.mock(PluginTaskResult.class);
-//
-//        List<PluginTaskResult> pluginTaskResults1 = new ArrayList<>();
-//        pluginTaskResults1.add(pluginTaskResult1);
-//        List<PluginTaskResult> pluginTaskResults2 = new ArrayList<>();
-//        pluginTaskResults2.add(pluginTaskResult1);
-//        pluginTaskResults2.add(pluginTaskResult2);
-//
-//        PluginMarker pluginMarker1 = PluginMarker.create("plugin-1", "1.0");
-//        PluginMarker pluginMarker2 = PluginMarkerAdapter.create("plugin-2", "2.0", "name-2");
-//        PluginTask pluginTask1 = PluginTask.installTask(pluginMarker1);
-//        PluginTask pluginTask2 = PluginTask.installTask(pluginMarker2);
-//
-//        EasyMock.expect(pluginTaskResult.asList()).andReturn(pluginTaskResults1).times(2);
-//        EasyMock.expect(pluginTaskResult.asList()).andReturn(pluginTaskResults2).times(2);
-//        EasyMock.expect(pluginTaskResult1.getCurrentTask()).andReturn(pluginTask1).anyTimes();
-//        EasyMock.expect(pluginTaskResult2.getCurrentTask()).andReturn(pluginTask2).anyTimes();
-//
-//        EasyMock.expect(pluginTaskResult1.errorCode()).andReturn(PluginErrorCode.BelowSystem).anyTimes();
-//        EasyMock.expect(pluginTaskResult2.errorCode()).andReturn(PluginErrorCode.BeyondSystem).anyTimes();
-//
-//        PluginContext plugin1 = EasyMock.mock(PluginContext.class);
-//        PluginContext plugin2 = EasyMock.mock(PluginContext.class);
-//        EasyMock.expect(plugin1.getName()).andReturn("context-1").anyTimes();
-//        EasyMock.expect(plugin2.getName()).andReturn("context-2").anyTimes();
-//        PowerMock.mockStatic(PluginManager.class);
-//        EasyMock.expect(PluginManager.getContext(pluginMarker1.getPluginID()))
-//                .andReturn(plugin1).once().andReturn(null).once().andReturn(plugin1).once().andReturn(null).once();
-//        EasyMock.expect(PluginManager.getContext(pluginMarker2.getPluginID()))
-//                .andReturn(plugin2).once().andReturn(null).once();
-//
-//        EasyMock.replay(pluginTaskResult, pluginTaskResult1, pluginTaskResult2, plugin1, plugin2);
-//        PowerMock.replayAll();
-//
-//        // 1个
-//        Assert.assertEquals(PluginOperateUtils.getSuccessInfo(pluginTaskResult), "context-1Fine-Core_Plugin_Error_BelowSystem");
-//        Assert.assertEquals(PluginOperateUtils.getSuccessInfo(pluginTaskResult), "plugin-1Fine-Core_Plugin_Error_BelowSystem");
-//
-//
-//        // 2个
-//        Assert.assertEquals(PluginOperateUtils.getSuccessInfo(pluginTaskResult), "context-1Fine-Core_Plugin_Error_BelowSystem\ncontext-2Fine-Core_Plugin_Error_BeyondSystem");
-//        Assert.assertEquals(PluginOperateUtils.getSuccessInfo(pluginTaskResult), "plugin-1Fine-Core_Plugin_Error_BelowSystem\nname-2Fine-Core_Plugin_Error_BeyondSystem");
-//
-//        EasyMock.verify(pluginTaskResult, pluginTaskResult1, pluginTaskResult2, plugin1, plugin2);
-//        PowerMock.verifyAll();
-//
-//    }
-//
-//
-//    @Test
-//    public void testGetPluginName() {
-//        PluginContext pluginContext = EasyMock.mock(PluginContext.class);
-//        EasyMock.expect(pluginContext.getName()).andReturn("pluginContext").once();
-//
-//        PluginMarker pluginMarker1 = PluginMarker.create("id-1", "1");
-//        PluginMarker pluginMarker2 = PluginMarkerAdapter.create("id-2", "2", "name-2");
-//
-//        EasyMock.replay(pluginContext);
-//
-//        Assert.assertEquals(Reflect.on(PluginOperateUtils.class).call("getPluginName", null, null).get(), "");
-//        Assert.assertEquals(Reflect.on(PluginOperateUtils.class).call("getPluginName", pluginContext, pluginMarker1).get(), "pluginContext");
-//        Assert.assertEquals(Reflect.on(PluginOperateUtils.class).call("getPluginName", null, pluginMarker1).get(), "id-1");
-//        Assert.assertEquals(Reflect.on(PluginOperateUtils.class).call("getPluginName", null, pluginMarker2).get(), "name-2");
-//
-//        EasyMock.verify(pluginContext);
-//    }
-//
-//    @Test
-//    public void testUpdateMarker2Online() {
-//
-//        try {
-//            PluginMarker pluginMarker = PluginMarker.create("plugin-1", "1.0");
-//            String pluginJson = "{\"id\": plugin-1,\"name\": \"图表(新特性)\",\"version\": \"8.6.16\"}";
-//            JSONObject object = new JSONObject(pluginJson);
-//
-//            PowerMock.mockStatic(PluginUtils.class);
-//            EasyMock.expect(PluginUtils.getLatestPluginInfo("plugin-1")).andReturn(object).once();
-//            EasyMock.expect(PluginUtils.getLatestPluginInfo("plugin-1")).andThrow(new NullPointerException()).once();
-//
-//            PowerMock.replayAll();
-//
-//            PluginMarker marker1 = PluginOperateUtils.updateMarker2Online(pluginMarker);
-//            PluginMarker marker2 = PluginOperateUtils.updateMarker2Online(pluginMarker);
-//
-//            Assert.assertTrue(marker1 instanceof PluginMarkerAdapter);
-//            Assert.assertEquals(marker1.getPluginID(), "plugin-1");
-//            Assert.assertEquals(marker1.getVersion(), "1.0");
-//            Assert.assertEquals(((PluginMarkerAdapter) marker1).getPluginName(), "图表(新特性)");
-//            Assert.assertEquals(marker2, pluginMarker);
-//
-//            PowerMock.verifyAll();
-//        } catch (Exception e) {
-//            Assert.fail();
-//        }
-//
-//    }
-//
-//
-//    @Test
-//    public void testUpdatePluginOnline() {
-//        try {
-//            PluginMarker pluginMarker = PluginMarker.create("plugin-1", "1.0");
-//            String pluginJson = "{\"id\": plugin-1,\"name\": \"图表(新特性)\",\"version\": \"8.6.16\"}";
-//            JSONObject object = new JSONObject(pluginJson);
-//
-//            PowerMock.mockStatic(PluginUtils.class);
-//            EasyMock.expect(PluginUtils.getLatestPluginInfo("plugin-1")).andReturn(object).once();
-//            EasyMock.expect(PluginUtils.getInstalledPluginMarkerByID("plugin-1")).andReturn(pluginMarker).once();
-//
-//            PowerMock.replayAll();
-//
-//            PluginOperateUtils.updatePluginOnline(pluginMarker, null);
-//
-//            PowerMock.verifyAll();
-//        } catch (Exception e) {
-//            Assert.fail();
-//        }
-//    }
-//
-//}
+package com.fr.design.extra;
+
+import com.fr.invoke.Reflect;
+import com.fr.json.JSONObject;
+import com.fr.plugin.context.PluginContext;
+import com.fr.plugin.context.PluginMarker;
+import com.fr.plugin.context.PluginMarkerAdapter;
+import com.fr.plugin.error.PluginErrorCode;
+import com.fr.plugin.manage.PluginManager;
+import com.fr.plugin.manage.control.PluginTask;
+import com.fr.plugin.manage.control.PluginTaskResult;
+import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Lucian.Chen
+ * @version 10.0
+ * Created by Lucian.Chen on 2020/12/17
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({PluginManager.class, PluginUtils.class})
+public class PluginOperateUtilsTest {
+
+    @Test
+    public void testGetSuccessInfo() {
+        PluginTaskResult pluginTaskResult = EasyMock.mock(PluginTaskResult.class);
+        PluginTaskResult pluginTaskResult1 = EasyMock.mock(PluginTaskResult.class);
+        PluginTaskResult pluginTaskResult2 = EasyMock.mock(PluginTaskResult.class);
+
+        List<PluginTaskResult> pluginTaskResults1 = new ArrayList<>();
+        pluginTaskResults1.add(pluginTaskResult1);
+        List<PluginTaskResult> pluginTaskResults2 = new ArrayList<>();
+        pluginTaskResults2.add(pluginTaskResult1);
+        pluginTaskResults2.add(pluginTaskResult2);
+
+        PluginMarker pluginMarker1 = PluginMarker.create("plugin-1", "1.0");
+        PluginMarker pluginMarker2 = PluginMarkerAdapter.create("plugin-2", "2.0", "name-2");
+        PluginTask pluginTask1 = PluginTask.installTask(pluginMarker1);
+        PluginTask pluginTask2 = PluginTask.installTask(pluginMarker2);
+
+        EasyMock.expect(pluginTaskResult.asList()).andReturn(pluginTaskResults1).times(2);
+        EasyMock.expect(pluginTaskResult.asList()).andReturn(pluginTaskResults2).times(2);
+        EasyMock.expect(pluginTaskResult1.getCurrentTask()).andReturn(pluginTask1).anyTimes();
+        EasyMock.expect(pluginTaskResult2.getCurrentTask()).andReturn(pluginTask2).anyTimes();
+
+        EasyMock.expect(pluginTaskResult1.errorCode()).andReturn(PluginErrorCode.BelowSystem).anyTimes();
+        EasyMock.expect(pluginTaskResult2.errorCode()).andReturn(PluginErrorCode.BeyondSystem).anyTimes();
+
+        PluginContext plugin1 = EasyMock.mock(PluginContext.class);
+        PluginContext plugin2 = EasyMock.mock(PluginContext.class);
+        EasyMock.expect(plugin1.getName()).andReturn("context-1").anyTimes();
+        EasyMock.expect(plugin2.getName()).andReturn("context-2").anyTimes();
+        PowerMock.mockStatic(PluginManager.class);
+        EasyMock.expect(PluginManager.getContext(pluginMarker1.getPluginID()))
+                .andReturn(plugin1).once().andReturn(null).once().andReturn(plugin1).once().andReturn(null).once();
+        EasyMock.expect(PluginManager.getContext(pluginMarker2.getPluginID()))
+                .andReturn(plugin2).once().andReturn(null).once();
+
+        EasyMock.replay(pluginTaskResult, pluginTaskResult1, pluginTaskResult2, plugin1, plugin2);
+        PowerMock.replayAll();
+
+        // 1个
+        Assert.assertEquals(PluginOperateUtils.getSuccessInfo(pluginTaskResult), "context-1Fine-Core_Plugin_Error_BelowSystem");
+        Assert.assertEquals(PluginOperateUtils.getSuccessInfo(pluginTaskResult), "plugin-1Fine-Core_Plugin_Error_BelowSystem");
+
+
+        // 2个
+        Assert.assertEquals(PluginOperateUtils.getSuccessInfo(pluginTaskResult), "context-1Fine-Core_Plugin_Error_BelowSystem\ncontext-2Fine-Core_Plugin_Error_BeyondSystem");
+        Assert.assertEquals(PluginOperateUtils.getSuccessInfo(pluginTaskResult), "plugin-1Fine-Core_Plugin_Error_BelowSystem\nname-2Fine-Core_Plugin_Error_BeyondSystem");
+
+        EasyMock.verify(pluginTaskResult, pluginTaskResult1, pluginTaskResult2, plugin1, plugin2);
+        PowerMock.verifyAll();
+
+    }
+
+
+    @Test
+    public void testGetPluginName() {
+        PluginContext pluginContext = EasyMock.mock(PluginContext.class);
+        EasyMock.expect(pluginContext.getName()).andReturn("pluginContext").once();
+
+        PluginMarker pluginMarker1 = PluginMarker.create("id-1", "1");
+        PluginMarker pluginMarker2 = PluginMarkerAdapter.create("id-2", "2", "name-2");
+
+        EasyMock.replay(pluginContext);
+
+        Assert.assertEquals(Reflect.on(PluginOperateUtils.class).call("getPluginName", null, null).get(), "");
+        Assert.assertEquals(Reflect.on(PluginOperateUtils.class).call("getPluginName", pluginContext, pluginMarker1).get(), "pluginContext");
+        Assert.assertEquals(Reflect.on(PluginOperateUtils.class).call("getPluginName", null, pluginMarker1).get(), "id-1");
+        Assert.assertEquals(Reflect.on(PluginOperateUtils.class).call("getPluginName", null, pluginMarker2).get(), "name-2");
+
+        EasyMock.verify(pluginContext);
+    }
+
+    @Test
+    public void testUpdateMarker2Online() {
+
+        try {
+            PluginMarker pluginMarker = PluginMarker.create("plugin-1", "1.0");
+            String pluginJson = "{\"id\": plugin-1,\"name\": \"图表(新特性)\",\"version\": \"8.6.16\"}";
+            JSONObject object = new JSONObject(pluginJson);
+
+            PowerMock.mockStatic(PluginUtils.class);
+            EasyMock.expect(PluginUtils.getLatestPluginInfo("plugin-1")).andReturn(object).once();
+            EasyMock.expect(PluginUtils.getLatestPluginInfo("plugin-1")).andThrow(new NullPointerException()).once();
+
+            PowerMock.replayAll();
+
+            PluginMarker marker1 = PluginOperateUtils.updateMarker2Online(pluginMarker);
+            PluginMarker marker2 = PluginOperateUtils.updateMarker2Online(pluginMarker);
+
+            Assert.assertTrue(marker1 instanceof PluginMarkerAdapter);
+            Assert.assertEquals(marker1.getPluginID(), "plugin-1");
+            Assert.assertEquals(marker1.getVersion(), "1.0");
+            Assert.assertEquals(((PluginMarkerAdapter) marker1).getPluginName(), "图表(新特性)");
+            Assert.assertEquals(marker2, pluginMarker);
+
+            PowerMock.verifyAll();
+        } catch (Exception e) {
+            Assert.fail();
+        }
+
+    }
+
+
+    @Test
+    public void testUpdatePluginOnline() {
+        try {
+            PluginMarker pluginMarker = PluginMarker.create("plugin-1", "1.0");
+            String pluginJson = "{\"id\": plugin-1,\"name\": \"图表(新特性)\",\"version\": \"8.6.16\"}";
+            JSONObject object = new JSONObject(pluginJson);
+
+            PowerMock.mockStatic(PluginUtils.class);
+            EasyMock.expect(PluginUtils.getLatestPluginInfo("plugin-1")).andReturn(object).once();
+            EasyMock.expect(PluginUtils.getInstalledPluginMarkerByID("plugin-1")).andReturn(pluginMarker).once();
+
+            PowerMock.replayAll();
+
+            PluginOperateUtils.updatePluginOnline(pluginMarker, null);
+
+            PowerMock.verifyAll();
+        } catch (Exception e) {
+            Assert.fail();
+        }
+    }
+
+}

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

@@ -14,6 +14,7 @@ import com.fr.locale.LocaleMarker;
 import com.fr.locale.LocaleScope;
 import com.fr.module.Activator;
 import com.fr.module.extension.Prepare;
+import com.fr.plugin.chart.DownloadSourcesHelper;
 import com.fr.plugin.chart.vanchart.export.ImagePainter;
 import com.fr.stable.bridge.StableFactory;
 import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
@@ -44,7 +45,7 @@ public class ChartDesignerActivator extends Activator implements Prepare {
 
         DesignModuleFactory.registerExtraWidgetOptions(ChartTypeInterfaceManager.initWidgetOption());
 
-        ImagePainter.registerDownloadSourcesEvent(new DownloadOnlineSourcesHelper());
+        DownloadSourcesHelper.registerDownloadSourcesEvent(new DownloadOnlineSourcesHelper());
         ImagePainter.registerDefaultCallbackEvent(HistoryTemplateListCache.getInstance());
 
         ChartTypeInterfaceManager.addPluginChangedListener();

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelAlphaPane.java

@@ -5,6 +5,7 @@ import com.fr.chart.base.DataSeriesCondition;
 import com.fr.design.condition.ConditionAttrSingleConditionPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.UINumberDragPane;
+import com.fr.design.gui.frpane.UINumberDragPaneWithPercent;
 import com.fr.design.gui.ilable.UILabel;
 
 
@@ -32,7 +33,7 @@ public class LabelAlphaPane extends ConditionAttrSingleConditionPane<DataSeriesC
 
         nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha"));
         UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha") + ":");
-        alphaPane = new UINumberDragPane(0, ALPHASIZE);
+        alphaPane = new UINumberDragPaneWithPercent(0, ALPHASIZE);
 
         JPanel panel = new JPanel(new BorderLayout());
 

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

@@ -82,7 +82,12 @@ public class DatabaseTableDataPane extends BasicPane{
 	}
 
 	private void initTableCombox() {
-		tableNameCombox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource());
+		tableNameCombox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource()){
+		    //图表的数据集选择下拉框，不需要注册监听，chartEditPane已经注册了。
+			public void registerDSChangeListener() {
+
+			}
+		};
 		tableNameCombox.addItemListener(new ItemListener() {
 			@Override
 			public void itemStateChanged(ItemEvent e) {

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

@@ -56,6 +56,7 @@ public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane
         this.setLayout(new BorderLayout());
 
         nameBox = new UIComboBoxWithNone();
+        nameBox.setSelectedIndex(nameBox.getItemCount() -1);
         valueBox = new UIComboBox();
         targetBox = new UIComboBox();
         custom = new TinyFormulaPane();

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

@@ -4,6 +4,7 @@ import com.fr.base.background.ColorBackground;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.ispinner.chart.UISpinnerWithPx;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.plugin.chart.base.AttrBorderWithWidth;
@@ -31,7 +32,7 @@ public class VanChartBoxBorderPane extends BasicBeanPane<AttrBorderWithWidth> {
                 };
             }
         };
-        lineWidth = new UISpinner(0.5, Double.MAX_VALUE, 0.5, 0.5);
+        lineWidth = new UISpinnerWithPx(0.5, Double.MAX_VALUE, 0.5, 0.5);
 
         Component[][] components = new Component[][]{
                 new Component[]{null, null},

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

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

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

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

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

@@ -4,8 +4,8 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.ui.ModernUIPane;
 import com.fr.plugin.chart.base.AttrTooltipContent;
-import com.fr.plugin.chart.base.AttrTooltipRichText;
 import com.fr.plugin.chart.base.format.AttrTooltipCategoryFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipDataMaxFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipDataMedianFormat;
@@ -20,17 +20,17 @@ import com.fr.plugin.chart.box.attr.AttrBoxTooltipContent;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
-import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
-import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithCheckBox;
-import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+import com.fr.van.chart.designer.component.richText.VanChartRichTextPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.util.Map;
 
 public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
 
@@ -44,20 +44,9 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     private VanChartFormatPaneWithCheckBox min;
     private VanChartFormatPaneWithCheckBox outlier;
 
-    private VanChartFormatPaneWithoutCheckBox richTextNumber;
-    private VanChartFormatPaneWithoutCheckBox richTextMax;
-    private VanChartFormatPaneWithoutCheckBox richTextQ3;
-    private VanChartFormatPaneWithoutCheckBox richTextMedian;
-    private VanChartFormatPaneWithoutCheckBox richTextQ1;
-    private VanChartFormatPaneWithoutCheckBox richTextMin;
-    private VanChartFormatPaneWithoutCheckBox richTextOutlier;
-
     private JPanel dataNumberPane;
     private JPanel dataOutlierPane;
 
-    private JPanel richTextNumberPane;
-    private JPanel richTextOutlierPane;
-
     public VanChartBoxTooltipContentPane(VanChartStylePane parent, JPanel showOnPane, boolean isDetailed) {
         super(parent, showOnPane);
         checkFormatVisible(isDetailed);
@@ -104,47 +93,6 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         };
     }
 
-    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        setRichTextCategoryNameFormatPane(new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
-
-        richTextNumber = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
-            protected String getCheckBoxText() {
-                return Toolkit.i18nText("Fine-Design_Chart_Data_Number");
-            }
-        };
-        richTextMax = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
-            protected String getCheckBoxText() {
-                return Toolkit.i18nText("Fine-Design_Chart_Max_Value");
-            }
-        };
-        richTextQ3 = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
-            protected String getCheckBoxText() {
-                return Toolkit.i18nText("Fine-Design_Chart_Data_Q3");
-            }
-        };
-        richTextMedian = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
-            protected String getCheckBoxText() {
-                return Toolkit.i18nText("Fine-Design_Chart_Data_Median");
-            }
-        };
-        richTextQ1 = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
-            protected String getCheckBoxText() {
-                return Toolkit.i18nText("Fine-Design_Chart_Data_Q1");
-            }
-        };
-        richTextMin = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
-            protected String getCheckBoxText() {
-                return Toolkit.i18nText("Fine-Design_Chart_Min_Value");
-            }
-        };
-        richTextOutlier = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
-            protected String getCheckBoxText() {
-                return Toolkit.i18nText("Fine-Design_Chart_Outlier_Value");
-            }
-        };
-    }
-
     protected JPanel createCommonFormatPanel() {
         JPanel commonPanel = new JPanel(new BorderLayout());
 
@@ -155,27 +103,73 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         return commonPanel;
     }
 
-    protected JPanel createRichFormatPanel() {
-        JPanel richFormatPanel = new JPanel(new BorderLayout());
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
 
-        richFormatPanel.add(createRichTextCateAndSeriesPane(), BorderLayout.NORTH);
-        richFormatPanel.add(createRichTextDataNumberPane(), BorderLayout.CENTER);
-        richFormatPanel.add(createRichTextDataDetailPane(), BorderLayout.SOUTH);
+        return new VanChartRichTextPane(richEditorPane) {
 
-        return richFormatPanel;
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                if (detailed) {
+                    return new VanChartBoxRichTextDetailedFieldListPane(fieldAttrPane, richEditor);
+                }
+
+                return new VanChartBoxRichTextResultFieldListPane(fieldAttrPane, richEditor);
             }
 
-    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 AttrTooltipContent getInitialTooltipContent() {
+                return createAttrTooltip();
+            }
+        };
+    }
+
+    protected String[] getRichTextFieldNames() {
+        if (detailed) {
+            return new String[]{
+                    Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name"),
+                    Toolkit.i18nText("Fine-Design_Chart_Series_Name"),
+                    Toolkit.i18nText("Fine-Design_Chart_Data_Number"),
+                    Toolkit.i18nText("Fine-Design_Chart_Max_Value"),
+                    Toolkit.i18nText("Fine-Design_Chart_Data_Q3"),
+                    Toolkit.i18nText("Fine-Design_Chart_Data_Median"),
+                    Toolkit.i18nText("Fine-Design_Chart_Data_Q1"),
+                    Toolkit.i18nText("Fine-Design_Chart_Min_Value"),
+                    Toolkit.i18nText("Fine-Design_Chart_Outlier_Value")
+            };
+        }
+
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_Series_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_Max_Value"),
+                Toolkit.i18nText("Fine-Design_Chart_Data_Q3"),
+                Toolkit.i18nText("Fine-Design_Chart_Data_Median"),
+                Toolkit.i18nText("Fine-Design_Chart_Data_Q1"),
+                Toolkit.i18nText("Fine-Design_Chart_Min_Value")
+        };
+    }
+
+    protected 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 new AttrTooltipFormat[]{
+                new AttrTooltipCategoryFormat(),
+                new AttrTooltipSeriesFormat(),
+                new AttrTooltipDataMaxFormat(),
+                new AttrTooltipDataQ3Format(),
+                new AttrTooltipDataMedianFormat(),
+                new AttrTooltipDataQ1Format(),
+                new AttrTooltipDataMinFormat()
         };
     }
 
@@ -249,72 +243,6 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         return detailPane;
     }
 
-    private JPanel createRichTextCateAndSeriesPane() {
-        double p = TableLayout.PREFERRED;
-        double f = TableLayout.FILL;
-        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
-
-        double[] columnSize = {f, e};
-        double[] rowSize = {p, p, p};
-
-        Component[][] cateAndSeries = new Component[][]{
-                new Component[]{null, null},
-                new Component[]{null, getRichTextCategoryNameFormatPane()},
-                new Component[]{null, getRichTextSeriesNameFormatPane()}
-        };
-
-        return TableLayoutHelper.createTableLayoutPane(cateAndSeries, rowSize, columnSize);
-    }
-
-    private JPanel createRichTextDataNumberPane() {
-        double p = TableLayout.PREFERRED;
-        double f = TableLayout.FILL;
-        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
-
-        double[] columnSize = {f, e};
-        double[] rowSize = {p, p};
-
-        Component[][] dataNumber = new Component[][]{
-                new Component[]{null, null},
-                new Component[]{null, richTextNumber},
-        };
-
-        richTextNumberPane = TableLayoutHelper.createTableLayoutPane(dataNumber, rowSize, columnSize);
-
-        return richTextNumberPane;
-    }
-
-    private JPanel createRichTextDataDetailPane() {
-        double p = TableLayout.PREFERRED;
-        double f = TableLayout.FILL;
-        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
-
-        double[] columnSize = {f, e};
-
-        JPanel detailPane = new JPanel(new BorderLayout());
-
-        Component[][] richTextDetail = new Component[][]{
-                new Component[]{null, null},
-                new Component[]{null, richTextMax},
-                new Component[]{new UILabel(getLabelContentTitle()), richTextQ3},
-                new Component[]{null, richTextMedian},
-                new Component[]{null, richTextQ1},
-                new Component[]{null, richTextMin}
-        };
-
-        Component[][] dataOutlier = new Component[][]{
-                new Component[]{null, null},
-                new Component[]{null, richTextOutlier},
-        };
-
-        richTextOutlierPane = TableLayoutHelper.createTableLayoutPane(dataOutlier, new double[]{p, p}, columnSize);
-
-        detailPane.add(TableLayoutHelper.createTableLayoutPane(richTextDetail, new double[]{p, p, p, p, p, p}, columnSize), BorderLayout.NORTH);
-        detailPane.add(richTextOutlierPane, BorderLayout.CENTER);
-
-        return detailPane;
-    }
-
     public boolean isDirty() {
         return getCategoryNameFormatPane().isDirty()
                 || getSeriesNameFormatPane().isDirty()
@@ -362,65 +290,23 @@ 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());
+    protected void updateTooltipFormat(AttrTooltipContent target, AttrTooltipContent source) {
+        super.updateTooltipFormat(target, source);
 
-        AttrTooltipSeriesFormat seriesFormat = attrTooltipContent.getRichTextSeriesFormat();
-        getRichTextSeriesNameFormatPane().populate(seriesFormat);
-        getRichTextSeriesNameFormatPane().updateFormatParams(params, seriesFormat.getJs());
+        if (target instanceof AttrBoxTooltipContent && source instanceof AttrBoxTooltipContent) {
+            AttrBoxTooltipContent targetGantt = (AttrBoxTooltipContent) target;
+            AttrBoxTooltipContent sourceGantt = (AttrBoxTooltipContent) source;
 
-        if (attrTooltipContent instanceof AttrBoxTooltipContent) {
-            AttrBoxTooltipContent boxTooltipContent = (AttrBoxTooltipContent) attrTooltipContent;
-
-            VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = getFormatPaneGroup();
-            AttrTooltipFormat[] formatGroup = getFormatGroup(boxTooltipContent);
-
-            populateRichTextFormat(formatPaneGroup, formatGroup);
-            populateRichText(attrTooltipContent.getRichTextAttr());
-
-            checkRichEditorState(attrTooltipContent);
+            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());
         }
     }
 
-    private VanChartFormatPaneWithoutCheckBox[] getFormatPaneGroup() {
-        if (detailed) {
-            return new VanChartFormatPaneWithoutCheckBox[]{
-                    richTextNumber, richTextMax, richTextQ3, richTextMedian,
-                    richTextQ1, richTextMin, richTextOutlier
-            };
-        }
-
-        return new VanChartFormatPaneWithoutCheckBox[]{
-                richTextMax, richTextQ3, richTextMedian, richTextQ1, richTextMin
-        };
-    }
-
-    private AttrTooltipFormat[] getFormatGroup(AttrBoxTooltipContent boxTooltipContent) {
-        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 (detailed) {
-            return new AttrTooltipFormat[]{
-                    richTextNumber, richTextMaxFormat, richTextQ3Format, richTextMedianFormat,
-                    richTextQ1Format, richTextMinFormat, richTextOutlierFormat
-            };
-        }
-
-        return new AttrTooltipFormat[]{
-                richTextMaxFormat, richTextQ3Format, richTextMedianFormat, richTextQ1Format, richTextMinFormat
-        };
-    }
-
     protected void updateFormatPane(AttrTooltipContent attrTooltipContent) {
         getCategoryNameFormatPane().update(attrTooltipContent.getCategoryFormat());
         getSeriesNameFormatPane().update(attrTooltipContent.getSeriesFormat());
@@ -440,30 +326,10 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         }
     }
 
-    protected void updateRichEditor(AttrTooltipContent attrTooltipContent) {
-        getRichTextCategoryNameFormatPane().update(attrTooltipContent.getRichTextCategoryFormat());
-        getRichTextSeriesNameFormatPane().update(attrTooltipContent.getRichTextSeriesFormat());
-
-        if (attrTooltipContent instanceof AttrBoxTooltipContent) {
-            AttrBoxTooltipContent boxTooltipContent = (AttrBoxTooltipContent) attrTooltipContent;
-
-            richTextNumber.update(boxTooltipContent.getRichTextNumber());
-            richTextMax.update(boxTooltipContent.getRichTextMax());
-            richTextQ3.update(boxTooltipContent.getRichTextQ3());
-            richTextMedian.update(boxTooltipContent.getRichTextMedian());
-            richTextQ1.update(boxTooltipContent.getRichTextQ1());
-            richTextMin.update(boxTooltipContent.getRichTextMin());
-            richTextOutlier.update(boxTooltipContent.getRichTextOutlier());
-        }
-    }
-
     public void checkFormatVisible(boolean detailed) {
         this.detailed = detailed;
 
         dataNumberPane.setVisible(detailed);
         dataOutlierPane.setVisible(detailed);
-
-        richTextNumberPane.setVisible(detailed);
-        richTextOutlierPane.setVisible(detailed);
     }
 }

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

@@ -4,6 +4,7 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.ispinner.chart.UISpinnerWithPx;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 
@@ -24,8 +25,8 @@ public class VanChartBubblePane extends BasicBeanPane<VanChartAttrBubble> {
     private UIButtonGroup<Integer> displayNegative;
 
     public VanChartBubblePane(){
-        minDiameter = new UISpinner(0,Double.MAX_VALUE,1,0);
-        maxDiameter = new UISpinner(0,Double.MAX_VALUE,1,0);
+        minDiameter = new UISpinnerWithPx(0);
+        maxDiameter = new UISpinnerWithPx(0);
         shadow = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});
         displayNegative = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),

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

@@ -3,6 +3,7 @@ package com.fr.van.chart.column;
 import com.fr.design.chart.comp.BorderAttriPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.ispinner.chart.UISpinnerWithPx;
 
 
 import java.awt.Dimension;
@@ -19,7 +20,7 @@ public class ColumnBorderAttriPane extends BorderAttriPane {
 
     public ColumnBorderAttriPane(String radiusString) {
         this.add(new UILabel(radiusString + ":"));
-        radius = new UISpinner(0,1000,1,0);
+        radius = new UISpinnerWithPx(0,1000,1,0);
         this.add(radius);
         radius.setPreferredSize(new Dimension(60, 18));
     }

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

@@ -3,6 +3,8 @@ package com.fr.van.chart.column;
 import com.fr.base.background.ImageBackground;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartglyph.ConditionAttr;
+import com.fr.design.gui.frpane.UINumberDragPaneWithPercent;
+import com.fr.design.gui.ispinner.chart.UISpinnerWithPx;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.gui.frpane.UINumberDragPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
@@ -76,10 +78,10 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane {
 
     private JPanel createSeriesStylePane(double[] row, double[] col) {
         isFixedWidth = new UIButtonGroup<Integer>(new String[]{Toolkit.i18nText("Fine-Design_Chart_YES"), Toolkit.i18nText("Fine-Design_Chart_NO")});
-        columnWidth = new UISpinner(0,1000,1,0);
+        columnWidth = new UISpinnerWithPx(0,1000,1,0);
         columnWidth.setBorder(BorderFactory.createEmptyBorder(0, (int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH + TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0));
-        seriesGap = new UINumberDragPane(-100, 100);
-        categoryGap = new UINumberDragPane(0, 100);
+        seriesGap = new UINumberDragPaneWithPercent(-100, 100);
+        categoryGap = new UINumberDragPaneWithPercent(0, 100);
         isFillWithImage = new UIButtonGroup<Integer>(new String[]{Toolkit.i18nText("Fine-Design_Chart_YES"), Toolkit.i18nText("Fine-Design_Chart_NO")});
         imagePane = new ImageBackgroundQuickPane(false);
         imagePane.setBorder(BorderFactory.createEmptyBorder(0,(int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH + TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0));

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

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

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

@@ -2,6 +2,7 @@ package com.fr.van.chart.designer.component;
 
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.frpane.UINumberDragPane;
+import com.fr.design.gui.frpane.UINumberDragPaneWithPercent;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 
@@ -36,7 +37,7 @@ public class VanChartAreaSeriesFillColorPane extends BasicPane {
                 };
             }
         };
-        transparent = new UINumberDragPane(0, 100);
+        transparent = new UINumberDragPaneWithPercent(0, 100);
 
         JPanel transparentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha"), transparent);
 

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

@@ -4,6 +4,7 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.ispinner.chart.UISpinnerWithPx;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.utils.gui.UIComponentUtils;
@@ -15,11 +16,11 @@ import com.fr.plugin.chart.type.LineType;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
 import javax.swing.JPanel;
+import java.util.Arrays;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.Arrays;
 
 /**
  * line相关设置
@@ -74,7 +75,7 @@ public class VanChartLineTypePane extends BasicPane {
 
         lineTypeComboBox = createLineType();
 
-        lineWidthSpinner = new UISpinner(LINE_WIDTH_MIN_VALUE, Integer.MAX_VALUE, LINE_WIDTH_DIERTA_VALUE, LINE_WIDTH_DEFAULT_VALUE);
+        lineWidthSpinner = new UISpinnerWithPx(LINE_WIDTH_MIN_VALUE, Integer.MAX_VALUE, LINE_WIDTH_DIERTA_VALUE, LINE_WIDTH_DEFAULT_VALUE);
 
         lineTypeComboBox.addActionListener(new ActionListener() {
             @Override

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

@@ -1,9 +1,7 @@
 package com.fr.van.chart.designer.component;
 
 import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
-import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
-import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -34,14 +32,6 @@ public class VanChartRefreshTooltipContentPane extends VanChartTooltipContentPan
         setChangedPercentFormatPane(new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane));
     }
 
-    @Override
-    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        super.initRichTextFormatPane(parent, showOnPane);
-
-        setRichTextChangedValueFormatPane(new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextChangedPercentFormatPane(new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane));
-    }
-
     protected Component[][] getPaneComponents(){
         return new Component[][]{
                 new Component[]{getCategoryNameFormatPane(), null},
@@ -52,16 +42,4 @@ public class VanChartRefreshTooltipContentPane extends VanChartTooltipContentPan
                 new Component[]{getChangedPercentFormatPane(), null},
         };
     }
-
-    protected Component[][] getRichTextComponents() {
-        return new Component[][]{
-                new Component[]{getRichTextCategoryNameFormatPane(), null},
-                new Component[]{getRichTextSeriesNameFormatPane(), null},
-                new Component[]{getRichTextValueFormatPane(), null},
-                new Component[]{getRichTextChangedValueFormatPane(), null},
-                new Component[]{getRichTextPercentFormatPane(), null},
-                new Component[]{getRichTextChangedPercentFormatPane(), null}
-        };
-    }
-
 }

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

@@ -24,17 +24,11 @@ import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
 import com.fr.stable.StringUtils;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
-import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
-import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
-import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox;
-import com.fr.van.chart.designer.component.format.PercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
-import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ValueFormatPaneWithCheckBox;
-import com.fr.van.chart.designer.component.format.ValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithCheckBox;
 import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
 import com.fr.van.chart.designer.component.richText.VanChartRichEditorPane;
@@ -53,7 +47,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -84,13 +78,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     private ChangedValueFormatPaneWithCheckBox changedValueFormatPane;
     private ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane;
 
-    private CategoryNameFormatPaneWithoutCheckBox richTextCategoryNameFormatPane;
-    private SeriesNameFormatPaneWithoutCheckBox richTextSeriesNameFormatPane;
-    private ValueFormatPaneWithoutCheckBox richTextValueFormatPane;
-    private PercentFormatPaneWithoutCheckBox richTextPercentFormatPane;
-    private ChangedValueFormatPaneWithoutCheckBox richTextChangedValueFormatPane;
-    private ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane;
-
     private JPanel centerPanel;
     private JPanel commonPanel;
     private JPanel editorPanel;
@@ -118,7 +105,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         this.richTextTooltipContent = createAttrTooltip();
 
         initFormatPane(parent, showOnPane);
-        initRichTextFormatPane(parent, showOnPane);
 
         this.setLayout(new BorderLayout());
         this.add(createLabelContentPane(), BorderLayout.CENTER);
@@ -184,54 +170,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         this.changedPercentFormatPane = changedPercentFormatPane;
     }
 
-    public CategoryNameFormatPaneWithoutCheckBox getRichTextCategoryNameFormatPane() {
-        return richTextCategoryNameFormatPane;
-    }
-
-    public void setRichTextCategoryNameFormatPane(CategoryNameFormatPaneWithoutCheckBox richTextCategoryNameFormatPane) {
-        this.richTextCategoryNameFormatPane = richTextCategoryNameFormatPane;
-    }
-
-    public SeriesNameFormatPaneWithoutCheckBox getRichTextSeriesNameFormatPane() {
-        return richTextSeriesNameFormatPane;
-    }
-
-    public void setRichTextSeriesNameFormatPane(SeriesNameFormatPaneWithoutCheckBox richTextSeriesNameFormatPane) {
-        this.richTextSeriesNameFormatPane = richTextSeriesNameFormatPane;
-    }
-
-    public ValueFormatPaneWithoutCheckBox getRichTextValueFormatPane() {
-        return richTextValueFormatPane;
-    }
-
-    public void setRichTextValueFormatPane(ValueFormatPaneWithoutCheckBox richTextValueFormatPane) {
-        this.richTextValueFormatPane = richTextValueFormatPane;
-    }
-
-    public PercentFormatPaneWithoutCheckBox getRichTextPercentFormatPane() {
-        return richTextPercentFormatPane;
-    }
-
-    public void setRichTextPercentFormatPane(PercentFormatPaneWithoutCheckBox richTextPercentFormatPane) {
-        this.richTextPercentFormatPane = richTextPercentFormatPane;
-    }
-
-    public ChangedValueFormatPaneWithoutCheckBox getRichTextChangedValueFormatPane() {
-        return richTextChangedValueFormatPane;
-    }
-
-    public void setRichTextChangedValueFormatPane(ChangedValueFormatPaneWithoutCheckBox richTextChangedValueFormatPane) {
-        this.richTextChangedValueFormatPane = richTextChangedValueFormatPane;
-    }
-
-    public ChangedPercentFormatPaneWithoutCheckBox getRichTextChangedPercentFormatPane() {
-        return richTextChangedPercentFormatPane;
-    }
-
-    public void setRichTextChangedPercentFormatPane(ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane) {
-        this.richTextChangedPercentFormatPane = richTextChangedPercentFormatPane;
-    }
-
     public UIButtonGroup<Integer> getContent() {
         return content;
     }
@@ -512,7 +450,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         String[] fieldNames = getRichTextFieldNames();
         AttrTooltipFormat[] fieldFormats = getRichTextFieldFormats();
 
-        Map<String, String> params = new HashMap<>();
+        Map<String, String> params = new LinkedHashMap<>();
 
         for (int i = 0, len = fieldNames.length; i < len; i++) {
             params.put(fieldNames[i], fieldFormats[i].getJs());
@@ -522,7 +460,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
         if (tableFieldNames != null) {
             for (String fieldName : tableFieldNames) {
-                params.put(fieldName, fieldName);
+                params.put(fieldName, "${" + fieldName + "_" + fieldName.hashCode() + "}");
             }
         }
 
@@ -558,13 +496,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
     }
 
-    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        richTextCategoryNameFormatPane = new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane);
-        richTextSeriesNameFormatPane = new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane);
-        richTextValueFormatPane = new ValueFormatPaneWithoutCheckBox(parent, showOnPane);
-        richTextPercentFormatPane = new PercentFormatPaneWithoutCheckBox(parent, showOnPane);
-    }
-
     protected JPanel createTableLayoutPaneWithTitle(String title, JPanel panel) {
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(title, panel);
     }
@@ -582,15 +513,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         };
     }
 
-    protected Component[][] getRichTextComponents() {
-        return new Component[][]{
-                new Component[]{richTextCategoryNameFormatPane, null},
-                new Component[]{richTextSeriesNameFormatPane, null},
-                new Component[]{richTextValueFormatPane, null},
-                new Component[]{richTextPercentFormatPane, null},
-        };
-    }
-
     private void initContentListener() {
         content.addActionListener(new ActionListener() {
             @Override
@@ -769,21 +691,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         checkRichEditorState(attrTooltipContent);
     }
 
-    protected void populateRichTextFormat(VanChartFormatPaneWithCheckBox[] formatPaneGroup, AttrTooltipFormat[] formatGroup) {
-        for (int i = 0, len = formatPaneGroup.length; i < len; i++) {
-            VanChartFormatPaneWithCheckBox formatPane = formatPaneGroup[i];
-            AttrTooltipFormat format = formatGroup[i];
-
-            if (formatPane != null && format != null) {
-                formatPane.populate(format);
-
-                // 填充面板时，更新富文本编辑器参数
-                AttrTooltipRichText richText = this.richTextTooltipContent.getRichTextAttr();
-                formatPane.updateFormatParams(richText.getParams(), format.getJs());
-            }
-        }
-    }
-
     protected void populateRichText(AttrTooltipRichText tooltipRichText) {
         if (tooltipRichText != null) {
             updateLocalRichText(tooltipRichText.getContent(), tooltipRichText.isAuto());
@@ -806,7 +713,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         updateLabelType(attrTooltipContent);
         updateFormatPane(attrTooltipContent);
         if (supportRichEditor()) {
-            // updateRichEditor(attrTooltipContent);
             updateTooltipFormat(attrTooltipContent, this.richTextTooltipContent);
             updateTooltipRichText(attrTooltipContent);
         }
@@ -863,27 +769,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         }
     }
 
-    protected void updateRichEditor(AttrTooltipContent attrTooltipContent) {
-        if (richTextCategoryNameFormatPane != null) {
-            richTextCategoryNameFormatPane.update(attrTooltipContent.getRichTextCategoryFormat());
-        }
-        if (richTextSeriesNameFormatPane != null) {
-            richTextSeriesNameFormatPane.update(attrTooltipContent.getRichTextSeriesFormat());
-        }
-        if (richTextValueFormatPane != null) {
-            richTextValueFormatPane.update(attrTooltipContent.getRichTextValueFormat());
-        }
-        if (richTextPercentFormatPane != null) {
-            richTextPercentFormatPane.update(attrTooltipContent.getRichTextPercentFormat());
-        }
-        if (richTextChangedValueFormatPane != null) {
-            richTextChangedValueFormatPane.update(attrTooltipContent.getRichTextChangedValueFormat());
-        }
-        if (richTextChangedPercentFormatPane != null) {
-            richTextChangedPercentFormatPane.update(attrTooltipContent.getRichTextChangedPercentFormat());
-        }
-    }
-
     protected void updateTooltipFormat(AttrTooltipContent target, AttrTooltipContent source) {
         if (target == null || source == null) {
             return;

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

@@ -7,6 +7,7 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.ispinner.chart.UISpinnerWithPx;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
@@ -61,7 +62,7 @@ public class VanChartTrendLinePane extends BasicPane{
         trendLineName = new UITextField();
         trendLineColor = new ColorSelectBox(PREFERRED_WIDTH);
         trendLineStyle = new LineTypeComboBox(new LineType[]{LineType.NONE, LineType.SOLID, LineType.DASHED});
-        lineWidthSpinner = new UISpinner(LINE_WIDTH_MIN_VALUE, Integer.MAX_VALUE, LINE_WIDTH_DIERTA_VALUE, LINE_WIDTH_DEFAULT_VALUE);
+        lineWidthSpinner = new UISpinnerWithPx(LINE_WIDTH_MIN_VALUE, Integer.MAX_VALUE, LINE_WIDTH_DIERTA_VALUE, LINE_WIDTH_DEFAULT_VALUE);
         trendLineType = new UIComboBox(TYPES);
         prePeriod = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
         afterPeriod = new UISpinner(0, Integer.MAX_VALUE, 1, 0);

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

@@ -4,6 +4,7 @@ import com.fr.base.background.ImageBackground;
 import com.fr.chart.chartglyph.GeneralInfo;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.frpane.UINumberDragPane;
+import com.fr.design.gui.frpane.UINumberDragPaneWithPercent;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
@@ -112,7 +113,7 @@ public class VanChartBackgroundPane extends BasicPane {
             }
         });
         transparentLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_Alpha"));
-        transparent = new UINumberDragPane(0, 100);
+        transparent = new UINumberDragPaneWithPercent(0, 100);
     }
 
     protected Component[][] getPaneComponents() {

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

@@ -1,10 +1,15 @@
 package com.fr.van.chart.designer.component.background;
 
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.backgroundpane.ColorBackgroundQuickPane;
 import com.fr.design.mainframe.backgroundpane.NullBackgroundQuickPane;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
+import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import java.awt.Component;
 
@@ -28,10 +33,13 @@ public class VanChartBackgroundPaneWithOutImageAndShadow extends VanChartBackgro
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
 
-        double[] columnSize = {p, f};
+        double[] columnSize = {f, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH};
         double[] rowSize = {p, p, p};
 
-        return TableLayoutHelper.createTableLayoutPane(getPaneComponents(),rowSize,columnSize);
+        JPanel tableLayoutPane = TableLayoutHelper.createGapTableLayoutPane(getPaneComponents(), rowSize, columnSize,
+                TableLayout4VanChartHelper.COMPONENT_INTERVAL, LayoutConstants.VGAP_MEDIUM);
+        tableLayoutPane.setBorder(BorderFactory.createEmptyBorder(0, 12, 4, 0));
+        return tableLayoutPane;
     }
 
     @Override
@@ -44,7 +52,7 @@ public class VanChartBackgroundPaneWithOutImageAndShadow extends VanChartBackgro
              */
             @Override
             public String title4PopupWindow() {
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Default_Name");
+                return Toolkit.i18nText("Fine-Design_Chart_Default_Name");
             }
         });
         paneList.add(new ColorBackgroundQuickPane());
@@ -54,11 +62,14 @@ public class VanChartBackgroundPaneWithOutImageAndShadow extends VanChartBackgro
     @Override
     protected Component[][] getPaneComponents() {
         return new Component[][]{
-                new Component[]{typeComboBox, null},
-                new Component[]{centerPane, null},
+                new Component[]{new UILabel(labelName()), typeComboBox},
+                new Component[]{null, centerPane},
                 new Component[]{getTransparentLabel(), transparent},
         };
     }
 
+    protected String labelName() {
+        return Toolkit.i18nText("Fine-Design_Chart_Background");
+    }
 }
 

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

@@ -3,6 +3,7 @@ package com.fr.van.chart.designer.component.background;
 import com.fr.chart.chartglyph.GeneralInfo;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.ispinner.chart.UISpinnerWithPx;
 import com.fr.design.i18n.Toolkit;
 
 import java.awt.Component;
@@ -24,7 +25,7 @@ public class VanChartBackgroundWithOutShadowWithRadiusPane extends VanChartBackg
     }
 
     protected Component[][] getPaneComponents() {
-        radius = new UISpinner(0, 1000, 1, 0);
+        radius = new UISpinnerWithPx(0, 1000, 1, 0);
         return new Component[][]{
                 new Component[]{null, null},
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Fill")), typeComboBox},

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

@@ -1,6 +1,7 @@
 package com.fr.van.chart.designer.component.border;
 
 import com.fr.design.gui.frpane.UINumberDragPane;
+import com.fr.design.gui.frpane.UINumberDragPaneWithPercent;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.design.widget.FRWidgetFactory;
@@ -29,7 +30,7 @@ public class VanChartBorderWithAlphaPane extends VanChartBorderPane{
     @Override
     protected void initComponents() {
         super.initComponents();
-        transparent = new UINumberDragPane(0,100);
+        transparent = new UINumberDragPaneWithPercent(0,100);
     }
 
     protected void initContent() {

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

@@ -4,6 +4,7 @@ import com.fr.chart.base.AttrBorder;
 import com.fr.chart.chartglyph.GeneralInfo;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.ispinner.chart.UISpinnerWithPx;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.design.widget.FRWidgetFactory;
@@ -34,7 +35,7 @@ public class VanChartBorderWithRadiusPane extends VanChartBorderPane {
     @Override
     protected void initComponents() {
         super.initComponents();
-        radius = new UISpinner(0,1000,1,0);
+        radius = new UISpinnerWithPx(0,1000,1,0);
     }
 
     @Override

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

@@ -7,6 +7,7 @@ import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.icombobox.LineComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.ispinner.chart.UISpinnerWithPx;
 import com.fr.design.gui.xcombox.MarkerComboBox;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
@@ -58,7 +59,7 @@ public class VanChartBorderWithShapePane extends BasicPane {
         });
         lineColorBox = new ColorSelectBox(100);
         borderShape = new MarkerComboBox(MarkerFactory.getLabelShapeMarkers());
-        borderRadius = new UISpinner(0, 1000, 1, 0);
+        borderRadius = new UISpinnerWithPx(0, 1000, 1, 0);
     }
 
     private void createBorderPane() {

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

@@ -4,6 +4,7 @@ import com.fr.chart.chartglyph.Marker;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.ispinner.chart.UISpinnerWithPx;
 import com.fr.design.gui.xcombox.MarkerComboBox;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
@@ -89,7 +90,7 @@ public class VanChartCommonMarkerPane extends BasicBeanPane<VanChartAttrMarker>
                 };
             }
         };
-        radius = new UISpinner(0, 100, 0.5, 0);
+        radius = new UISpinnerWithPx(0, 100, 0.5, 0);
 
         double p = TableLayout.PREFERRED;
 

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();
     }
 }

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

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

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

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

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

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

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

@@ -1,6 +1,7 @@
 package com.fr.van.chart.designer.component.richText;
 
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.ui.ModernUIPane;
 import com.fr.plugin.chart.base.AttrTooltipContent;
@@ -38,7 +39,8 @@ public class VanChartRichTextPane extends BasicBeanPane<AttrTooltipContent> {
     }
 
     private JPanel createFieldContentPane() {
-        JPanel fieldPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        JPanel fieldPane = new JPanel();
+        fieldPane.setLayout(FRGUIPaneFactory.create2ColumnGridLayout());
 
         // 新增字段目录
         JPanel fieldListContent = new JPanel();
@@ -48,12 +50,12 @@ public class VanChartRichTextPane extends BasicBeanPane<AttrTooltipContent> {
         JScrollPane fieldListScrollPane = new JScrollPane(fieldListContent);
         fieldListScrollPane.setPreferredSize(new Dimension(FIELD_PANE_W, FIELD_PANE_H));
         fieldListScrollPane.setHorizontalScrollBar(null);
-        fieldListScrollPane.setBorder(BorderFactory.createTitledBorder("添加字段"));
+        fieldListScrollPane.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Report_Add_Field")));
 
         // 字段格式和汇总
         JScrollPane fieldAttrScrollPane = new JScrollPane(fieldAttrPane);
         fieldAttrScrollPane.setPreferredSize(new Dimension(FIELD_PANE_W, FIELD_PANE_H));
-        fieldAttrScrollPane.setBorder(BorderFactory.createTitledBorder("字段设置"));
+        fieldAttrScrollPane.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Report_Field_Setting")));
 
         fieldPane.add(fieldListScrollPane);
         fieldPane.add(fieldAttrScrollPane);

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

@@ -29,14 +29,6 @@ public class RefreshTooltipContentPaneWithOutSeries extends TooltipContentPaneWi
         setChangedPercentFormatPane(new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane));
     }
 
-    @Override
-    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        super.initRichTextFormatPane(parent, showOnPane);
-
-        setRichTextChangedValueFormatPane(new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextChangedPercentFormatPane(new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane));
-    }
-
     protected double[] getRowSize(double p){
         return new double[]{p,p,p,p,p};
     }
@@ -50,14 +42,4 @@ public class RefreshTooltipContentPaneWithOutSeries extends TooltipContentPaneWi
                 new Component[]{getChangedPercentFormatPane(),null},
         };
     }
-
-    protected Component[][] getRichTextComponents() {
-        return new Component[][]{
-                new Component[]{getRichTextCategoryNameFormatPane(), null},
-                new Component[]{getRichTextValueFormatPane(), null},
-                new Component[]{getRichTextChangedValueFormatPane(), null},
-                new Component[]{getRichTextPercentFormatPane(), null},
-                new Component[]{getRichTextChangedPercentFormatPane(), null}
-        };
-    }
 }

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

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

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

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

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

@@ -4,11 +4,12 @@ import com.fr.base.BaseUtils;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.frpane.UIBubbleFloatPane;
+import com.fr.design.gui.frpane.UINumberDragPane;
+import com.fr.design.gui.frpane.UINumberDragPaneWithPercent;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
@@ -65,7 +66,7 @@ public class VanChartPlotLegendPane extends BasicPane {
 
     //区域显示策略 恢复用注释。下面4行删除。
     private UIButtonGroup<Integer> customSize;
-    private UISpinner maxProportion;
+    private UINumberDragPane maxProportion;
     private JPanel maxProportionPane;
     //区域显示策略 恢复用注释。取消注释。
     //private LimitPane limitPane;
@@ -294,7 +295,7 @@ public class VanChartPlotLegendPane extends BasicPane {
 
     private JPanel createDisplayStrategy() {
         //区域显示策略 恢复用注释。开始删除。
-        maxProportion = new UISpinner(0, 100, 1, 30);
+        maxProportion = new UINumberDragPaneWithPercent(0, 100, 1);
         customSize = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Auto"), Toolkit.i18nText("Fine-Design_Chart_Custom")});
 
         JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Area_Size"), customSize);
@@ -402,7 +403,7 @@ public class VanChartPlotLegendPane extends BasicPane {
         legend.setLayout(layoutButton.getSelectedItem());
         //区域显示策略 恢复用注释。下面2行删除。
         legend.setCustomSize(customSize.getSelectedIndex() == 1);
-        legend.setMaxHeight(maxProportion.getValue());
+        legend.setMaxHeight(maxProportion.updateBean());
         //区域显示策略 恢复用注释。取消注释。
         //legend.setLimitAttribute(limitPane.updateBean());
         legend.setFloatPercentX(customFloatPositionPane.getFloatPosition_x());
@@ -427,7 +428,7 @@ public class VanChartPlotLegendPane extends BasicPane {
             layoutButton.setSelectedItem(legend.getLayout());
             //区域显示策略 恢复用注释。下面2行删除。
             customSize.setSelectedIndex(legend.isCustomSize() ? 1 : 0);
-            maxProportion.setValue(legend.getMaxHeight());
+            maxProportion.populateBean(legend.getMaxHeight());
             //区域显示策略 恢复用注释。取消注释。
             //limitPane.populateBean(legend.getLimitAttribute());
             if (highlightButton != null) {

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

@@ -7,11 +7,12 @@ import com.fr.chart.base.TextAttr;
 import com.fr.chartx.config.info.constant.ConfigType;
 import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.gui.frpane.UIBubbleFloatPane;
+import com.fr.design.gui.frpane.UINumberDragPane;
+import com.fr.design.gui.frpane.UINumberDragPaneWithPercent;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
@@ -64,7 +65,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
 
     //区域显示策略 恢复用注释。下面3行删除。
     private UIButtonGroup<Integer> limitSize;
-    private UISpinner maxProportion;
+    private UINumberDragPane maxProportion;
     private JPanel maxProportionPane;
     //区域显示策略 恢复用注释。取消注释。
     //private LimitPane limitPane;
@@ -183,7 +184,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
 
     private JPanel createDisplayStrategy() {
         //区域显示策略 恢复用注释。开始删除。
-        maxProportion = new UISpinner(0, 100, 1, 30);
+        maxProportion = new UINumberDragPaneWithPercent(0, 100, 1);
         limitSize = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Limit"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Not_Limit")});
 
         JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Size"), limitSize);
@@ -320,7 +321,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
         customFloatPositionPane.setFloatPosition_y(title.getFloatPercentY());
         //区域显示策略 恢复用注释。下面2行删除。
         limitSize.setSelectedIndex(title.isLimitSize() ? 0 : 1);
-        maxProportion.setValue(title.getMaxHeight());
+        maxProportion.populateBean(title.getMaxHeight());
         //区域显示策略 恢复用注释。取消注释。
         //limitPane.populateBean(title.getLimitAttribute());
 
@@ -357,7 +358,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
         title.setFloating(customFloatPositionButton.isSelected());
         //区域显示策略 恢复用注释。下面2行删除。
         title.setLimitSize(limitSize.getSelectedIndex() == 0);
-        title.setMaxHeight(maxProportion.getValue());
+        title.setMaxHeight(maxProportion.updateBean());
         //区域显示策略 恢复用注释。取消注释。
         //title.setLimitAttribute(limitPane.updateBean());
         title.setFloatPercentX(customFloatPositionPane.getFloatPosition_x());

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

@@ -8,11 +8,11 @@ import com.fr.chart.chartattr.Title;
 import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.gui.frpane.UINumberDragPane;
+import com.fr.design.gui.frpane.UINumberDragPaneWithPercent;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icombobox.LineComboBox;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.gui.style.FormatPane;
 import com.fr.design.i18n.Toolkit;
@@ -97,7 +97,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
 
     //区域显示策略 恢复用注释。下面3行删除。
     protected UIButtonGroup<Integer> axisLimitSize;
-    protected UISpinner maxProportion;
+    protected UINumberDragPane maxProportion;
     protected JPanel maxProportionPane;
     //区域显示策略 恢复用注释。取消注释。
     //private LimitPane limitPane;
@@ -465,7 +465,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
 
     protected JPanel createDisplayStrategy() {
         //区域显示策略 恢复用注释。删除到return，即除了注释的代码都删除。
-        maxProportion = new UISpinner(0, 100, 1, 30);
+        maxProportion = new UINumberDragPaneWithPercent(0, 100, 1);
         axisLimitSize = new UIButtonGroup<Integer>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Limit"), Toolkit.i18nText("Fine-Design_Chart_Not_Limit")});
 
         JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Area_Size"), axisLimitSize);
@@ -767,7 +767,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
             axisLimitSize.setSelectedIndex(axis.isLimitSize() ? 0 : 1);
         }
         if (maxProportion != null) {
-            maxProportion.setValue(axis.getMaxHeight());
+            maxProportion.populateBean(axis.getMaxHeight());
         }
 
         //区域显示策略 恢复用注释。取消注释。
@@ -909,7 +909,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
             axis.setLimitSize(axisLimitSize.getSelectedIndex() == 0);
         }
         if (maxProportion != null) {
-            axis.setMaxHeight(maxProportion.getValue());
+            axis.setMaxHeight(maxProportion.updateBean());
         }
         //区域显示策略 恢复用注释。取消注释。
 //        if (limitPane != null) {

designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java

@@ -10,6 +10,7 @@ import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.ispinner.chart.UISpinnerWithPx;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.gui.style.FRFontPane;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -90,7 +91,7 @@ public class VanChartAlertValuePane extends BasicBeanPane<VanChartAlertValue> {
         alertValue.setPreferredSize(new Dimension(VALUE_WD, HT));
 
         alertLineStyle = new LineTypeComboBox(new LineType[]{LineType.SOLID, LineType.DASHED});
-        lineWidthSpinner = new UISpinner(LINE_WIDTH_MIN_VALUE, Integer.MAX_VALUE, LINE_WIDTH_DIERTA_VALUE, LINE_WIDTH_DEFAULT_VALUE);
+        lineWidthSpinner = new UISpinnerWithPx(LINE_WIDTH_MIN_VALUE, Integer.MAX_VALUE, LINE_WIDTH_DIERTA_VALUE, LINE_WIDTH_DEFAULT_VALUE);
         alertLineColor = new ColorSelectBox(PREFERRED_WIDTH);
         alertTextPosition = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Axis_Top"), Toolkit.i18nText("Fine-Design_Chart_Axis_Bottom")});
         alertText = new TinyFormulaPane();

designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java

@@ -5,6 +5,7 @@ import com.fr.base.Utils;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.gui.frpane.UINumberDragPane;
+import com.fr.design.gui.frpane.UINumberDragPaneWithPercent;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -52,7 +53,7 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane<VanChart
         bottomValue.setPreferredSize(new Dimension(124,20));
         topValue.setPreferredSize(new Dimension(124,20));
         color = new ColorSelectBox(100);
-        transparent = new UINumberDragPane(0,100);
+        transparent = new UINumberDragPaneWithPercent(0,100);
         double p = TableLayout.PREFERRED;
         double[] columnSize = {p,p};
         double[] rowSize = {p,p,p};

designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java

@@ -11,6 +11,7 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartglyph.ConditionAttr;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.gui.frpane.UINumberDragPane;
+import com.fr.design.gui.frpane.UINumberDragPaneWithPercent;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
@@ -278,7 +279,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
 
     //不透明度
     protected JPanel createAlphaPane() {
-        transparent = new UINumberDragPane(0, 100);
+        transparent = new UINumberDragPaneWithPercent(0, 100);
         return TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Report_Alpha"), transparent);
     }
 

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

@@ -84,7 +84,11 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
         };*/
 
         backgroundPane = new VanChartBackgroundPaneWithOutImageAndShadow();
-        selectBackgroundPane = new VanChartBackgroundPaneWithOutImageAndShadow();
+        selectBackgroundPane = new VanChartBackgroundPaneWithOutImageAndShadow() {
+            protected String labelName() {
+                return Toolkit.i18nText("Fine-Design_Chart_Select_Color");
+            }
+        };
         catalogSuperLink = new VanChartCatalogHyperLinkPane();
 
         double p = TableLayout.PREFERRED;
@@ -94,8 +98,8 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
         Component[][] components = new Component[][]{
                 new Component[]{null},
                 new Component[]{createTitlePane(Toolkit.i18nText("Fine-Design_Chart_Character"), textAttrPane)},
-                new Component[]{createTitlePane(Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane)},
-                new Component[]{createTitlePane(Toolkit.i18nText("Fine-Design_Chart_Select_Color"), selectBackgroundPane)},
+                new Component[]{backgroundPane},
+                new Component[]{selectBackgroundPane},
                 new Component[]{catalogSuperLink}
         };
         drillPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);

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;
@@ -38,14 +41,6 @@ public class VanChartFunnelLabelContentPane extends VanChartLabelContentPane {
         };
     }
 
-    protected Component[][] getRichTextComponents() {
-        return new Component[][]{
-                new Component[]{getRichTextSeriesNameFormatPane(), null},
-                new Component[]{getRichTextValueFormatPane(), null},
-                new Component[]{getRichTextPercentFormatPane(), null}
-        };
-    }
-
     @Override
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
         setCategoryNameFormatPane(new CategoryNameFormatPaneWithCheckBox(parent, showOnPane));
@@ -54,32 +49,34 @@ public class VanChartFunnelLabelContentPane extends VanChartLabelContentPane {
         setPercentFormatPane(new FunnelPercentFormatPaneWithCheckBox(parent, showOnPane));
     }
 
-    @Override
-    protected 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) {
+
+        return new VanChartRichTextPane(richEditorPane) {
+
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                return new VanChartFunnelRichTextFieldListPane(fieldAttrPane, richEditor);
             }
 
-    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
-        VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
-                getRichTextSeriesNameFormatPane(),
-                getRichTextValueFormatPane(),
-                getRichTextPercentFormatPane()
+            protected AttrTooltipContent getInitialTooltipContent() {
+                return createAttrTooltip();
+            }
         };
+    }
 
-        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
-                attrTooltipContent.getRichTextSeriesFormat(),
-                attrTooltipContent.getRichTextValueFormat(),
-                attrTooltipContent.getRichTextPercentFormat()
+    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")
         };
+    }
 
-        setRichTextAttr(new AttrTooltipRichText());
-        populateRichTextFormat(formatPaneGroup, formatGroup);
-        populateRichText(attrTooltipContent.getRichTextAttr());
-
-        checkRichEditorState(attrTooltipContent);
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
+        return new AttrTooltipFormat[]{
+                new AttrTooltipNameFormat(),
+                new AttrTooltipValueFormat(),
+                new AttrTooltipPercentFormat()
+        };
     }
 
     protected AttrTooltipContent createAttrTooltip() {

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

@@ -29,14 +29,6 @@ public class VanChartFunnelRefreshTooltipContentPane extends VanChartFunnelToolt
         setChangedPercentFormatPane(new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane));
     }
 
-    @Override
-    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        super.initRichTextFormatPane(parent, showOnPane);
-
-        setRichTextChangedValueFormatPane(new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane));
-        setRichTextChangedPercentFormatPane(new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane));
-    }
-
     protected double[] getRowSize(double p){
         return new double[]{p,p,p,p,p};
     }
@@ -50,14 +42,4 @@ public class VanChartFunnelRefreshTooltipContentPane extends VanChartFunnelToolt
                 new Component[]{getChangedPercentFormatPane(), null},
         };
     }
-
-    protected Component[][] getRichTextComponents() {
-        return new Component[][]{
-                new Component[]{getRichTextSeriesNameFormatPane(), null},
-                new Component[]{getRichTextValueFormatPane(), null},
-                new Component[]{getRichTextChangedValueFormatPane(), null},
-                new Component[]{getRichTextPercentFormatPane(), null},
-                new Component[]{getRichTextChangedPercentFormatPane(), null}
-        };
-    }
 }

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

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

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

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