Merge pull request #2263 in DESIGN/design from feature/10.0 to research/10.0

* commit 'c6a4b0d75d211b5ddaa2d11015879c1d9e54b30b': (58 commits)
  REPORT-38529 && REPORT-38527
  REPORT-38534 设计器界面中的剪切和复制按钮灰化不可用 1. bug原因：对于工具栏上的工具条combineUp，当处于编辑sheet的时候，是剪切+复制+粘贴+格式刷，其它情况都是剪切+复制+粘贴+删除，而带删除的这种，是会有两种状态，选中了某个组件时，剪切、复制、删除就都是可用的，未选中时，这几个都不可用，所以这里需要有个逻辑来切换这几个按钮的状态，而对于带格式刷的，不论有没有选中都会走到这个逻辑，然后被无脑置为不可用 2. 修改方案：添加一个判断，如果当前的状态是WORK_SHEET的时候，即编辑sheet时，直接返回，其它情况正常走逻辑
  REPORT-38821 修改获得扩展路径的逻辑
  REPORT-38645 【JDK11】设计器右上角，fs插件管理点击登录无反应
  REPORT-38889 tomcat 8.5.x 请求参数带特殊字符问题
  CHART-15362 属性切换保留功能开发
  REPORT-38647 && REPORT-38357
  REPORT-36985 改了一点代码
  REPORT-38632【无用代码删除】设计器启动页 动态画面相关代码
  REPORT-36985 删除无用依赖，格式化
  REPORT-36985 删除无用依赖，格式化
  KERNEL-4069 jdk11 macos的jdk里面移除了windows相关的LAF
  REPORT-36985 删除无用依赖
  REPORT-36985 代码提交 组件树删除优化和选择组件时让其浮于顶层
  REPORT-36985 代码提交 组件树删除优化和选择组件时让其浮于顶层
  REPORT-37821 frm绝对布局框选多个组件有问题 合丢了
  REPORT-36619 fix
  REPORT-36619 报表设计界面拖选无法选中拖选区域
  REPORT-37915 报表分栏弹窗显示未适配国际化 1. 为每种语言都适配了报表分栏弹窗中的示例图片 2. 修改对应国际化文件中代表此示例图片的文件名
  CHART-15451 国际化
  ...

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -748,9 +748,11 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      * @param al   组件名称
      */
     public void checkCombineUp(boolean flag, ArrayList<String> al) {
-
+        //Yvan: 检查当前是否为WORK_SHEET状态，因为只有WORK_SHEET中含有格式刷组件，此时是不需要进行checkComponentsByNames的
+        if (HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getMenuState() == DesignState.WORK_SHEET) {
+            return;
+        }
         combineUp.checkComponentsByNames(flag, al);
-
     }
 
     /**

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

@@ -856,7 +856,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
                     BorderLayout.CENTER);
 
 
-            this.setSize(340, 180);
+            this.setSize(380, 180);
             this.setTitle(Toolkit.i18nText("Fine-Design_Basic_Mkdir"));
             this.setResizable(false);
             this.setAlwaysOnTop(true);

designer-base/src/main/java/com/fr/design/module/DesignModuleFactory.java

@@ -146,6 +146,7 @@ public class DesignModuleFactory {
             try {
                 return (ParameterDesignerProvider) instance.formParaDesigner.newInstance();
             } catch (Exception e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 FineLoggerFactory.getLogger().error("error in form para designer");
             }
         }

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

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

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

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

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

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

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

@@ -62,6 +62,10 @@ public class FineEmbedServerActivator extends Activator {
         tomcat.setPort(DesignerEnvManager.getEnvManager().getEmbedServerPort());
         // 设置解码uri使用的字符编码
         tomcat.getConnector().setURIEncoding(EncodeConstants.ENCODING_UTF_8);
+        // 参考 https://jira.atlassian.com/browse/CONFSERVER-57582
+        // https://tomcat.apache.org/tomcat-8.5-doc/config/http.html
+        // 8.5.x 请求参数带特殊字符被tomcat拒绝 []|{}^\`"<>
+        tomcat.getConnector().setProperty("relaxedQueryChars", "[]|{}^&#x5c;&#x60;&quot;&lt;&gt;");
         setMaxPostSize();
         String docBase = new File(WorkContext.getCurrent().getPath()).getParent();
 

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

@@ -63,6 +63,8 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent
     private AutoProgressBar connectionBar;
     private SwingWorker worker;
 
+    private static final String MESSAGE = Toolkit.i18nText("Fine-Design_Chart_Auto_No_Match");
+
     public AutoChartTypePane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         initButtonGroup();
@@ -226,6 +228,9 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent
                             chartResultModel.addElement(autoChartIcon);
                         }
                         chartViewList.setSelectedIndex(0);
+                    } else {
+                        FineJOptionPane.showMessageDialog(AutoChartTypePane.this, MESSAGE,
+                                Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.INFORMATION_MESSAGE, UIManager.getIcon("OptionPane.informationIcon"));
                     }
                 } catch (Exception e) {
                     if (!(e instanceof CancellationException)) {

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

@@ -1,12 +1,12 @@
 package com.fr.design.chart;
 
+import com.fr.base.ScreenResolution;
 import com.fr.base.chart.BaseChartPainter;
 import com.fr.base.chart.chartdata.CallbackEvent;
 import com.fr.base.chart.result.WebChartIDInfo;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chartx.attr.ChartProvider;
 import com.fr.design.ChartTypeInterfaceManager;
-import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.script.Calculator;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLable;
@@ -79,7 +79,8 @@ public class ChartIcon implements Icon, XMLable {
 
         BaseChartPainter chartPainter = getChartPainter();
 
-        int resolution = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getJTemplateResolution();
+        //插入图表的宽度是固定的，resolution直接获取屏幕分辨率，resolution现在只会影响到老图表
+        int resolution = ScreenResolution.getScreenResolution();
 
         Graphics2D g2d = (Graphics2D) g;
         Paint oldPaint = g2d.getPaint();

designer-chart/src/main/java/com/fr/design/chart/auto/AutoTypeCalculate.java

@@ -102,22 +102,22 @@ public class AutoTypeCalculate {
     }
 
     private static boolean isNumberData(List<String> values) {
-        for (String value : values) {
+        for (Pattern pattern : dataPatterns) {
-            if (!isNumberData(value)) {
+            if (isNumberData(values, pattern)) {
-                return false;
+                return true;
             }
         }
-        return true;
+        return false;
     }
 
-    private static boolean isNumberData(String value) {
+    private static boolean isNumberData(List<String> values, Pattern pattern) {
-        for (Pattern pattern : dataPatterns) {
+        for (String value : values) {
             Matcher matcher = pattern.matcher(value);
-            if (matcher.matches()) {
+            if (!matcher.matches()) {
-                return true;
+                return false;
             }
         }
-        return false;
+        return true;
     }
 
     private static List<ColumnInfo> calculateField(String tableName, List<String> columns) {

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

@@ -1,19 +1,18 @@
 package com.fr.design.chartx.component;
 
 import com.fr.data.util.function.AbstractDataFunction;
+import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.chartx.component.correlation.AbstractCorrelationPane;
 import com.fr.design.chartx.component.correlation.CalculateComboBoxEditorComponent;
 import com.fr.design.chartx.component.correlation.FieldEditorComponentWrapper;
 import com.fr.design.chartx.component.correlation.UIComboBoxEditorComponent;
 import com.fr.design.chartx.component.correlation.UITextFieldEditorComponent;
-import com.fr.design.gui.frpane.UIComboBoxPane;
+import com.fr.design.chartx.data.DataLayoutHelper;
+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.i18n.Toolkit;
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.CalculateComboBox;
 import com.fr.design.mainframe.chart.gui.data.table.DataPaneHelper;
 import com.fr.extended.chart.UIComboBoxWithNone;
@@ -22,19 +21,25 @@ import com.fr.stable.StringUtils;
 
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
-import java.util.ArrayList;
+import javax.swing.event.ChangeEvent;
-import java.util.List;
+import javax.swing.event.ChangeListener;
 import java.awt.BorderLayout;
+import java.awt.CardLayout;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by shine on 2018/9/12.
  * 系列名使用字段名or字段值的抽象的pane 支持多种属性结构的存取
  */
-public abstract class AbstractCustomFieldComboBoxPane<T> extends UIComboBoxPane<T> {
+public abstract class AbstractCustomFieldComboBoxPane<T> extends BasicBeanPane<T> {
+
+    private UIButtonGroup<Boolean> nameOrValue;
+    private JPanel cardPane;
+    private CardLayout cardLayout;
 
     private AbstractUseFieldValuePane useFieldValuePane;
 
@@ -42,73 +47,43 @@ public abstract class AbstractCustomFieldComboBoxPane<T> extends UIComboBoxPane<
 
     private List<String> fieldList = new ArrayList<String>();
 
-    @Override
+    public AbstractCustomFieldComboBoxPane() {
-    protected void initLayout() {
-        this.setLayout(new BorderLayout(0, 6));
-        JPanel northPane = new JPanel(new BorderLayout());
-        northPane.add(jcb, BorderLayout.CENTER);
-        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name_From"));
-        label.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, 20));
-        northPane.add(label, BorderLayout.WEST);
-        this.add(northPane, BorderLayout.NORTH);
-        this.add(cardPane, BorderLayout.CENTER);
-    }
 
-    @Override
-    protected List<FurtherBasicBeanPane<? extends T>> initPaneList() {
         useFieldValuePane = createUseFieldValuePane();
         customFieldNamePane = createCustomFieldNamePane();
-        List<FurtherBasicBeanPane<? extends T>> list = new ArrayList<FurtherBasicBeanPane<? extends T>>();
-        list.add(useFieldValuePane);
-        list.add(paneWrapper());
-        return list;
-    }
-
-    private FurtherBasicBeanPane<? extends T> paneWrapper() {
-        FurtherBasicBeanPane pane = new FurtherBasicBeanPane() {
-            @Override
-            public String title4PopupWindow() {
-                return Toolkit.i18nText("Fine-Design_Chart_Enable_Field_Name");
-            }
-
-            @Override
-            public boolean accept(Object ob) {
-                return false;
-            }
 
+        nameOrValue = new UIButtonGroup<Boolean>(
+                new String[]{useFieldValuePane.title4PopupWindow(), customFieldNamePane.title4PopupWindow()},
+                new Boolean[]{false, true});
+        nameOrValue.setSelectedItem(false);
+        nameOrValue.addChangeListener(new ChangeListener() {
             @Override
-            public void reset() {
+            public void stateChanged(ChangeEvent e) {
+                checkCardPane();
             }
+        });
+        JPanel northPane = DataLayoutHelper.createDataLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Series_Name_From"), nameOrValue);
 
-            @Override
+        cardLayout = new CardLayout();
-            public void populateBean(Object ob) {
+        cardPane = new JPanel(cardLayout);
-            }
+        cardPane.add(useFieldValuePane, useFieldValuePane.title4PopupWindow());
+        cardPane.add(customFieldNamePane, customFieldNamePane.title4PopupWindow());
 
-            @Override
+        this.setLayout(new BorderLayout(0, 6));
-            public Object updateBean() {
+        this.add(northPane, BorderLayout.NORTH);
-                return null;
+        this.add(cardPane, BorderLayout.CENTER);
-            }
-        };
-        pane.setLayout(new BorderLayout(0, 6));
-        pane.add(customFieldNamePane, BorderLayout.CENTER);
-        return pane;
     }
 
     protected abstract AbstractUseFieldValuePane createUseFieldValuePane();
 
     protected abstract AbstractCustomFieldNamePane createCustomFieldNamePane();
 
-    @Override
-    protected String title4PopupWindow() {
-        return StringUtils.EMPTY;
-    }
-
     protected boolean valueComboBoxHasNone() {
         return false;
     }
 
     public void checkBoxUse(boolean hasUse) {
-        jcb.setEnabled(hasUse);
+        nameOrValue.setEnabled(hasUse);
         useFieldValuePane.checkBoxUse(hasUse);
     }
 
@@ -122,6 +97,19 @@ public abstract class AbstractCustomFieldComboBoxPane<T> extends UIComboBoxPane<
         fieldList = columnNameList;
     }
 
+    private void checkCardPane() {
+        cardLayout.show(cardPane, nameOrValue.getSelectedItem() ? customFieldNamePane.title4PopupWindow() : useFieldValuePane.title4PopupWindow());
+    }
+
+    protected void populateNameOrValue(boolean b) {
+        nameOrValue.setSelectedItem(b);
+        checkCardPane();
+    }
+
+    protected boolean updateNameOrValue() {
+        return nameOrValue.getSelectedItem();
+    }
+
     protected void populateCustomFieldNamePane(T t) {
         customFieldNamePane.populateBean(t);
     }
@@ -138,6 +126,16 @@ public abstract class AbstractCustomFieldComboBoxPane<T> extends UIComboBoxPane<
         useFieldValuePane.updateBean(t);
     }
 
+    @Override
+    public T updateBean() {
+        return null;
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return null;
+    }
+
     protected abstract class AbstractUseFieldValuePane extends FurtherBasicBeanPane<T> {
         private UIComboBox series;
         private UIComboBox value;
@@ -169,11 +167,7 @@ public abstract class AbstractCustomFieldComboBoxPane<T> extends UIComboBoxPane<
                     new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Summary_Method"), SwingConstants.LEFT), function},
             };
 
-            double p = TableLayout.PREFERRED;
+            JPanel panel = DataLayoutHelper.createDataLayoutPane(components);
-            double[] columnSize = {78, 122};
-            double[] rowSize = {p, p, p};
-
-            JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
 
             this.setLayout(new BorderLayout(0, 6));
             this.add(panel, BorderLayout.CENTER);
@@ -258,5 +252,10 @@ public abstract class AbstractCustomFieldComboBoxPane<T> extends UIComboBoxPane<
         protected Object[] createLine() {
             return new String[]{StringUtils.EMPTY, StringUtils.EMPTY, Toolkit.i18nText("Fine-Design_Chart_Use_None")};
         }
+
+        @Override
+        protected String title4PopupWindow() {
+            return Toolkit.i18nText("Fine-Design_Chart_Enable_Field_Name");
+        }
     }
 }

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

@@ -27,23 +27,21 @@ public class SeriesValueFieldComboBoxPane extends AbstractCustomFieldComboBoxPan
 
     @Override
     public void populateBean(SeriesValueCorrelationDefinition ob) {
+        populateNameOrValue(ob.isCustomFieldValue());
         if (ob.isCustomFieldValue()) {
             populateCustomFieldNamePane(ob);
-            jcb.setSelectedIndex(1);
         } else {
             populateUseFieldValuePane(ob);
-            jcb.setSelectedIndex(0);
         }
     }
 
     @Override
     public void updateBean(SeriesValueCorrelationDefinition ob) {
-        if (jcb.getSelectedIndex() == 0) {
+        ob.setCustomFieldValue(updateNameOrValue());
-            ob.setCustomFieldValue(false);
+        if (ob.isCustomFieldValue()) {
-            updateUseFieldValuePane(ob);
-        } else {
-            ob.setCustomFieldValue(true);
             updateCustomFieldNamePane(ob);
+        } else {
+            updateUseFieldValuePane(ob);
         }
     }
 

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

@@ -0,0 +1,69 @@
+package com.fr.design.chartx.data;
+
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.Component;
+import java.util.Arrays;
+
+/**
+ * @author shine
+ * @version 10.0
+ * Created by shine on 2020/7/22
+ */
+public class DataLayoutHelper {
+
+    public static int WIDTH = 150;
+    public static int LABEL_HEIGHT = 20;
+    public static int LABEL_WIDTH = 65;
+
+    public static int LEFT_GAP = 15;
+    public static int RIGHT_GAP = 10;
+
+    public static void setWIDTH(int WIDTH) {
+        DataLayoutHelper.WIDTH = WIDTH;
+    }
+
+    public static void setLabelHeight(int labelHeight) {
+        LABEL_HEIGHT = labelHeight;
+    }
+
+    public static void setLabelWidth(int labelWidth) {
+        LABEL_WIDTH = labelWidth;
+    }
+
+    public static void setLeftGap(int leftGap) {
+        LEFT_GAP = leftGap;
+    }
+
+    public static void setRightGap(int rightGap) {
+        RIGHT_GAP = rightGap;
+    }
+
+    public static JPanel createDataLayoutPane(Component[][] components) {
+        int len = components.length;
+        double p = TableLayout.PREFERRED;
+        double[] columnSize = {DataLayoutHelper.LABEL_WIDTH, DataLayoutHelper.WIDTH};
+        double[] rowSize = new double[len];
+        Arrays.fill(rowSize, p);
+
+        return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+    }
+
+    public static JPanel createDataLayoutPane(String label, Component component) {
+        Component[][] components = new Component[][]{
+                new Component[]{new UILabel(label, SwingConstants.LEFT), component}
+        };
+
+        return createDataLayoutPane(components);
+    }
+
+    public static void addNormalBorder(JComponent component) {
+        component.setBorder(BorderFactory.createEmptyBorder(0, DataLayoutHelper.LEFT_GAP, 0, DataLayoutHelper.RIGHT_GAP));
+    }
+}

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

@@ -1,18 +1,15 @@
 package com.fr.design.chartx.data.map;
 
+import com.fr.design.chartx.data.DataLayoutHelper;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.chart.gui.ChartDataPane;
 
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.util.Arrays;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Component;
@@ -67,8 +64,10 @@ public abstract class AbstractAreaLngLatPane extends JPanel {
 
         locationType.setSelectedIndex(0);
 
+        JPanel northPane = DataLayoutHelper.createDataLayoutPane(Toolkit.i18nText("FR-Plugin_Design_Geographic_Location"), locationType);
+
         this.setLayout(new BorderLayout(0, 6));
-        this.add(locationType, BorderLayout.NORTH);
+        this.add(northPane, BorderLayout.NORTH);
         this.add(centerPane, BorderLayout.CENTER);
     }
 
@@ -103,12 +102,8 @@ public abstract class AbstractAreaLngLatPane extends JPanel {
         for (int i = 0; i < len; i++) {
             components[i] = new Component[]{new UILabel(labels[i], SwingConstants.LEFT), fieldComponents[i]};
         }
-        double p = TableLayout.PREFERRED;
-        double[] columnSize = {ChartDataPane.LABEL_WIDTH, 122};
-        double[] rowSize = new double[len];
-        Arrays.fill(rowSize, p);
 
-        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 6);
+        return DataLayoutHelper.createDataLayoutPane(components);
     }
 
 }

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

@@ -38,6 +38,7 @@ public class MapChartDataPane extends AbstractChartDataPane<MapChartDataDefiniti
             VanChartMapPlot mapPlot = this.getVanChart().getPlot();
             mapType = mapPlot == null ? mapType : mapPlot.getMapType();
         }
+
         AreaMapDataSetFieldsPane areaMapDataSetFieldsPane;
         PointMapDataSetFieldsPane pointMapDataSetFieldsPane;
         LineMapDataSetFieldsPane lineMapDataSetFieldsPane;

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

@@ -3,17 +3,13 @@ package com.fr.design.chartx.fields;
 import com.fr.chartx.data.field.AbstractColumnFieldCollection;
 import com.fr.chartx.data.field.ColumnField;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chartx.data.DataLayoutHelper;
 import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.stable.StringUtils;
 
-import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
-import java.util.Arrays;
 import java.awt.BorderLayout;
 import java.awt.Component;
 
@@ -46,8 +42,6 @@ public abstract class AbstractCellDataFieldsPane<T extends AbstractColumnFieldCo
         if (south != null) {
             this.add(south, BorderLayout.SOUTH);
         }
-
-        this.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15));
     }
 
     protected JPanel createCenterPane() {
@@ -65,12 +59,7 @@ public abstract class AbstractCellDataFieldsPane<T extends AbstractColumnFieldCo
             components[i] = new Component[]{new UILabel(labels[i], SwingConstants.LEFT), formulaPanes[i]};
         }
 
-        double p = TableLayout.PREFERRED;
+        return DataLayoutHelper.createDataLayoutPane(components);
-        double[] columnSize = {ChartDataPane.LABEL_WIDTH, 122};
-        double[] rowSize = new double[len];
-        Arrays.fill(rowSize, p);
-
-        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 6);
     }
 
 

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

@@ -4,25 +4,21 @@ import com.fr.chartx.data.field.AbstractColumnFieldCollection;
 import com.fr.chartx.data.field.ColumnField;
 import com.fr.data.util.function.AbstractDataFunction;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chartx.data.DataLayoutHelper;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.CalculateComboBox;
 import com.fr.design.mainframe.chart.gui.data.table.DataPaneHelper;
 import com.fr.general.GeneralUtils;
 import com.fr.stable.StringUtils;
 
-import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
-import java.util.Arrays;
-import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.util.List;
 
 import static com.fr.design.mainframe.chart.gui.data.table.DataPaneHelper.refreshBoxItems;
 
@@ -49,7 +45,6 @@ public abstract class AbstractDataSetFieldsPane<T extends AbstractColumnFieldCol
     protected void initComponents() {
 
         this.setLayout(new BorderLayout(0, 6));
-        this.setBorder(BorderFactory.createEmptyBorder(6, 24, 0, 15));
 
         JPanel north = createNorthPane(),
                 center = createCenterPane(),
@@ -86,12 +81,8 @@ public abstract class AbstractDataSetFieldsPane<T extends AbstractColumnFieldCol
         for (int i = 0; i < len; i++) {
             components[i] = new Component[]{new UILabel(labels[i], SwingConstants.LEFT), fieldComponents[i]};
         }
-        double p = TableLayout.PREFERRED;
-        double[] columnSize = {ChartDataPane.LABEL_WIDTH, 122};
-        double[] rowSize = new double[len];
-        Arrays.fill(rowSize, p);
 
-        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 6);
+        return DataLayoutHelper.createDataLayoutPane(components);
     }
 
     protected JPanel createSouthPane() {

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

@@ -5,23 +5,24 @@ import com.fr.base.Utils;
 import com.fr.chartx.TwoTuple;
 import com.fr.chartx.data.field.diff.ColumnFieldCollectionWithSeriesValue;
 import com.fr.design.chartx.component.MapAreaMatchPane;
+import com.fr.design.chartx.data.DataLayoutHelper;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionListener;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.plugin.chart.map.data.MapMatchResult;
 import com.fr.plugin.chart.map.VanChartMapPlot;
+import com.fr.plugin.chart.map.data.MapMatchResult;
 import com.fr.plugin.chart.map.server.ChartGEOJSONHelper;
 import com.fr.plugin.chart.vanchart.VanChart;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.tree.DefaultMutableTreeNode;
-import java.util.Set;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Set;
 
 /**
  * @author Bjorn
@@ -53,7 +54,7 @@ public abstract class MapDataSetFieldsPane<T extends ColumnFieldCollectionWithSe
 
     public JPanel createAreaPanel(final UIComboBox areaBox) {
         JPanel areaPanel = new JPanel(new BorderLayout(10, 0));
-        areaBox.setPreferredSize(new Dimension(91, 20));
+        areaBox.setPreferredSize(new Dimension(DataLayoutHelper.WIDTH - 10 - 20, DataLayoutHelper.LABEL_HEIGHT));
         areaPanel.add(areaBox, BorderLayout.WEST);
         UIButton uiButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/config.png"));
         uiButton.addActionListener(new ActionListener() {

designer-chart/src/main/java/com/fr/design/chartx/single/CellDataPane.java

@@ -2,6 +2,7 @@ package com.fr.design.chartx.single;
 
 import com.fr.chartx.data.CellDataDefinition;
 import com.fr.design.beans.FurtherBasicBeanPane;
+import com.fr.design.chartx.data.DataLayoutHelper;
 import com.fr.design.chartx.fields.AbstractCellDataFieldsPane;
 import com.fr.design.i18n.Toolkit;
 
@@ -23,6 +24,7 @@ public class CellDataPane extends FurtherBasicBeanPane<CellDataDefinition> {
 
         this.setLayout(new BorderLayout());
         this.add(cellDataFieldsPane, BorderLayout.CENTER);
+        DataLayoutHelper.addNormalBorder(this);
     }
 
     @Override

designer-chart/src/main/java/com/fr/design/chartx/single/DataSetPane.java

@@ -3,25 +3,20 @@ package com.fr.design.chartx.single;
 import com.fr.chartx.data.DataSetDefinition;
 import com.fr.data.impl.NameTableData;
 import com.fr.design.beans.FurtherBasicBeanPane;
+import com.fr.design.chartx.data.DataLayoutHelper;
 import com.fr.design.chartx.fields.AbstractDataSetFieldsPane;
 import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
-import com.fr.design.gui.ilable.BoldFontTextLabel;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
-import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.DatabaseTableDataPane;
-import com.fr.design.utils.gui.UIComponentUtils;
 
-import java.util.List;
+import javax.swing.JPanel;
 import java.awt.BorderLayout;
-import java.awt.Dimension;
+import java.util.List;
 
 /**
  * Created by shine on 2019/5/21.
  */
 public class DataSetPane extends FurtherBasicBeanPane<DataSetDefinition> {
-    private static final int TABLE_DATA_LABEL_LINE_WRAP_WIDTH = 65;
-    private static final int TABLE_DATA_PANE_WIDTH = 246;
 
     private DatabaseTableDataPane tableDataPane;
 
@@ -32,24 +27,27 @@ public class DataSetPane extends FurtherBasicBeanPane<DataSetDefinition> {
     }
 
     private void initComps(AbstractDataSetFieldsPane dataSetFieldsPane) {
-        UILabel label = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data"));
+        tableDataPane = new DatabaseTableDataPane(null) {
-        UIComponentUtils.setLineWrap(label, TABLE_DATA_LABEL_LINE_WRAP_WIDTH);
-        UIComponentUtils.setPreferedWidth(label, ChartDataPane.LABEL_WIDTH);
-
-        tableDataPane = new DatabaseTableDataPane(label) {
             @Override
             protected void userEvent() {
                 refreshBoxListAndTableName();
                 checkBoxUse();
             }
+
+            @Override
+            protected void setBorder() {
+            }
+
         };
-        tableDataPane.setPreferredSize(new Dimension(TABLE_DATA_PANE_WIDTH, tableDataPane.getPreferredSize().height));
+
 
         this.dataSetFieldsPane = dataSetFieldsPane;
 
-        this.setLayout(new BorderLayout());
+        JPanel northPane = DataLayoutHelper.createDataLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Table_Data"), tableDataPane);
-        this.add(tableDataPane, BorderLayout.NORTH);
+        this.setLayout(new BorderLayout(0, 6));
+        this.add(northPane, BorderLayout.NORTH);
         this.add(dataSetFieldsPane, BorderLayout.CENTER);
+        DataLayoutHelper.addNormalBorder(this);
         checkBoxUse();
     }
 

designer-chart/src/main/java/com/fr/design/chartx/single/SingleDataPane.java

@@ -3,28 +3,22 @@ package com.fr.design.chartx.single;
 import com.fr.chartx.data.AbstractDataDefinition;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.beans.FurtherBasicBeanPane;
+import com.fr.design.chartx.data.DataLayoutHelper;
 import com.fr.design.chartx.fields.AbstractCellDataFieldsPane;
 import com.fr.design.chartx.fields.AbstractDataSetFieldsPane;
-import com.fr.design.constants.LayoutConstants;
 import com.fr.design.gui.frpane.UIComboBoxPane;
-import com.fr.design.gui.ilable.BoldFontTextLabel;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
-import com.fr.design.utils.gui.UIComponentUtils;
 
-import javax.swing.BorderFactory;
 import javax.swing.JPanel;
+import java.awt.BorderLayout;
 import java.util.ArrayList;
 import java.util.List;
-import java.awt.BorderLayout;
 
 /**
  * Created by shine on 2019/5/21.
  */
 public class SingleDataPane extends BasicBeanPane<AbstractDataDefinition> {
 
-    private static final int  TABLE_DATA_LABEL_LINE_WIDTH = 81;
-
     private UIComboBoxPane<AbstractDataDefinition> comboBoxPane;
 
     private DataSetPane dataSetPane;
@@ -50,18 +44,12 @@ public class SingleDataPane extends BasicBeanPane<AbstractDataDefinition> {
             }
 
             protected void initLayout() {
-                this.setLayout(new BorderLayout(LayoutConstants.HGAP_LARGE, 6));
+                this.setLayout(new BorderLayout(0, 6));
-                JPanel northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE, 0));
+                JPanel northPane = DataLayoutHelper.createDataLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Data_Source"), jcb);
+                DataLayoutHelper.addNormalBorder(northPane);
 
-                UILabel label = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Source"));
-                UIComponentUtils.setPreferedWidth(label, TABLE_DATA_LABEL_LINE_WIDTH);
-                northPane.add(label,BorderLayout.WEST);
-                northPane.add(jcb, BorderLayout.CENTER);
-
-                northPane.setBorder(BorderFactory.createEmptyBorder(5,24,0,15));
                 this.add(northPane, BorderLayout.NORTH);
                 this.add(cardPane, BorderLayout.CENTER);
-
             }
 
             @Override

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

@@ -27,21 +27,19 @@ public class ExtendedCustomFieldComboBoxPane extends AbstractCustomFieldComboBox
     public void populateBean(AbstractDataConfig ob) {
         if (ob.isCustomName()) {
             populateCustomFieldNamePane(ob);
-            jcb.setSelectedIndex(1);
         } else {
             populateUseFieldValuePane(ob);
-            jcb.setSelectedIndex(0);
         }
+        populateNameOrValue(ob.isCustomName());
     }
 
     @Override
     public void updateBean(AbstractDataConfig ob) {
-        if (jcb.getSelectedIndex() == 0) {
+        ob.setCustomName(updateNameOrValue());
-            ob.setCustomName(false);
+        if (ob.isCustomName()) {
-            updateUseFieldValuePane(ob);
-        } else {
-            ob.setCustomName(true);
             updateCustomFieldNamePane(ob);
+        } else {
+            updateUseFieldValuePane(ob);
         }
     }
 

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

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

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

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

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

@@ -25,8 +25,4 @@ public class VanChartBoxPlotTooltipPane extends VanChartPlotTooltipPane {
     protected boolean hasTooltipSeriesType() {
         return false;
     }
-
-    public void checkContentVisible(boolean isDetailed) {
-        ((VanChartBoxTooltipContentPane) tooltipContentPane).checkFormatVisible(isDetailed);
-    }
 }

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

@@ -32,7 +32,7 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
 
     public VanChartBoxTooltipContentPane(VanChartStylePane parent, JPanel showOnPane, boolean isDetailed) {
         super(parent, showOnPane);
-        this.detailed = isDetailed;
+        checkFormatVisible(isDetailed);
     }
 
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
@@ -83,8 +83,6 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         commonPanel.add(createDataNumberPane(), BorderLayout.CENTER);
         commonPanel.add(createDataDetailPane(), BorderLayout.SOUTH);
 
-        checkFormatVisible(detailed);
-
         return commonPanel;
     }
 
@@ -178,7 +176,7 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     }
 
     protected AttrTooltipContent createAttrTooltip() {
-        return new AttrBoxTooltipContent();
+        return new AttrBoxTooltipContent(detailed);
     }
 
     protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
@@ -195,6 +193,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
             q1.populate(boxTooltipContent.getQ1());
             min.populate(boxTooltipContent.getMin());
             outlier.populate(boxTooltipContent.getOutlier());
+
+            checkFormatVisible(boxTooltipContent.isDetailed());
         }
     }
 
@@ -212,6 +212,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
             q1.update(boxTooltipContent.getQ1());
             min.update(boxTooltipContent.getMin());
             outlier.update(boxTooltipContent.getOutlier());
+
+            boxTooltipContent.setDetailed(this.detailed);
         }
     }
 

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

@@ -4,7 +4,6 @@ import com.fr.chart.base.DataSeriesCondition;
 import com.fr.chart.chartattr.Plot;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.base.AttrTooltip;
-import com.fr.plugin.chart.box.VanChartBoxPlot;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 import com.fr.van.chart.designer.style.tooltip.VanChartPlotTooltipPane;
 import com.fr.van.chart.designer.style.tooltip.VanChartTooltipPane;
@@ -25,11 +24,6 @@ public class VanChartBoxTooltipPane extends VanChartTooltipPane {
 
         if (tooltipPane instanceof VanChartBoxPlotTooltipPane) {
             tooltipPane.populate((AttrTooltip) attr);
-
-            VanChartBoxPlotTooltipPane boxPlotTooltipPane = (VanChartBoxPlotTooltipPane) tooltipPane;
-            VanChartBoxPlot boxPlot = (VanChartBoxPlot) plot;
-
-            boxPlotTooltipPane.checkContentVisible(boxPlot.isDetailed());
         }
     }
 }

designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportDataContentPane.java

@@ -101,7 +101,7 @@ public class BoxPlotReportDataContentPane extends AbstractReportDataContentPane
             boolean isDetailed = dataType.getSelectedIndex() == 0;
 
             report.setDetailed(isDetailed);
-            ((VanChartBoxPlot) initplot).setDetailed(isDetailed);
+            ((VanChartBoxPlot) initplot).updateDetailedAttr(isDetailed);
         }
         if (detailedDataSeriesPane != null) {
             detailedDataSeriesPane.updateBean(collection);

designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableDataContentPane.java

@@ -154,7 +154,7 @@ public class BoxPlotTableDataContentPane extends AbstractTableDataContentPane {
             boolean isDetailed = dataType.getSelectedIndex() == 0;
 
             table.setDetailed(isDetailed);
-            ((VanChartBoxPlot) initplot).setDetailed(isDetailed);
+            ((VanChartBoxPlot) initplot).updateDetailedAttr(isDetailed);
         }
         if (seriesTypeComboxPane != null) {
             seriesTypeComboxPane.updateBean(collection);

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

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

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

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

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

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

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

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

designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLineMapTooltipConditionPane.java

@@ -4,7 +4,7 @@ package com.fr.van.chart.designer.other.condition.item;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.van.chart.designer.style.tooltip.VanChartPlotTooltipPane;
-import com.fr.van.chart.map.line.VanChartLineMapPlotTooltipPane;
+import com.fr.van.chart.map.line.VanChartLineMapPlotTooltipNoCheckPane;
 
 /**
  * Created by hufan on 2016/12/23.
@@ -16,6 +16,6 @@ public class VanChartLineMapTooltipConditionPane extends VanChartTooltipConditio
     }
 
     protected VanChartPlotTooltipPane createTooltipContentsPane() {
-        return new VanChartLineMapPlotTooltipPane(getPlot(), null);
+        return new VanChartLineMapPlotTooltipNoCheckPane(getPlot(), null);
     }
 }

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

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

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

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

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

@@ -45,9 +45,9 @@ public class MapDataTree extends JTree {
     public void selectDefaultTreeNode() {
         DefaultTreeModel m_model = (DefaultTreeModel) this.getModel();
         DefaultMutableTreeNode root = (DefaultMutableTreeNode) m_model.getRoot();
-        Enumeration<DefaultMutableTreeNode> children = root.children();
+        Enumeration<TreeNode> children = root.children();
         if (children.hasMoreElements()) {
-            DefaultMutableTreeNode child = children.nextElement();
+            DefaultMutableTreeNode child = (DefaultMutableTreeNode) children.nextElement();
 
             if(GEOJSONTreeHelper.getInstance().isSelectableTreeNode(child)){
                 selectTreeNode(child, m_model);
@@ -59,9 +59,9 @@ public class MapDataTree extends JTree {
     }
 
     private void setFirstChildTreeNode(DefaultMutableTreeNode parent, DefaultTreeModel m_model){
-        Enumeration<DefaultMutableTreeNode> children = parent.children();
+        Enumeration<TreeNode> children = parent.children();
         if (children.hasMoreElements()){
-            DefaultMutableTreeNode node = children.nextElement();
+            DefaultMutableTreeNode node = (DefaultMutableTreeNode) children.nextElement();
             selectTreeNode(node, m_model);
         }
     }
@@ -89,9 +89,9 @@ public class MapDataTree extends JTree {
         DefaultTreeModel m_model = (DefaultTreeModel) this.getModel();
         DefaultMutableTreeNode root = (DefaultMutableTreeNode) m_model.getRoot();
 
-        Enumeration<DefaultMutableTreeNode> els = root.postorderEnumeration();
+        Enumeration<TreeNode> els = root.postorderEnumeration();
         while(els.hasMoreElements()){
-            DefaultMutableTreeNode el = els.nextElement();
+            DefaultMutableTreeNode el = (DefaultMutableTreeNode) els.nextElement();
             if(el == null || el.getUserObject() == null){
                 return null;
             }
@@ -145,10 +145,10 @@ public class MapDataTree extends JTree {
         DefaultTreeModel m_model = (DefaultTreeModel) this.getModel();
         DefaultMutableTreeNode root = (DefaultMutableTreeNode) m_model.getRoot();
 
-        Enumeration<DefaultMutableTreeNode> els = root.postorderEnumeration();
+        Enumeration<TreeNode> els = root.postorderEnumeration();
         while(els.hasMoreElements()){
 
-            DefaultMutableTreeNode el = els.nextElement();
+            DefaultMutableTreeNode el = (DefaultMutableTreeNode) els.nextElement();
             String path =  el.getUserObject().toString();
             String fileName = ChartGEOJSONHelper.getPresentNameWithPath(path);
             if (StringUtils.contains(fileName, text) && GEOJSONTreeHelper.isValidDirPath(path)) {

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

@@ -12,6 +12,7 @@ import com.fr.plugin.chart.gantt.attr.AttrGanttLabel;
 import com.fr.plugin.chart.gantt.attr.AttrGanttTooltip;
 import com.fr.plugin.chart.gantt.attr.AttrGanttTooltipContent;
 import com.fr.plugin.chart.type.ConditionKeyType;
+import com.fr.van.chart.designer.PlotFactory;
 import com.fr.van.chart.designer.other.condition.item.VanChartLabelConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartSeriesColorConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartTooltipConditionPane;
@@ -40,7 +41,9 @@ public class VanChartGanttConditionPane extends DataSeriesConditionPane {
     protected void addBasicAction() {
         classPaneMap.put(AttrBackground.class, new VanChartSeriesColorConditionPane(this));
         classPaneMap.put(AttrAlpha.class, new LabelAlphaPane(this));
+        if (!PlotFactory.largeDataModel(plot)) {
             classPaneMap.put(AttrGanttLabel.class, new VanChartLabelConditionPane(this, plot));
+        }
         classPaneMap.put(AttrGanttTooltip.class, new VanChartTooltipConditionPane(this, plot) {
 
             @Override
@@ -75,6 +78,7 @@ public class VanChartGanttConditionPane extends DataSeriesConditionPane {
 
     /**
      * 返回图表class对象
+     *
      * @return class对象
      */
     public Class<? extends Plot> class4Correspond() {

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

@@ -44,7 +44,8 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane {
         Component[][] components = new Component[][]{
                 new Component[]{createGanntStylePane()},
                 new Component[]{createLinkLinePane()},
-                new Component[]{createMarkerPane()}
+                new Component[]{createMarkerPane()},
+                new Component[]{createLargeDataModelPane()}
         };
 
         contentPane = TableLayoutHelper.createTableLayoutPane(components, row, col);
@@ -58,6 +59,10 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane {
         return ganntStylePane;
     }
 
+    protected void checkCompsEnabledWithLarge(Plot plot) {
+
+    }
+
     private JPanel createLinkLinePane(){
         lineWidth = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART);
         colorSelect = new ColorSelectBoxWithOutTransparent(100);

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

@@ -8,10 +8,13 @@ import com.fr.chartx.data.field.AbstractColumnFieldCollection;
 import com.fr.chartx.data.field.diff.GaugeColumnFieldCollection;
 import com.fr.chartx.data.field.diff.MultiCategoryColumnFieldCollection;
 import com.fr.log.FineLoggerFactory;
+import com.fr.plugin.chart.attr.GaugeDetailStyle;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
+import com.fr.plugin.chart.base.AttrLabel;
 import com.fr.plugin.chart.gauge.GaugeIndependentVanChart;
 import com.fr.plugin.chart.gauge.VanChartGaugePlot;
 import com.fr.plugin.chart.type.GaugeStyle;
+import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
 
 /**
@@ -56,7 +59,7 @@ public class VanChartGaugePlotPane extends AbstractVanChartTypePane {
     /**
      * 保存界面属性
      */
-    public void updateBean(Chart chart) {
+    public void updateBean(VanChart chart) {
         boolean oldISMulti = chart.getPlot() instanceof VanChartGaugePlot && ((VanChartGaugePlot) chart.getPlot()).isMultiPointer();
         super.updateBean(chart);
         boolean newISMulti = chart.getPlot() instanceof VanChartGaugePlot && ((VanChartGaugePlot) chart.getPlot()).isMultiPointer();
@@ -65,6 +68,60 @@ public class VanChartGaugePlotPane extends AbstractVanChartTypePane {
         }
     }
 
+    @Override
+    protected VanChartPlot cloneOldPlot2New(VanChartPlot oldPlot, VanChartPlot newPlot) {
+        try {
+            VanChartGaugePlot vanChartNewPlot = (VanChartGaugePlot) newPlot;
+            VanChartGaugePlot vanChartOldPlot = (VanChartGaugePlot) oldPlot;
+            if (vanChartNewPlot.isMultiPointer() != vanChartOldPlot.isMultiPointer()) {
+                return super.cloneOldPlot2New(oldPlot, newPlot);
+            }
+
+            VanChartGaugePlot clonePlot = (VanChartGaugePlot) vanChartOldPlot.clone();
+            clonePlot.setGaugeStyle(vanChartNewPlot.getGaugeStyle());
+            //都是多指针仪表盘,所有属性都一样
+            if (clonePlot.isMultiPointer()) {
+                return clonePlot;
+            }
+            //超链和系列中的样式、布局不保留
+            clonePlot.setHotHyperLink(vanChartNewPlot.getHotHyperLink());
+            clonePlot.setRadius(vanChartNewPlot.getRadius());
+            reductionDetail(clonePlot.getGaugeDetailStyle(), vanChartNewPlot.getGaugeDetailStyle());
+
+            //如果切换试管型仪表盘，部分属性不保留
+            if (clonePlot.getGaugeStyle() == GaugeStyle.THERMOMETER ||
+                    vanChartOldPlot.getGaugeStyle() == GaugeStyle.THERMOMETER) {
+                clonePlot.setGaugeAxis(vanChartNewPlot.getGaugeAxis());
+                clonePlot.getGaugeDetailStyle().setHorizontalLayout(vanChartNewPlot.getGaugeDetailStyle().isHorizontalLayout());
+                clonePlot.getGaugeDetailStyle().setHotAreaColor(vanChartNewPlot.getGaugeDetailStyle().getHotAreaColor());
+
+                AttrLabel cloneLabel = clonePlot.getAttrLabelFromConditionCollection();
+                AttrLabel newLabel = vanChartNewPlot.getAttrLabelFromConditionCollection();
+                cloneLabel.getAttrLabelDetail().setPosition(newLabel.getAttrLabelDetail().getPosition());
+                cloneLabel.getAttrLabelDetail().setAlign(newLabel.getAttrLabelDetail().getAlign());
+                cloneLabel.getAttrLabelDetail().setTextAttr(newLabel.getAttrLabelDetail().getTextAttr());
+                cloneLabel.getGaugeValueLabelDetail().setPosition(newLabel.getGaugeValueLabelDetail().getPosition());
+                cloneLabel.getGaugeValueLabelDetail().setAlign(newLabel.getGaugeValueLabelDetail().getAlign());
+                cloneLabel.getGaugeValueLabelDetail().setTextAttr(newLabel.getGaugeValueLabelDetail().getTextAttr());
+            }
+            return clonePlot;
+
+        } catch (CloneNotSupportedException e) {
+            FineLoggerFactory.getLogger().error("Error in change plot");
+            return newPlot;
+        }
+    }
+
+    private void reductionDetail(GaugeDetailStyle cloneDetail, GaugeDetailStyle newDetail) {
+        cloneDetail.setNeedleColor(newDetail.getNeedleColor());
+        cloneDetail.setPaneBackgroundColor(newDetail.getPaneBackgroundColor());
+        cloneDetail.setSlotBackgroundColor(newDetail.getSlotBackgroundColor());
+        cloneDetail.setAntiClockWise(newDetail.isAntiClockWise());
+        cloneDetail.setInnerPaneBackgroundColor(newDetail.getInnerPaneBackgroundColor());
+        cloneDetail.setThermometerWidth(newDetail.getThermometerWidth());
+        cloneDetail.setChutePercent(newDetail.getChutePercent());
+    }
+
     protected void cloneOldConditionCollection(Plot oldPlot, Plot newPlot) throws CloneNotSupportedException {
     }
 

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

@@ -10,6 +10,7 @@ import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.heatmap.HeatMapIndependentVanChart;
 import com.fr.plugin.chart.heatmap.VanChartHeatMapPlot;
 import com.fr.plugin.chart.map.server.CompatibleGEOJSONHelper;
+import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.map.designer.type.VanChartMapPlotPane;
 import com.fr.van.chart.map.designer.type.VanChartMapSourceChoosePane;
 
@@ -30,7 +31,7 @@ public class VanChartHeatMapTypePane extends VanChartMapPlotPane {
     }
 
     //适用一种图表只有一种类型的
-    public void populateBean(Chart chart) {
+    public void populateBean(VanChart chart) {
         typeDemo.get(0).isPressing = true;
         VanChartHeatMapPlot plot = (VanChartHeatMapPlot)chart.getPlot();
         populateSourcePane(plot);

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

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

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

@@ -9,13 +9,18 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.base.VanChartTools;
+import com.fr.plugin.chart.drillmap.VanChartDrillMapPlot;
+import com.fr.plugin.chart.heatmap.VanChartHeatMapPlot;
 import com.fr.plugin.chart.map.MapIndependentVanChart;
 import com.fr.plugin.chart.map.VanChartMapPlot;
 import com.fr.plugin.chart.map.data.VanMapDefinition;
 import com.fr.plugin.chart.map.server.CompatibleGEOJSONHelper;
+import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
 
 import javax.swing.JPanel;
+import java.util.HashSet;
+import java.util.Set;
 import java.awt.Component;
 
 /**
@@ -25,6 +30,14 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane {
 
     private VanChartMapSourceChoosePane sourceChoosePane;
 
+    private static Set<String> extendPlotIds = new HashSet<>();
+
+    static {
+        extendPlotIds.add(VanChartMapPlot.VAN_CHART_MAP_ID);
+        extendPlotIds.add(VanChartDrillMapPlot.VAN_CHART_DRILL_MAP_ID);
+        extendPlotIds.add(VanChartHeatMapPlot.VAN_CHART_HEAT_MAP_ID);
+    }
+
     @Override
     protected String[] getTypeIconPath() {
         return new String[]{"/com/fr/van/chart/map/images/area-map.png",
@@ -54,7 +67,7 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane {
     /**
      * 更新界面内容
      */
-    public void populateBean(Chart chart) {
+    public void populateBean(VanChart chart) {
         for (ChartImagePane imagePane : typeDemo) {
             imagePane.isPressing = false;
         }
@@ -80,7 +93,7 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane {
         }
     }
 
-    public void updateBean(Chart chart) {
+    public void updateBean(VanChart chart) {
         super.updateBean(chart);
         Plot plot = chart.getPlot();
         if (plot instanceof VanChartMapPlot) {
@@ -154,4 +167,10 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane {
     protected boolean acceptDefinition(ChartDataDefinitionProvider definition, VanChartPlot vanChartPlot) {
         return definition instanceof MapChartDataDefinition;
     }
+
+    //是否支持属性的继承
+    @Override
+    protected boolean supportExtendAttr(VanChart chart) {
+        return extendPlotIds.contains(chart.getID());
+    }
 }

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

@@ -0,0 +1,36 @@
+package com.fr.van.chart.map.line;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.i18n.Toolkit;
+import com.fr.plugin.chart.base.AttrTooltip;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import java.awt.BorderLayout;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-08-20
+ */
+public class VanChartLineMapPlotTooltipNoCheckPane extends VanChartLineMapPlotTooltipPane {
+
+    public VanChartLineMapPlotTooltipNoCheckPane(Plot plot, VanChartStylePane parent) {
+        super(plot, parent);
+    }
+
+    protected void addComponents(Plot plot) {
+        isTooltipShow = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Use_Tooltip"));
+        tooltipPane = createTooltipPane(plot);
+
+        this.setLayout(new BorderLayout());
+        this.add(tooltipPane, BorderLayout.CENTER);
+    }
+
+    @Override
+    public void populate(AttrTooltip attr) {
+        super.populate(attr);
+        isTooltipShow.setSelected(true);
+        tooltipPane.setEnabled(isTooltipShow.isSelected());
+    }
+}

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

@@ -55,10 +55,10 @@ public class VanChartMultiPiePlotPane extends AbstractVanChartTypePane {
         return MultiPieIndependentVanChart.MultilayerVanChartTypes[0];
     }
 
-    protected void resetChartAttr(Chart chart, Plot newPlot) {
+    protected void resetChartAttr(VanChart chart, VanChartPlot newPlot) {
         super.resetChartAttr(chart, newPlot);
         //重置工具栏选项
-        VanChartTools tools = ((VanChart) chart).getVanChartTools();
+        VanChartTools tools = chart.getVanChartTools();
         if (tools != null) {
             tools.setSort(false);
             tools.setFullScreen(false);

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

@@ -5,9 +5,17 @@ import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.PiePlot4VanChart;
+import com.fr.plugin.chart.area.VanChartAreaPlot;
+import com.fr.plugin.chart.attr.plot.VanChartPlot;
+import com.fr.plugin.chart.column.VanChartColumnPlot;
+import com.fr.plugin.chart.line.VanChartLinePlot;
 import com.fr.plugin.chart.pie.PieIndependentVanChart;
+import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
 
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * 饼图(新特性) 属性表 选择类型 布局界面.
  */
@@ -15,6 +23,15 @@ public class VanChartPiePlotPane extends AbstractVanChartTypePane {
 
     private static final long serialVersionUID = 6163246902689597259L;
 
+    private static Set<String> extendPlotIds = new HashSet<>();
+
+    static {
+        extendPlotIds.add(VanChartColumnPlot.VAN_CHART_COLUMN_PLOT_ID);
+        extendPlotIds.add(VanChartColumnPlot.VAN_CHART_BAR_PLOT_ID);
+        extendPlotIds.add(VanChartLinePlot.VAN_CHART_LINE_PLOT);
+        extendPlotIds.add(VanChartAreaPlot.VAN_CHART_AREA_PLOT_ID);
+    }
+
     @Override
     protected String[] getTypeIconPath() {
         return new String[]{"/com/fr/van/chart/pie/images/pie.png",
@@ -44,6 +61,25 @@ public class VanChartPiePlotPane extends AbstractVanChartTypePane {
         return cloned;
     }
 
+    @Override
+    protected VanChartPlot cloneOldPlot2New(VanChartPlot oldPlot, VanChartPlot newPlot) {
+        try {
+            PiePlot4VanChart piePlot4VanChart = (PiePlot4VanChart) newPlot;
+            PiePlot4VanChart clonePlot = (PiePlot4VanChart) oldPlot.clone();
+            clonePlot.setRoseType(piePlot4VanChart.getRoseType());
+            return clonePlot;
+        } catch (CloneNotSupportedException e) {
+            FineLoggerFactory.getLogger().error("Error in change plot");
+            return newPlot;
+        }
+    }
+
+    //是否支持属性的继承
+    @Override
+    protected boolean supportExtendAttr(VanChart chart) {
+        return extendPlotIds.contains(chart.getID());
+    }
+
     public Chart getDefaultChart() {
         return PieIndependentVanChart.newPieChartTypes[0];
     }

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

@@ -10,13 +10,21 @@ import com.fr.chartx.data.ChartDataDefinitionProvider;
 import com.fr.chartx.data.field.AbstractColumnFieldCollection;
 import com.fr.chartx.data.field.diff.BubbleColumnFieldCollection;
 import com.fr.log.FineLoggerFactory;
+import com.fr.plugin.chart.area.VanChartAreaPlot;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.base.VanChartAttrLine;
 import com.fr.plugin.chart.base.VanChartTools;
+import com.fr.plugin.chart.bubble.VanChartBubblePlot;
+import com.fr.plugin.chart.column.VanChartColumnPlot;
+import com.fr.plugin.chart.line.VanChartLinePlot;
 import com.fr.plugin.chart.scatter.ScatterIndependentVanChart;
 import com.fr.plugin.chart.scatter.VanChartScatterPlot;
+import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
 
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Created by Mitisky on 16/2/16.
  */
@@ -29,6 +37,16 @@ public class VanChartScatterPlotPane extends AbstractVanChartTypePane {
         };
     }
 
+    private static Set<String> extendPlotIds = new HashSet<>();
+
+    static {
+        extendPlotIds.add(VanChartColumnPlot.VAN_CHART_COLUMN_PLOT_ID);
+        extendPlotIds.add(VanChartColumnPlot.VAN_CHART_BAR_PLOT_ID);
+        extendPlotIds.add(VanChartLinePlot.VAN_CHART_LINE_PLOT);
+        extendPlotIds.add(VanChartAreaPlot.VAN_CHART_AREA_PLOT_ID);
+        extendPlotIds.add(VanChartBubblePlot.VAN_CHART_BUBBLE_PLOT_ID);
+    }
+
     protected Plot getSelectedClonedPlot(){
         VanChartScatterPlot newPlot = null;
         Chart[] scatterChart = ScatterIndependentVanChart.ScatterVanChartTypes;
@@ -95,4 +113,10 @@ public class VanChartScatterPlotPane extends AbstractVanChartTypePane {
         }
         return false;
     }
+
+    //是否支持属性的继承
+    @Override
+    protected boolean supportExtendAttr(VanChart chart) {
+        return extendPlotIds.contains(chart.getID());
+    }
 }

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

@@ -133,13 +133,13 @@ public class AddingModel {
         Rectangle rect = ComponentUtils.getRelativeBounds(container);
         if (!ComparatorUtils.equals(container.getOuterLayout(), container.getBackupParent())) {
             added = container.getLayoutAdapter().addBean(creator,
-                    x + designer.getArea().getHorizontalValue(),
+                    x + designer.getHorizontalScaleValue(),
-                    y + designer.getArea().getVerticalValue());
+                    y + designer.getVerticalScaleValue() );
             return added;
         }
         added = container.getLayoutAdapter().addBean(creator,
-                x + designer.getArea().getHorizontalValue() - rect.x,
+                x + designer.getHorizontalScaleValue() - rect.x,
-                y + designer.getArea().getVerticalValue() - rect.y);
+                y + designer.getVerticalScaleValue() - rect.y);
         return added;
     }
 }

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

@@ -77,12 +77,13 @@ public class SelectionModel {
      * @param e 鼠标事件
      */
     public void selectACreatorAtMouseEvent(MouseEvent e) {
+        //单选因为要先从已选择的组件中筛选一遍，所以先选择再reset
+        XCreator comp = designer.getComponentAt(e);
         if (e.getButton() == MouseEvent.BUTTON3 || (!InputEventBaseOnOS.isControlDown(e) && !e.isShiftDown())) {
             // 如果Ctrl或者Shift键盘没有按下，则清除已经选择的组件
             selection.reset();
         } else {
             //按下Ctrl或者shift键时鼠标可以进行多选,两次点击同一控件就取消选中
-            XCreator comp = designer.getComponentAt(e);
             XLayoutContainer topLayout = XCreatorUtils.getHotspotContainer(comp).getTopLayout();
             if (topLayout != null && !topLayout.isEditable()) {
                 comp = topLayout;
@@ -93,9 +94,9 @@ public class SelectionModel {
                     selection.removeCreator(selected);
                 }
             }
+            comp = designer.getComponentAt(e);
         }
         // 获取e所在的组件
-        XCreator comp = designer.getComponentAt(e);
         selectACreator(comp);
     }
 
@@ -309,6 +310,7 @@ public class SelectionModel {
             designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_DELETED);
 
             setSelectedCreator(isInPara ? designer.getParaComponent() : designer.getRootComponent());
+            designer.getTopXCreators().refresh();
 
 
             // 触发事件

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

@@ -300,6 +300,13 @@ public class StateModel {
         int y = getMouseXY(e).y;
 
         Rectangle bounds = createCurrentBounds(x, y);
+        // 有参数面板时 要考虑下参数面板的高度影响
+        int yOffset = 0;
+        XLayoutContainer paramComponent = designer.getParaComponent();
+        if (paramComponent != null) {
+            yOffset = paramComponent.getHeight();
+        }
+        bounds.y = Math.max(bounds.y - yOffset, 0);
 
         if ((x != currentX) || (y != currentY)) {
             ArrayList<XCreator> creators = getHotspotCreators(bounds, designer.getRootComponent());

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

@@ -308,5 +308,4 @@ public class XButton extends XWidgetCreator {
 		}
 
 	}
-
 }

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

@@ -17,6 +17,8 @@ import com.fr.design.mainframe.CoverReportPane;
 import com.fr.design.mainframe.EditingMouseListener;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.HelpDialogManager;
+import com.fr.design.mainframe.widget.topxcreator.BasicTopXCreator;
+import com.fr.design.mainframe.widget.topxcreator.TopXCreator;
 import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.form.ui.BaseChartEditor;
@@ -258,6 +260,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
                 (e.getClickCount() == 2 || designer.getCursor().getType() == Cursor.HAND_CURSOR);
         displayCoverPane(!isEditing);
         selectionModel.selectACreatorAtMouseEvent(e);
+        editingMouseListener.refreshTopXCreator(isEditing);
 
         if (editingMouseListener.stopEditing()) {
             if (this != (XCreator) designer.getRootComponent()) {
@@ -357,4 +360,35 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
     public boolean supportMobileStyle() {
         return false;
     }
+
+    @Override
+    public BasicTopXCreator getTopXCreator() {
+        return new TopXChart(this);
+    }
+
+    private class TopXChart extends TopXCreator {
+        private final DesignerEditor designerEditor;
+
+        public TopXChart(XCreator creator) {
+            super(creator);
+            designerEditor = creator.getDesignerEditor();
+            Rectangle bounds = getBounds();
+            designerEditor.getEditorTarget().setBounds(bounds.x + 1, bounds.y + 1, bounds.width - 2, bounds.height - 2);
+        }
+
+        /**
+         * 更新designerEditor的大小
+         */
+        protected void resetSize(Rectangle bounds) {
+            super.resetSize(bounds);
+            designerEditor.getEditorTarget().setBounds(bounds.x + 1, bounds.y + 1, bounds.width - 2, bounds.height - 2);
+        }
+
+        @Override
+        public void paint(Graphics g) {
+            designerEditor.paintEditor(g, this.getSize());
+            super.paint(g);
+        }
+    }
+
 }

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

@@ -19,16 +19,22 @@ import com.fr.design.mainframe.CoverReportPane;
 import com.fr.design.mainframe.EditingMouseListener;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.NoSupportAuthorityEdit;
+import com.fr.design.mainframe.widget.topxcreator.BasicTopXCreator;
 import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WTitleLayout;
 import com.fr.stable.Constants;
+import com.fr.stable.CoreGraphHelper;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
+import com.fr.third.javax.annotation.Nullable;
 
 import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
 import javax.swing.JComponent;
+import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.border.Border;
 import java.awt.BorderLayout;
@@ -38,6 +44,7 @@ import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
+import java.awt.image.BufferedImage;
 import java.beans.IntrospectionException;
 import java.util.ArrayList;
 import java.util.List;
@@ -539,6 +546,8 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 			selectionModel.selectACreatorAtMouseEvent(e);
 		}
 
+		editingMouseListener.refreshTopXCreator();
+
 		if (editingMouseListener.stopEditing() && this != designer.getRootComponent()) {
 			ComponentAdapter adapter = AdapterBus.getComponentAdapter(designer, this);
 			editingMouseListener.startEditing(this, adapter.getDesignerEditor(), adapter);
@@ -798,10 +807,37 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 
 	/**
 	 * 是否支持共享-现只支持报表块、图表、tab块、绝对布局
-	 * @return
 	 */
 	public boolean isSupportShared() {
 		return false;
 	}
 
+	/**
+	 * 获得该组件的顶层显示组件
+	 */
+	@Nullable
+	public BasicTopXCreator getTopXCreator() {
+		return new BasicTopXCreator(this) {
+			@Override
+			protected void addComponent() {
+				Icon icon = new ImageIcon(getImage());
+				JLabel jLabel = new JLabel(icon, JLabel.CENTER);
+				jLabel.setSize(getSize());
+				this.add(jLabel);
+			}
+		};
+	}
+
+	/**
+	 * 获得组件的图像
+	 */
+	public BufferedImage getImage() {
+		BufferedImage image = CoreGraphHelper.createBufferedImage(getWidth(), getHeight());
+		Graphics g = image.createGraphics();
+		this.paint(g);
+		return image;
+	}
+
+
+
 }

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

@@ -13,6 +13,8 @@ import com.fr.design.mainframe.widget.editors.ElementCaseToolBarEditor;
 import com.fr.design.mainframe.widget.editors.PaddingMarginEditor;
 import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor;
 import com.fr.design.mainframe.widget.propertypane.BrowserFitPropertyEditor;
+import com.fr.design.mainframe.widget.topxcreator.BasicTopXCreator;
+import com.fr.design.mainframe.widget.topxcreator.TopXCreator;
 import com.fr.form.FormElementCaseContainerProvider;
 import com.fr.form.FormElementCaseProvider;
 import com.fr.form.FormProvider;
@@ -319,6 +321,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 	public void respondClick(EditingMouseListener editingMouseListener,MouseEvent e){
 		HelpDialogManager.getInstance().setPane(coverPanel);
 		super.respondClick(editingMouseListener, e);
+		editingMouseListener.refreshTopXCreator();
 		if (this.isHelpBtnOnFocus()) {
 			coverPanel.setMsgDisplay(e);
 		} else {
@@ -370,4 +373,20 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 	public boolean isSupportShared() {
 		return true;
 	}
+
+	@Override
+	public BasicTopXCreator getTopXCreator() {
+		return new TopXElementCase(this);
+	}
+
+	private class TopXElementCase extends TopXCreator {
+		private UILabel imageLabel;
+
+		public TopXElementCase(XCreator creator) {
+			super(creator);
+			imageLabel = initImageBackground();
+			add(imageLabel);
+		}
+	}
+
 }

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

@@ -68,9 +68,6 @@ public class XNameWidget extends XWidgetCreator {
 			Widget widget;
 			if (wc != null && (widget= wc.toWidget()) != null) {
 				editor = XCreatorUtils.createXCreator(widget);
-				Widget currentWidget = toData();
-				currentWidget.setVisible(widget.isVisible());
-				currentWidget.setEnabled(widget.isEnabled());
 				this.setBorder(null);
 			} else {
 				this.setBorder(DEFALUTBORDER);

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

@@ -7,6 +7,7 @@ import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor;
+import com.fr.design.mainframe.widget.topxcreator.BasicTopXCreator;
 import com.fr.form.ui.container.WAbsoluteBodyLayout;
 
 import com.fr.stable.core.PropertyChangeAdapter;
@@ -130,4 +131,9 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout {
     public boolean isSupportShared() {
         return false;
     }
+
+    @Override
+    public BasicTopXCreator getTopXCreator() {
+        return null;
+    }
 }

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

@@ -25,6 +25,8 @@ import com.fr.design.mainframe.FormArea;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.WidgetHelpDialog;
 import com.fr.design.mainframe.WidgetPropertyPane;
+import com.fr.design.mainframe.widget.topxcreator.BasicTopXCreator;
+import com.fr.design.mainframe.widget.topxcreator.TopXCreator;
 import com.fr.form.ui.Connector;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WAbsoluteLayout;
@@ -433,7 +435,11 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
     @Override
     public XLayoutContainer getTopLayout() {
-        XLayoutContainer xTopLayout = XCreatorUtils.getParentXLayoutContainer(this).getTopLayout();
+        XLayoutContainer parentXLayoutContainer = XCreatorUtils.getParentXLayoutContainer(this);
+        if (parentXLayoutContainer == null) {
+            return this;
+        }
+        XLayoutContainer xTopLayout = parentXLayoutContainer.getTopLayout();
         if (xTopLayout != null && !xTopLayout.isEditable()) {
             return xTopLayout;
         } else {
@@ -538,6 +544,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
         selectionModel.selectACreatorAtMouseEvent(e);
         designer.repaint();
+        editingMouseListener.refreshTopXCreator(isEditing);
 
         if (editingMouseListener.stopEditing()) {
             if (this != designer.getRootComponent()) {
@@ -602,4 +609,9 @@ public class XWAbsoluteLayout extends XLayoutContainer {
             return super.getWidgetPropertyUIProviders();
         }
     }
+
+    @Override
+    public BasicTopXCreator getTopXCreator() {
+        return new TopXCreator(this);
+    }
 }

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

@@ -15,6 +15,7 @@ import com.fr.design.mainframe.widget.editors.BooleanEditor;
 import com.fr.design.mainframe.widget.editors.WidgetDisplayPosition;
 import com.fr.design.mainframe.widget.renderer.BackgroundRenderer;
 import com.fr.design.mainframe.widget.renderer.WidgetDisplayPositionRender;
+import com.fr.design.mainframe.widget.topxcreator.BasicTopXCreator;
 import com.fr.form.ui.container.WBorderLayout;
 import com.fr.form.ui.container.WFitLayout;
 import com.fr.form.ui.container.WParameterLayout;
@@ -251,4 +252,10 @@ public class XWParameterLayout extends XWAbsoluteLayout {
         return false;
     }
 
+    @Override
+    public BasicTopXCreator getTopXCreator() {
+        return null;
+    }
+
+
 }

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

@@ -7,6 +7,7 @@ import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRTitleLayoutAdapter;
 import com.fr.design.form.layout.FRTitleLayout;
 import com.fr.design.fun.WidgetPropertyUIProvider;
+import com.fr.design.mainframe.widget.topxcreator.BasicTopXCreator;
 import com.fr.form.ui.Label;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.WidgetTitle;
@@ -189,4 +190,9 @@ public class XWTitleLayout extends DedicateLayoutContainer {
 		XCreator creator = getPropertyDescriptorCreator();
 		return creator.getWidgetPropertyUIProviders();
 	}
+
+	@Override
+	public BasicTopXCreator getTopXCreator() {
+		return getEditingChildCreator().getTopXCreator();
+	}
 }

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

@@ -86,7 +86,6 @@ public class XCardAddButton extends XButton {
     @Override
 	public void respondClick(EditingMouseListener editingMouseListener, MouseEvent e){
 		FormDesigner designer = editingMouseListener.getDesigner();
-		designer.fireTargetModified();
 
     	// addbutton对应的XWCardLayout和XWCardTagLayout暂未存入到xml中，重新打开之后先根据父子层获取
     	if(cardLayout == null && tagLayout ==null ){
@@ -112,6 +111,8 @@ public class XCardAddButton extends XButton {
 		showNewTab(editingMouseListener,index);
 		tagLayout.setTabsAndAdjust();
 		LayoutUtils.layoutRootContainer(designer.getRootComponent());
+
+		designer.fireTargetModified();
     }
 
 	@Override

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

@@ -16,16 +16,15 @@ import com.fr.design.designer.creator.XCreatorUtils;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWBorderLayout;
 import com.fr.design.designer.creator.XWidgetCreator;
-import com.fr.design.designer.properties.mobile.MobileBooKMarkUsePropertyUI;
-import com.fr.design.form.util.FormDesignerUtils;
 import com.fr.design.form.util.XCreatorConstants;
-import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.icon.IconPathConstants;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.EditingMouseListener;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.WidgetHelpDialog;
 import com.fr.design.mainframe.WidgetPropertyPane;
+import com.fr.design.mainframe.widget.topxcreator.BasicTopXCreator;
+import com.fr.design.mainframe.widget.topxcreator.TopXCreator;
 import com.fr.form.event.Listener;
 import com.fr.form.ui.CardSwitchButton;
 import com.fr.form.ui.LayoutBorderStyle;
@@ -438,6 +437,7 @@ public class XWCardMainBorderLayout extends XWBorderLayout {
 		setEditable(isEditing);
 
 		selectionModel.selectACreatorAtMouseEvent(e);
+		editingMouseListener.refreshTopXCreator(isEditing);
 		designer.repaint();
 
 		if (editingMouseListener.stopEditing()) {
@@ -514,4 +514,9 @@ public class XWCardMainBorderLayout extends XWBorderLayout {
 	public boolean isSupportShared() {
 		return true;
 	}
+
+	@Override
+	public BasicTopXCreator getTopXCreator() {
+		return new TopXCreator(this);
+	}
 }

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

@@ -143,7 +143,7 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
             fitLayout.setInitialBackground(layout.getTemplateStyle().getTabDefaultBackground());
             fitLayout.setCustomStyle(true);
         }
-        tabFitLayout.setxCardSwitchButton((XCardSwitchButton)this.getComponent(0));
+        tabFitLayout.setxCardSwitchButton((XCardSwitchButton)this.getComponent(index));
         tabFitLayout.checkButonType();
         tabFitLayout.setBackupParent(cardLayout);
         cardLayout.add(tabFitLayout, widgetName);
@@ -248,6 +248,7 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
         if (e.getClickCount() <= 1) {
             selectionModel.selectACreatorAtMouseEvent(e);
         }
+        editingMouseListener.refreshTopXCreator();
         if (editingMouseListener.stopEditing()) {
             if (this != designer.getRootComponent()) {
                 ComponentAdapter adapter = AdapterBus.getComponentAdapter(designer, this);

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

@@ -204,6 +204,7 @@ public class XWCardTitleLayout extends XWBorderLayout {
 		if (e.getClickCount() <= 1) {
 			selectionModel.selectACreatorAtMouseEvent(e);
 		}
+		editingMouseListener.refreshTopXCreator();
 		
 		if (editingMouseListener.stopEditing()) {
 			if (this != designer.getRootComponent()) {

designer-form/src/main/java/com/fr/design/designer/treeview/ComponentTreeCellRenderer.java

@@ -4,6 +4,7 @@ import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XCreatorUtils;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.Icon;
 import javax.swing.JTree;
@@ -23,7 +24,12 @@ public class ComponentTreeCellRenderer extends DefaultTreeCellRenderer {
 		if (value instanceof XCreator) {
 			String name = ((XCreator) value).toData().getWidgetName();
 			setText(name);
-			Icon icon = XCreatorUtils.getCreatorIcon((XCreator) value);
+			Icon icon = null;
+			try {
+				icon = XCreatorUtils.getCreatorIcon((XCreator) value);
+			} catch (Exception e) {
+				FineLoggerFactory.getLogger().info("{} has not icon or has been deleted", name);
+			}
 			if (icon != null) {
 				setIcon(icon);
 			}

designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java

@@ -1,5 +1,6 @@
 package com.fr.design.form.util;
 
+import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.JTemplate;
@@ -17,6 +18,9 @@ public class FormDesignerUtils {
      * @return
      */
     public static boolean isAppRelayout(FormDesigner designer) {
+        if (!designer.getRootComponent().acceptType(XWFitLayout.class)) {
+            return false;
+        }
         return ((WFitLayout) designer.getRootComponent().toData()).isAppRelayout();
     }
 

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

@@ -2,7 +2,11 @@ package com.fr.design.mainframe;
 
 import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XCreatorUtils;
 import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
+import com.fr.design.designer.creator.XWFitLayout;
+import com.fr.design.designer.creator.cardlayout.XCardSwitchButton;
 import com.fr.design.designer.treeview.ComponentTreeCellRenderer;
 import com.fr.design.designer.treeview.ComponentTreeModel;
 import com.fr.design.gui.itree.UITreeUI;
@@ -15,7 +19,9 @@ import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JTree;
 import javax.swing.SwingUtilities;
+import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreeCellRenderer;
+import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 import java.awt.BorderLayout;
@@ -30,6 +36,9 @@ import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Vector;
 
 public class ComponentTree extends JTree {
 
@@ -81,6 +90,7 @@ public class ComponentTree extends JTree {
     public void setSelectionPath(TreePath path) {
         // 不管点击哪一项，都要先退出编辑状态（图表、报表块、绝对布局、tab块）
         designer.stopEditing(path);
+        designer.getTopXCreators().refresh();
         super.setSelectionPath(path);
     }
 
@@ -129,6 +139,7 @@ public class ComponentTree extends JTree {
         setSelectionPaths(treepath);
         if (treepath.length > 0) {
             scrollPathToVisible(treepath[0]);
+            //expandPath(treepath[0]);
         }
     }
 
@@ -228,6 +239,52 @@ public class ComponentTree extends JTree {
         repaint();
     }
 
+    /**
+     * 获得树的展开路径
+     * */
+    public void getExpandNodes(List<TreePath> searchList) {
+        getExpandNodes((XLayoutContainer)designer.getTopContainer(),searchList);
+    }
+
+    public void getExpandNodes(XLayoutContainer container, List<TreePath> searchList) {
+        TreePath treePath = buildTreePath(container);
+        if (isExpanded(treePath)) {
+            searchList.add(treePath);
+            for (int i = 0, size = container.getXCreatorCount(); i < size; i++) {
+                XCreator creator = container.getXCreator(i);
+                if (creator.acceptType(XLayoutContainer.class) || creator.acceptType(XCardSwitchButton.class)) {
+                    getExpandNodes((XLayoutContainer) creator.getXCreator(), searchList);
+                }
+            }
+        }
+        //对绝对布局做特殊处理
+        if (container.acceptType(XWFitLayout.class)) {
+            XWFitLayout bodyFitLayout = (XWFitLayout) container;
+            for (int j = 0; j < bodyFitLayout.getXCreatorCount(); j++) {
+                //类型是绝对布局并且还是body
+                if (bodyFitLayout.getXCreator(j).acceptType(XWAbsoluteBodyLayout.class)) {
+                    container = (XLayoutContainer) bodyFitLayout.getXCreator(j);
+                    getExpandNodes(container, searchList);
+                }
+            }
+        }
+    }
+
+    /**
+     * 将树按照展开路径进行展开
+     * */
+    public void expandNodes(List<TreePath> list){
+        for(TreePath treePath:list) {
+            if (treePath.getLastPathComponent() instanceof XLayoutContainer) {
+                XLayoutContainer creator= (XLayoutContainer) treePath.getLastPathComponent();
+                if (XCreatorUtils.getParentXLayoutContainer(creator) == null) {
+                    continue;
+                }
+                expandPath(treePath);
+            }
+        }
+    }
+
     private TreePath buildTreePath(Component comp) {
         ArrayList<Component> path = new ArrayList<Component>();
         Component parent = comp;

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

@@ -8,7 +8,7 @@ import com.fr.general.IOUtils;
 
 import com.fr.stable.Constants;
 
-import javax.swing.JPanel;
+import javax.swing.JComponent;
 import java.awt.AlphaComposite;
 import java.awt.Color;
 import java.awt.Component;
@@ -28,7 +28,7 @@ import java.awt.Rectangle;
  * Date: 14-7-24
  * Time: 上午9:09
  */
-public class CoverPane extends JPanel {
+public class CoverPane extends JComponent {
 
     private UIButton editButton;
     private AlphaComposite composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5f);

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

@@ -11,7 +11,13 @@ import com.fr.design.designer.beans.location.Direction;
 import com.fr.design.designer.beans.location.Location;
 import com.fr.design.designer.beans.models.SelectionModel;
 import com.fr.design.designer.beans.models.StateModel;
-import com.fr.design.designer.creator.*;
+import com.fr.design.designer.creator.XChartEditor;
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XCreatorUtils;
+import com.fr.design.designer.creator.XEditorHolder;
+import com.fr.design.designer.creator.XElementCase;
+import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.designer.creator.cardlayout.XCardSwitchButton;
 import com.fr.design.designer.creator.cardlayout.XWCardLayout;
 import com.fr.design.form.util.XCreatorConstants;
@@ -22,14 +28,20 @@ import com.fr.design.icon.IconPathConstants;
 import com.fr.design.utils.ComponentUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.utils.gui.LayoutUtils;
-
 import com.fr.share.ShareConstants;
 import com.fr.stable.Constants;
-
 import com.fr.stable.StringUtils;
-import javax.swing.*;
+
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JPopupMenu;
+import javax.swing.JWindow;
+import javax.swing.SwingUtilities;
 import javax.swing.event.MouseInputAdapter;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.Cursor;
+import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
 
 /**
@@ -165,10 +177,13 @@ public class EditingMouseListener extends MouseInputAdapter {
                 if (designer.isDrawLineMode()) {
                     designer.updateDrawLineMode(e);
                 } else {
+                    int relativeX = Math.max(0, designer.getRelativeX(e.getX()));
+                    int relativeY = Math.max(0, designer.getRelativeY(e.getY()));
+
                     if (selectionModel.hasSelectionComponent()
                             && selectionModel.getSelection().getRelativeBounds().contains(
-                            designer.getArea().getHorizontalValue() + e.getX(),
+                            designer.getHorizontalScaleValue() + relativeX,
-                            designer.getArea().getVerticalValue() + e.getY())) {
+                            designer.getVerticalScaleValue() + relativeY)) {
                         lastPressEvent = e;
                         lastXCreator = selectionModel.getSelection().getSelectedCreator();
                     } else {
@@ -195,6 +210,7 @@ public class EditingMouseListener extends MouseInputAdapter {
      */
     public void mouseReleased(MouseEvent e) {
         MouseEvent transEvent = new MouseEvent(e.getComponent(), MouseEvent.MOUSE_CLICKED, e.getWhen(), e.getModifiers(),  e.getX(), e.getY(),  e.getXOnScreen(), e.getYOnScreen(), e.getClickCount(), e.isPopupTrigger(), e.getButton());
+        MouseEvent clickEvent = new MouseEvent(e.getComponent(), MouseEvent.MOUSE_CLICKED, e.getWhen(), e.getModifiers(),  e.getX(), e.getY(),  e.getXOnScreen(), e.getYOnScreen(), e.getClickCount(), e.isPopupTrigger(), e.getButton());
         int oldX = e.getX();
         int oldY = e.getY();
         offsetEventPoint(e);
@@ -219,14 +235,21 @@ public class EditingMouseListener extends MouseInputAdapter {
         lastPressEvent = null;
         lastXCreator = null;
         e.translatePoint(oldX - e.getX(), oldY - e.getY());
-        if (pressX != oldX || pressY != oldY) {
+        if (isAutoFire(transEvent, clickEvent)) {
             // click只有在mouseReleased和mousePressed前后x/y坐标相等时才会被触发在mouseReleased之后
             // 但是当使用者来回点击切换时 存在mouseReleased和mousePressed前后x/y坐标不相等的情况 即鼠标按下去的位置和鼠标释放的位置不相等 存在偏移
             // 当这种偏移很小时 看起来就好像是点击了 实际上是手抖了或者鼠标轻微滑动了 所以这里对这种情况要有容错处理
-            mouseClicked(transEvent);
+            mouseClicked(clickEvent);
         }
     }
 
+    private boolean isAutoFire(MouseEvent transEvent, MouseEvent clickEvent ) {
+        offsetEventPoint(transEvent);
+        XCreator xCreator = designer.getComponentAt(transEvent);
+        return (pressX != clickEvent.getX() || pressY != clickEvent.getY())
+                && xCreator != null && xCreator.acceptType(XCardSwitchButton.class);
+    }
+
     private void mouseDraggingRelease(MouseEvent e) {
         // 当前鼠标所在的组件
         XCreator hoveredComponent = designer.getComponentAt(e.getX(), e.getY());
@@ -293,6 +316,7 @@ public class EditingMouseListener extends MouseInputAdapter {
         XCreator component = designer.getComponentAt(e);
 
         setCoverPaneNotDisplay(component, e, false);
+        designer.getTopXCreators().displayCoverPane(e);
 
         if (processTopLayoutMouseMove(component, e)) {
             return;
@@ -677,6 +701,7 @@ public class EditingMouseListener extends MouseInputAdapter {
             currentXCreator.stopEditing();
             currentXCreator = null;
             currentEditor = null;
+            refreshTopXCreator();
             return true;
         }
         return true;
@@ -704,4 +729,19 @@ public class EditingMouseListener extends MouseInputAdapter {
         }
         currentEditor.getEditorTarget().setBounds(bounds);
     }
+
+    /**
+     * 刷新顶层组件
+     * */
+    public void refreshTopXCreator(boolean isEditing){
+        designer.refreshTopXCreator(isEditing);
+    }
+
+    /**
+     * 刷新顶层组件
+     * */
+    public void refreshTopXCreator(){
+        refreshTopXCreator(false);
+    }
+
 }

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

@@ -35,7 +35,9 @@ import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
 import com.fr.design.designer.creator.XWAbsoluteLayout;
 import com.fr.design.designer.creator.XWBorderLayout;
+import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.designer.creator.XWParameterLayout;
+import com.fr.design.designer.creator.XWTitleLayout;
 import com.fr.design.designer.properties.FormWidgetAuthorityEditPane;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.event.DesignerOpenedListener;
@@ -43,6 +45,7 @@ import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.fun.RightSelectionHandlerProvider;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
+import com.fr.design.mainframe.widget.topxcreator.TopXCreators;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.menu.ToolBarDef;
@@ -121,6 +124,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
     private FormArea formArea;
     private ConnectorHelper connectorHelper;
     private boolean isReportBlockEditing = false;
+    private TopXCreators topXCreators;
 
     //组件重叠
     private boolean isWidgetsIntersect = false;
@@ -184,6 +188,8 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         new FormDesignerDropTarget(this);// 添加Drag and Drop.
 
         this.switchAction = switchAction;
+        topXCreators=new TopXCreators(this);
+        add(topXCreators);
 
         // 必须刷新"参数/控件树"面板，否则，若最近一次打开模版为 cpt，重启设计器，打开 frm，控件树消失
         populateParameterPropertyPane();
@@ -825,6 +831,40 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         return null;
     }
 
+    /**
+     * 从已选择的组件中找x,y所在的组件
+     */
+    private XCreator xCreatorAt(int x, int y, XCreator[] xCreators) {
+        for (XCreator creator : xCreators) {
+            if (creator == null || !creator.isVisible()) {
+                continue;
+            }
+            if (creator instanceof XWAbsoluteBodyLayout || creator instanceof XWFitLayout || creator instanceof XWParameterLayout) {
+                continue;
+            }
+            x -= creator.getX();
+            y -= creator.getY();
+            Rectangle rect = ComponentUtils.computeVisibleRect(creator);
+            // 判断是否处于交叉区域
+            if (!isIntersectArea(x, y, rect)) {
+                continue;
+            }
+            if (creator instanceof XWTitleLayout) {
+                return creator.getEditingChildCreator();
+            }
+            return creator;
+        }
+        return null;
+    }
+
+    /**
+     * 刷新顶层组件
+     * */
+    public void refreshTopXCreator(boolean isEditing){
+        topXCreators.refresh();
+        topXCreators.setVisible(!isEditing);
+    }
+
     private boolean isIntersectArea(int x, int y, Rectangle rect) {
         return x >= rect.getX() && (x <= (rect.getX() + rect.getWidth())) && (y >= rect.getY())
                 && (y <= (rect.getY() + rect.getHeight()));
@@ -984,6 +1024,10 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         invalidateLayout();
     }
 
+    public TopXCreators getTopXCreators() {
+        return topXCreators;
+    }
+
     public StateModel getStateModel() {
         return stateModel;
     }
@@ -1001,9 +1045,19 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         return getComponentAt(p.x, p.y);
     }
 
+    /**
+     * 先从已选择则的组件中去找，再遍历root去找
+     * */
     @Override
     public XCreator getComponentAt(int x, int y) {
-        return getComponentAt(x, y, null);
+        XLayoutContainer container = y < paraHeight - formArea.getVerticalValue() ? paraComponent : rootComponent;
+        if (container == null) {
+            container = rootComponent;
+        }
+        int relativeX = x + (int) (formArea.getHorizontalValue() / scale) - container.getX();
+        int relativeY = y + (int) (formArea.getVerticalValue() / scale) - container.getY();
+        XCreator result = xCreatorAt(relativeX, relativeY, selectionModel.getSelection().getSelectedCreators());
+        return result == null ? getComponentAt(x, y, null) : result;
     }
 
     @Nullable
@@ -1311,6 +1365,10 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         }
     }
 
+    public void paintTopCreators(Graphics clipg){
+        topXCreators.paint(clipg);
+    }
+
     /**
      * 重置组件边界
      */

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

@@ -84,6 +84,7 @@ public class FormDesignerUI extends ComponentUI {
             // 设计参数面板
             repaintPara(g, paraComponent, c);
         }
+        repaintTopXCreators(g);
 
         if (designer.isDrawLineMode() && designer.getDrawLineHelper().drawLining()) {
             designer.getDrawLineHelper().drawAuxiliaryLine(g);
@@ -409,8 +410,8 @@ public class FormDesignerUI extends ComponentUI {
         clipg = g.create(
                 -designer.getHorizontalScaleValue(),
                 -designer.getVerticalScaleValue() + designer.getParaHeight(),
-                (int) ((parent.getSize().width + designer.getArea().getHorizontalValue()) / designer.getScale()),
+                parent.getSize().width + designer.getHorizontalScaleValue(),
-                (int) ((parent.getSize().height + designer.getArea().getVerticalValue()) / designer.getScale()));
+                parent.getSize().height + designer.getVerticalScaleValue());
 
         designer.paintContent(clipg);
         paintWatermark((Graphics2D) clipg);
@@ -435,8 +436,8 @@ public class FormDesignerUI extends ComponentUI {
         Graphics clipg1;
         clipg1 = g.create(-designer.getHorizontalScaleValue(),
                 -designer.getVerticalScaleValue(),
-                (int) ((parent.getSize().width + designer.getArea().getHorizontalValue()) / designer.getScale()),
+                parent.getSize().width + designer.getHorizontalScaleValue(),
-                (int) ((designer.getParaHeight() + designer.getArea().getVerticalValue()) / designer.getScale()));
+               designer.getParaHeight() + designer.getVerticalScaleValue());
 
         designer.paintPara(clipg1);
         clipg1.dispose();
@@ -445,4 +446,8 @@ public class FormDesignerUI extends ComponentUI {
         ComponentUtils.resetBuffer(dbcomponents);
     }
 
+    private void repaintTopXCreators(Graphics g){
+        designer.paintTopCreators(g);
+    }
+
 }

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

@@ -24,12 +24,14 @@ import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
+import javax.swing.tree.TreePath;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.util.ArrayList;
+import java.util.List;
 
 
 /**
@@ -89,10 +91,13 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
     /**
      * 刷新
      */
+    //TODO 太乱了，需要重写，监听器里加了监听器是什么意思，每次调用该方法都会添加一个新的监听器
     public void refreshDockingView() {
         FormDesigner formDesigner = this.getEditingFormDesigner();
+        List<TreePath> list = new ArrayList<>();
         removeAll();
         if (this.componentTree != null) {
+            componentTree.getExpandNodes(list);
             this.componentTree.removeAll();
         }
         if (formDesigner == null) {
@@ -100,6 +105,8 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
             return;
         }
         componentTree = new ComponentTree(formDesigner);
+        //保证删除组件后组件树不收起
+        componentTree.expandNodes(list);
         formDesigner.addDesignerEditListener(new DesignerEditListener() {
             @Override
             public void fireCreatorModified(DesignerEvent evt) {

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

@@ -3,16 +3,8 @@ package com.fr.design.mainframe.widget;
 /**
  * Created by xiaxiang on 2016/9/30.
  */
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
-import javax.swing.plaf.metal.*;
-import javax.swing.tree.*;
-
 import com.fr.design.constants.UIConstants;
-import com.fr.design.designer.beans.*;
+import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.events.DesignerEditListener;
 import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.XCreator;
@@ -20,8 +12,36 @@ import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIComboBoxUI;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.mainframe.ComponentTree;
-import com.sun.java.swing.plaf.motif.*;
+import com.sun.java.swing.plaf.motif.MotifComboBoxUI;
-import com.sun.java.swing.plaf.windows.*;
+
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.JTree;
+import javax.swing.ListCellRenderer;
+import javax.swing.MenuSelectionManager;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.plaf.ComboBoxUI;
+import javax.swing.plaf.basic.ComboPopup;
+import javax.swing.plaf.metal.MetalComboBoxUI;
+import javax.swing.tree.TreeCellRenderer;
+import javax.swing.tree.TreePath;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionAdapter;
+import java.awt.event.MouseMotionListener;
 
 /**
  * 控件树下拉列表框
@@ -111,12 +131,6 @@ public class UITreeComboBox extends UIComboBox {
         }
     }
 
-    class WindowsJTreeComboBoxUI extends WindowsComboBoxUI{
-        protected ComboPopup createPopup() {
-            return new TreePopup(comboBox);
-        }
-    }
-
     class UIJTreeComboBoxUI extends UIComboBoxUI {
         protected ComboPopup createPopup() {
             return new TreePopup(comboBox);

designer-form/src/main/java/com/fr/design/mainframe/widget/topxcreator/BasicTopXCreator.java

@@ -0,0 +1,70 @@
+package com.fr.design.mainframe.widget.topxcreator;
+
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.mainframe.FormDesigner;
+import com.fr.design.mainframe.WidgetPropertyPane;
+import com.fr.design.utils.ComponentUtils;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.MouseEvent;
+
+/**
+ * @Author: Yuan.Wang
+ * @Date: 2020/8/31
+ */
+public class BasicTopXCreator extends JComponent {
+    private  FormDesigner designer;
+    private  XCreator creator;
+
+    public BasicTopXCreator(XCreator creator) {
+        this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+        this.creator = creator;
+        init();
+    }
+
+    private void init() {
+        setOpaque(false);
+        setBackground(null);
+        setLayout(null);
+        setBounds(calculateBounds());
+        addComponent();
+    }
+
+
+    //子类可能会重写该方法
+    protected void resetSize(Rectangle bounds) {
+        //do nothing
+    }
+
+    protected void addComponent() {
+
+    }
+
+    /**
+     * 重新设置组件大小
+     * */
+    public void resizeTopXCreator() {
+        Rectangle bounds=calculateBounds();
+        setBounds(bounds);
+        resetSize(bounds);
+    }
+
+    public void displayCoverPane(MouseEvent e, boolean visible) {}
+
+    /**
+     * 计算显示大小
+     * */
+    private Rectangle calculateBounds() {
+        Rectangle rect = ComponentUtils.getRelativeBounds(creator);
+        Rectangle bounds = new Rectangle(0, 0, creator.getWidth(), creator.getHeight());
+        bounds.x += (rect.x - designer.getHorizontalScaleValue());
+        bounds.y += (rect.y - designer.getVerticalScaleValue());
+        return bounds;
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        super.paint(g);
+    }
+}

designer-form/src/main/java/com/fr/design/mainframe/widget/topxcreator/TopXCreator.java

@@ -0,0 +1,49 @@
+package com.fr.design.mainframe.widget.topxcreator;
+
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.mainframe.CoverReportPane;
+
+import java.awt.*;
+import java.awt.event.MouseEvent;
+
+/**
+ * @Author: Yuan.Wang
+ * @Date: 2020/8/26
+ */
+public class TopXCreator extends BasicTopXCreator {
+
+    private final CoverReportPane coverPanel;
+
+    public TopXCreator(XCreator creator) {
+        super(creator);
+        coverPanel = new CoverReportPane();
+        init();
+    }
+
+    private void init() {
+        coverPanel.setSize(getSize());
+        coverPanel.setVisible(false);
+        add(coverPanel);
+    }
+
+
+    protected void resetSize(Rectangle bounds) {
+        coverPanel.setSize(getSize());
+    }
+
+    /**
+     * 设置是否显示蒙层
+     * */
+    public void displayCoverPane(boolean visible) {
+        coverPanel.setVisible(visible);
+    }
+
+    /**
+     * 依据鼠标事件和visible设置是否显示蒙层
+     * */
+    public void displayCoverPane(MouseEvent event, boolean visible) {
+        boolean isVisible = visible && getBounds().contains(event.getX(), event.getY());
+        coverPanel.setVisible(isVisible);
+    }
+
+}

designer-form/src/main/java/com/fr/design/mainframe/widget/topxcreator/TopXCreators.java

@@ -0,0 +1,101 @@
+package com.fr.design.mainframe.widget.topxcreator;
+
+import com.fr.design.designer.beans.events.DesignerEvent;
+import com.fr.design.designer.beans.models.SelectionModel;
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.mainframe.FormDesigner;
+
+import java.awt.event.MouseEvent;
+
+import javax.swing.*;
+import java.awt.*;
+
+
+/**
+ * 需要显示顶层的组件层
+ *
+ * @Author: Yuan.Wang
+ * @Date: 2020/8/25
+ */
+public class TopXCreators extends JComponent {
+    final private FormDesigner designer;
+
+    public TopXCreators(FormDesigner designer) {
+        this.designer = designer;
+        init();
+    }
+
+    private void init() {
+        setLayout(null);
+        setVisible(false);
+        setBackground(null);
+        setOpaque(false);
+        designer.addDesignerEditListener(e -> {
+            if (e.getCreatorEventID() == DesignerEvent.CREATOR_EDITED) {
+                refresh();
+            }
+        });
+    }
+
+    /**
+     * 选中的组件有变化时刷新
+     */
+    public void refresh() {
+        removeAll();
+        addXCreators();
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        setSize(designer.getSize());
+        resizeTopXCreators();
+        super.paint(g);
+    }
+
+    @Override
+    public void setVisible(boolean aFlag) {
+        super.setVisible(aFlag);
+        for (int i = 0, count = getComponentCount(); i < count; i++) {
+            if (getComponent(i) instanceof TopXCreator) {
+                TopXCreator xCreator = (TopXCreator) getComponent(i);
+                xCreator.displayCoverPane(aFlag);
+            }
+        }
+        repaint();
+    }
+
+    /**
+     * 依据MouseEvent坐标来设置是否显示蒙层
+     */
+    public void displayCoverPane(MouseEvent e) {
+        for (int i = 0, count = getComponentCount(); i < count; i++) {
+            BasicTopXCreator xCreator = (BasicTopXCreator) getComponent(i);
+            xCreator.displayCoverPane(e, isVisible());
+        }
+    }
+
+    /**
+     * 加入被选择的组件
+     */
+    private void addXCreators() {
+        SelectionModel selectionModel = designer.getSelectionModel();
+        XCreator[] xCreators = selectionModel.getSelection().getSelectedCreators();
+        for (XCreator creator : xCreators) {
+            BasicTopXCreator topXCreator = creator.getTopXCreator();
+            if (topXCreator != null) {
+                add(topXCreator);
+            }
+        }
+    }
+
+    /**
+     * 更新顶层组件的位置和大小
+     */
+    private void resizeTopXCreators() {
+        for (int i = 0, count = getComponentCount(); i < count; i++) {
+            BasicTopXCreator topXCreator = (BasicTopXCreator) getComponent(i);
+            topXCreator.resizeTopXCreator();
+        }
+        repaint();
+    }
+}

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TabMobileWidgetDefinePane.java

@@ -19,6 +19,7 @@ import com.fr.design.widget.ui.designer.mobile.component.MobileAdvanceInnerPane;
 import com.fr.design.widget.ui.designer.mobile.component.MobileBookMarkUsePane;
 import com.fr.design.widget.ui.designer.mobile.component.MobileComponentMarginPane;
 import com.fr.design.widget.ui.designer.mobile.component.MobileComponentLayoutIntervalPane;
+import com.fr.design.widget.ui.designer.mobile.component.MobileTabCommonSettingPane;
 import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.general.cardtag.mobile.MobileTemplateStyle;
 
@@ -34,6 +35,7 @@ public class TabMobileWidgetDefinePane extends MobileWidgetDefinePane {
     private MobileComponentMarginPane marginPane;
     private MobileComponentLayoutIntervalPane intervalPane;
     private MobileBookMarkUsePane mobileBookMarkUsePane;
+    private MobileTabCommonSettingPane mobileTabCommonSettingPane;
 
     public TabMobileWidgetDefinePane(XCreator xCreator) {
         this.xCreator = xCreator;
@@ -73,6 +75,8 @@ public class TabMobileWidgetDefinePane extends MobileWidgetDefinePane {
                 mobileBookMarkUsePane = new MobileBookMarkUsePane();
                 innerAdvancePane.add(mobileBookMarkUsePane, BorderLayout.CENTER);
             }
+            mobileTabCommonSettingPane = new MobileTabCommonSettingPane();
+            innerAdvancePane.add(mobileTabCommonSettingPane, BorderLayout.SOUTH);
             innerAdvancePane.add(marginPane, BorderLayout.NORTH);
             UIExpandablePane advancePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, innerAdvancePane);
             UIExpandablePane layoutPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout"), 280, 20, intervalPane);
@@ -88,7 +92,8 @@ public class TabMobileWidgetDefinePane extends MobileWidgetDefinePane {
     @Override
     public void populate(FormDesigner designer) {
         WCardTagLayout wCardTagLayout = (WCardTagLayout) xCreator.toData();
-        templateStyleEditor.setValue((wCardTagLayout).getMobileTemplateStyle());
+        MobileTemplateStyle mobileTemplateStyle = wCardTagLayout.getMobileTemplateStyle();
+        templateStyleEditor.setValue(mobileTemplateStyle);
         // 数据 populate 完成后，再设置监听
         this.bindListeners2Widgets();
         this.addAttributeChangeListener(changeListener);
@@ -101,6 +106,9 @@ public class TabMobileWidgetDefinePane extends MobileWidgetDefinePane {
         if (mobileBookMarkUsePane != null) {
             mobileBookMarkUsePane.populate(xCreator);
         }
+        if (mobileTabCommonSettingPane != null) {
+            mobileTabCommonSettingPane.populate(mobileTemplateStyle);
+        }
     }
 
     @Override
@@ -117,5 +125,8 @@ public class TabMobileWidgetDefinePane extends MobileWidgetDefinePane {
         if (mobileBookMarkUsePane != null) {
             mobileBookMarkUsePane.update(xCreator);
         }
+        if (mobileTabCommonSettingPane != null) {
+            mobileTabCommonSettingPane.update(wCardTagLayout.getMobileTemplateStyle());
+        }
     }
 }

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileTabCommonSettingPane.java

@@ -0,0 +1,203 @@
+package com.fr.design.widget.ui.designer.mobile.component;
+
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.designer.beans.events.DesignerEvent;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.gui.ibutton.ModeButtonGroup;
+import com.fr.design.gui.ibutton.UIRadioButton;
+import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.WidgetPropertyPane;
+import com.fr.design.style.color.NewColorSelectBox;
+import com.fr.general.cardtag.mobile.MobileTemplateStyle;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.JComponent;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+public class MobileTabCommonSettingPane extends BasicPane {
+
+    private UICheckBox showTabTitleCheck;
+    private UICheckBox tabSlideCheck;
+    private UICheckBox showTabDotIndicatorCheck;
+    private ModeButtonGroup<Integer> buttonGroup;
+    private NewColorSelectBox initDotColorBox;
+    private NewColorSelectBox selectDotColorBox;
+
+    public MobileTabCommonSettingPane() {
+        initComponent();
+    }
+
+    private void initComponent() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+
+        this.showTabTitleCheck = new UICheckBox(
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Tab_Show_Title"), true) {
+            @Override
+            protected void initListener() {
+                this.addMouseListener(new MouseAdapter() {
+                    @Override
+                    public void mouseClicked(MouseEvent e) {
+                        attributeChange();
+                    }
+                });
+            }
+        };
+        this.tabSlideCheck = new UICheckBox(
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Tab_Slide"), true) {
+            @Override
+            protected void initListener() {
+                this.addMouseListener(new MouseAdapter() {
+                    @Override
+                    public void mouseClicked(MouseEvent e) {
+                        attributeChange();
+                    }
+                });
+            }
+        };
+        this.showTabDotIndicatorCheck = new UICheckBox(
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Tab_Show_Indicator"), true) {
+            @Override
+            protected void initListener() {
+                this.addMouseListener(new MouseAdapter() {
+                    @Override
+                    public void mouseClicked(MouseEvent e) {
+                        attributeChange();
+                    }
+                });
+            }
+        };
+
+        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Tab_Show_Indicator_type"));
+        JPanel dotIndicatorShowTypePane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
+        addIndicatorShowTypeButton(dotIndicatorShowTypePane);
+
+        UILabel initColorLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Init_Fill"));
+        UILabel selectColor = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Select_Fill"));
+        initDotColorBox = new NewColorSelectBox(0){
+            @Override
+            protected void iniListener() {
+            }
+
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                super.mouseClicked(e);
+                this.attributeChange();
+            }
+        };
+        selectDotColorBox = new NewColorSelectBox(0){
+            @Override
+            protected void iniListener() {
+            }
+
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                super.mouseClicked(e);
+                this.attributeChange();
+            }
+        };
+        JPanel initDotColorPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{initColorLabel, initDotColorBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
+        JPanel selectDotColorPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{selectColor, selectDotColorBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
+
+        double[] rowSize = {TableLayout.PREFERRED, TableLayout.PREFERRED, TableLayout.PREFERRED};
+        double[] columnSize = {TableLayout.FILL};
+        int[][] rowCount = {{1}, {1}, {1}};
+        double[] verticalGaps = {10, 10, 10};
+        double[] dotSettingColumnSize = {TableLayout.PREFERRED, TableLayout.FILL};
+
+        Component[][] components = new Component[][]{
+                new Component[]{this.showTabTitleCheck},
+                new Component[]{this.tabSlideCheck},
+                new Component[]{this.showTabDotIndicatorCheck}
+        };
+
+        JPanel tabBaseConfigPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount,
+                IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L1);
+        tabBaseConfigPane.setBorder(BorderFactory.createEmptyBorder(0, 0, IntervalConstants.INTERVAL_L1, 0));
+
+        JPanel dotIndicatorSettingPanel = TableLayoutHelper.createDiffVGapTableLayoutPane(new JComponent[][]{
+                {label, dotIndicatorShowTypePane},
+                {initColorLabel, initDotColorPane},
+                {selectColor, selectDotColorPane}}, rowSize, dotSettingColumnSize, 0, verticalGaps);
+        dotIndicatorSettingPanel.setBorder(
+                BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1, 0)
+        );
+
+        final JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        jPanel.add(tabBaseConfigPane, BorderLayout.NORTH);
+        jPanel.add(dotIndicatorSettingPanel, BorderLayout.CENTER);
+
+        this.add(jPanel, BorderLayout.CENTER);
+
+        showTabDotIndicatorCheck.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                dotIndicatorSettingPanel.setVisible(showTabDotIndicatorCheck.isSelected());
+            }
+        });
+    }
+
+    public void populate(MobileTemplateStyle mobileTemplateStyle) {
+        this.showTabTitleCheck.setSelected(mobileTemplateStyle.isShowTabTitle());
+        this.showTabDotIndicatorCheck.setSelected(mobileTemplateStyle.isShowDotIndicator());
+        this.tabSlideCheck.setSelected(mobileTemplateStyle.canSlide());
+        Color initDotColor = mobileTemplateStyle.getIndicatorInitialColor();
+        Color selectDotColor = mobileTemplateStyle.getIndicatorSelectColor();
+        int dotIndicatorShowType = mobileTemplateStyle.getDotIndicatorShowType();
+        this.populateColorBox(initDotColorBox, initDotColor, MobileTemplateStyle.DEFAULT_INITIAL_DOT_COLOR);
+        this.populateColorBox(selectDotColorBox, selectDotColor, MobileTemplateStyle.DEFAULT_SELECT_DOT_COLOR);
+        if (dotIndicatorShowType != buttonGroup.getCurrentSelected()) {
+            this.buttonGroup.setSelectButton(dotIndicatorShowType);
+        }
+    }
+
+    public void update(MobileTemplateStyle mobileTemplateStyle) {
+        mobileTemplateStyle.setShowTabTitle(showTabTitleCheck.isSelected());
+        mobileTemplateStyle.setShowDotIndicator(showTabDotIndicatorCheck.isSelected());
+        mobileTemplateStyle.setCanSlide(tabSlideCheck.isSelected());
+        mobileTemplateStyle.setIndicatorInitialColor(initDotColorBox.getSelectObject());
+        mobileTemplateStyle.setIndicatorSelectColor(selectDotColorBox.getSelectObject());
+        mobileTemplateStyle.setDotIndicatorShowType(buttonGroup.getCurrentSelected());
+        WidgetPropertyPane.getInstance().getEditingFormDesigner().getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED);
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return "MobileTabCommonSettingPane";
+    }
+
+    private void addIndicatorShowTypeButton(JPanel dotIndicatorShowTypePane) {
+        UIRadioButton holderPlaceButton = new UIRadioButton(Toolkit.i18nText("Fine-Design_Mobile_Tab_Holder_Place"));
+        holderPlaceButton.setSelected(true);
+        UIRadioButton floatButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Tab_Float"));
+        dotIndicatorShowTypePane.add(holderPlaceButton);
+        dotIndicatorShowTypePane.add(floatButton);
+        dotIndicatorShowTypePane.setBorder(
+                BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L1, 0, 0)
+        );
+        buttonGroup = new ModeButtonGroup<>();
+        buttonGroup.put(MobileTemplateStyle.TYPE_PLACEHOLDER_DOT_INDICATOR, holderPlaceButton);
+        buttonGroup.put(MobileTemplateStyle.TYPE_FLOAT_DOT_INDICATOR, floatButton);
+    }
+
+    private void populateColorBox(NewColorSelectBox colorBox, Color color, Color defaultColor) {
+        if (color == null) {
+            color = defaultColor;
+        }
+        if (color != colorBox.getSelectObject()) {
+            colorBox.setSelectObject(color);
+        }
+    }
+}

designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@@ -456,12 +456,17 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
             grid.setHorizontalExtent(GridUtils.getExtentValue(0, columnWidthList, grid.getWidth(), resolution));
             elementCasePane.getGrid().updateUI();
             //更新Column和Row
-            ((DynamicScrollBar) elementCasePane.getVerticalScrollBar()).setDpi(resolution);
+            DynamicScrollBar verticalScrollBar = (DynamicScrollBar) elementCasePane.getVerticalScrollBar();
-            ((DynamicScrollBar) elementCasePane.getHorizontalScrollBar()).setDpi(resolution);
+            DynamicScrollBar horizontalScrollBar = (DynamicScrollBar) elementCasePane.getHorizontalScrollBar();
+            verticalScrollBar.setDpi(resolution);
+            horizontalScrollBar.setDpi(resolution);
             elementCasePane.getGridColumn().setResolution(resolution);
             elementCasePane.getGridColumn().updateUI();
             elementCasePane.getGridRow().setResolution(resolution);
             elementCasePane.getGridRow().updateUI();
+            //Yvan:更新滚动条值(主要是为了重置滚动条里的BoundedRangeModel的extent值)，使之随着界面缩放
+            verticalScrollBar.setValue(verticalScrollBar.getValue());
+            horizontalScrollBar.setValue(horizontalScrollBar.getValue());
         }
         if (polyDezi != null) {
             polyDezi.setResolution(resolution);

designer-realize/src/main/java/com/fr/design/mainframe/ReportComponentComposite.java

@@ -119,7 +119,8 @@ public class ReportComponentComposite extends JComponent implements RemoveListen
                 templateStateList.add(null);
             }
             centerCardPane.editingComponet.setSelection(centerCardPane.editingComponet.getDefaultSelectElement());
-            jSliderContainer = JFormSliderPane.getInstance();
+            // Yvan: REPORT-37950 普通报表-多sheet-报表块缩放失效
+            //jSliderContainer = JFormSliderPane.getInstance();
         }
 
         if (centerCardPane.editingComponet.elementCasePane == null) {

designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java

@@ -199,7 +199,7 @@ public class UserInfoLabel extends UILabel {
         this.addMouseListener(userInfoAdapter);
         this.setHorizontalAlignment(SwingConstants.CENTER);
 
-        if (StableUtils.getMajorJavaVersion() == VERSION_8) {
+        if (StableUtils.getMajorJavaVersion() >= VERSION_8) {
             LoginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
             PluginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
         }

designer-realize/src/main/java/com/fr/design/parameter/ParameterDefinitePane.java

@@ -95,7 +95,8 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
         setComponentBg(this);
         paraDesignEditor = DesignModuleFactory.getFormParaDesigner();
         if (paraDesignEditor == null) {
-            return;
+            // 为空时 设置默认值
+            paraDesignEditor = new FormParaDesigner();
         }
         paraDesignEditor.initWidgetToolbarPane();
 

designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java

@@ -12,19 +12,12 @@ import com.fr.design.gui.itooltip.MultiLineToolTip;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.dnd.SerializableTransferable;
-import com.fr.log.FineLoggerFactory;
 import com.fr.report.poly.PolyECBlock;
-import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
 
 import javax.swing.BorderFactory;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
 import javax.swing.JToolBar;
 import javax.swing.JToolTip;
 import javax.swing.SwingConstants;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.datatransfer.Transferable;
 import java.awt.dnd.DnDConstants;
@@ -147,25 +140,4 @@ public class PolyComponentsBar extends JToolBar {
         }
     }
 
-    /**
-     * 测试下
-     *
-     * @param args 参数
-     */
-    public static void main(String... args) {
-        try {
-            UIManager.setLookAndFeel(new WindowsLookAndFeel());
-        } catch (UnsupportedLookAndFeelException e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-        }
-        JFrame f = new JFrame();
-        JPanel p = (JPanel) f.getContentPane();
-        p.setLayout(FRGUIPaneFactory.createBorderLayout());
-        PolyComponentsBar pbp = new PolyComponentsBar();
-        p.add(pbp, BorderLayout.CENTER);
-
-        f.setSize(400, 300);
-        f.setVisible(true);
-
-    }
 }

designer-realize/src/main/java/com/fr/start/DesignerJavaRuntime.java

@@ -44,6 +44,7 @@ public class DesignerJavaRuntime extends AbstractJavaRuntime {
     private static final String DOCK_NAME_OPTIONS = "-Xdock:name=" + FineDesigner.class.getSimpleName();
     private static final String WIN_VM_OPTIONS_PATH =  StableUtils.pathJoin(BIN_HOME, "designer.vmoptions");
     private static final String[] DEBUG_OPTIONS = new String[]{"-Dfile.encoding=UTF-8", "-Xmx2048m"};
+    private static final String WIN_SERVER_PATH = "../server/lib";
 
     static {
         try {
@@ -110,7 +111,7 @@ public class DesignerJavaRuntime extends AbstractJavaRuntime {
         if (isInstallVersion()) {
             String[] options = super.getJvmOptions();
             // win下环境变量 存在错误的设置会导致问题 直接读vmoptions
-            if (SupportOSImpl.VM_OPTIONS_ADAPTER.support()) {
+            if (SupportOSImpl.VM_OPTIONS_ADAPTER.support() && !getClassPath().contains(WIN_SERVER_PATH)) {
                 List<String> optionList = new ArrayList<>();
                 try (BufferedReader reader = new BufferedReader(new FileReader(new File(WIN_VM_OPTIONS_PATH)))) {
                     String option = null;

designer-realize/src/main/java/com/fr/start/fx/FastGifImage.java

@@ -1,208 +0,0 @@
-package com.fr.start.fx;
-
-import com.sun.imageio.plugins.gif.GIFImageReader;
-import com.sun.imageio.plugins.gif.GIFImageReaderSpi;
-import com.sun.javafx.tk.ImageLoader;
-import com.sun.javafx.tk.PlatformImage;
-import javafx.animation.KeyFrame;
-import javafx.animation.Timeline;
-import javafx.event.Event;
-import javafx.event.EventHandler;
-import javafx.scene.image.WritableImage;
-import javafx.util.Duration;
-
-import javax.imageio.stream.FileImageInputStream;
-import java.io.File;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.regex.Pattern;
-
-/**
- * 边加载边播放的gif加载器
- *
- * @author daniel
- */
-public class FastGifImage extends WritableImage {
-    private String url;
-    private int gifCount;
-
-    public FastGifImage(String url, int w, int h) {
-        super(w, h);
-        this.url = validateUrl(url);
-        seekCount();
-        initialize();
-    }
-
-    /**
-     * 给出gif帧数，加快加载速度
-     *
-     * @param url      gif url
-     * @param gifCount gif帧数
-     * @param w        宽
-     * @param h        高
-     */
-    public FastGifImage(String url, int gifCount, int w, int h) {
-        super(w, h);
-        this.url = validateUrl(url);
-        this.gifCount = gifCount;
-        initialize();
-    }
-
-    private void seekCount() {
-        try {
-            GIFImageReaderSpi spi = new GIFImageReaderSpi();
-            GIFImageReader gifReader = (GIFImageReader) spi.createReaderInstance();
-            gifReader.setInput(new FileImageInputStream(new File(new URI(url))));
-            gifCount = gifReader.getNumImages(true);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private static final Pattern URL_QUICKMATCH = Pattern.compile("^\\p{Alpha}[\\p{Alnum}+.-]*:.*$");
-
-    private static String validateUrl(final String url) {
-        if (url == null) {
-            throw new NullPointerException("URL must not be null");
-        }
-
-        if (url.trim().isEmpty()) {
-            throw new IllegalArgumentException("URL must not be empty");
-        }
-
-        try {
-            if (!URL_QUICKMATCH.matcher(url).matches()) {
-                final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-                URL resource;
-                if (url.charAt(0) == '/') {
-                    resource = contextClassLoader.getResource(url.substring(1));
-                } else {
-                    resource = contextClassLoader.getResource(url);
-                }
-                if (resource == null) {
-                    throw new IllegalArgumentException("Invalid URL or resource not found");
-                }
-                return resource.toString();
-            }
-            // Use URL constructor for validation
-            return new URL(url).toString();
-        } catch (final IllegalArgumentException e) {
-            throw new IllegalArgumentException("Invalid URL" + e.getMessage());
-        } catch (final MalformedURLException e) {
-            throw new IllegalArgumentException("Invalid URL" + e.getMessage());
-        }
-    }
-
-    private void finishImage(ImageLoader loader) {
-        initializeAnimatedImage(loader);
-    }
-
-    // Generates the animation Timeline for multiframe images.
-    private void initializeAnimatedImage(ImageLoader loader) {
-
-        animation = new Animation(this, loader);
-        animation.start();
-    }
-
-    // Support for animated images.
-    private Animation animation;
-
-    private static final class Animation {
-        final WeakReference<FastGifImage> imageRef;
-        final Timeline timeline;
-        private ImageLoader loader;
-
-        public Animation(final FastGifImage image, final ImageLoader loader) {
-            this.loader = loader;
-            imageRef = new WeakReference<FastGifImage>(image);
-            timeline = new Timeline();
-            timeline.setCycleCount(Timeline.INDEFINITE);
-
-            final int frameCount = loader.getFrameCount();
-            int duration = 0;
-
-            for (int i = 0; i < frameCount; ++i) {
-                addKeyFrame(i, duration);
-                duration = duration + loader.getFrameDelay(i);
-            }
-
-            // Note: we need one extra frame in the timeline to define how long
-            // the last frame is shown, the wrap around is "instantaneous"
-            addKeyFrame(0, duration);
-        }
-
-        public void start() {
-            timeline.play();
-        }
-
-        public void stop() {
-            timeline.stop();
-            loader = null;
-        }
-
-        private void updateImage(final int frameIndex) {
-            final FastGifImage image = imageRef.get();
-            if (image != null) {
-                image.setPlatformImagePropertyImpl(
-                        loader.getFrame(frameIndex));
-            } else {
-                timeline.stop();
-            }
-        }
-
-        private void addKeyFrame(final int index, final double duration) {
-            timeline.getKeyFrames().add(
-                    new KeyFrame(Duration.millis(duration),
-                            new EventHandler() {
-                                @Override
-                                public void handle(Event event) {
-                                    updateImage(index);
-                                }
-                            }
-                    ));
-        }
-    }
-
-    private static Method method;
-
-    static {
-        try {
-            method = FastGifImage.class.getSuperclass().getSuperclass().getDeclaredMethod("platformImagePropertyImpl");
-            method.setAccessible(true);
-        } catch (Exception e) {
-
-        }
-    }
-
-    private void setPlatformImagePropertyImpl(PlatformImage image) {
-        try {
-            Object o = method.invoke(this);
-            Method method = o.getClass().getDeclaredMethod("set", Object.class);
-            method.setAccessible(true);
-            method.invoke(o, image);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (InvocationTargetException e) {
-            e.printStackTrace();
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-    }
-
-
-    private void initialize() {
-        finishImage(new PrismImageLoader2(url, gifCount, (int) getRequestedWidth(), (int) getRequestedHeight(), isPreserveRatio(), isSmooth()));
-    }
-
-    /**
-     * 销毁gif动画
-     */
-    public void destroy() {
-        animation.stop();
-    }
-
-}

designer-realize/src/main/java/com/fr/start/fx/PrismImageLoader2.java

@@ -1,208 +0,0 @@
-package com.fr.start.fx;
-
-import com.fr.concurrent.NamedThreadFactory;
-import com.fr.log.FineLoggerFactory;
-import com.sun.javafx.iio.ImageFrame;
-import com.sun.javafx.iio.ImageLoadListener;
-import com.sun.javafx.iio.ImageLoader;
-import com.sun.javafx.iio.ImageMetadata;
-import com.sun.javafx.iio.ImageStorageException;
-import com.sun.javafx.iio.common.ImageTools;
-import com.sun.javafx.iio.gif.GIFImageLoaderFactory;
-import com.sun.javafx.tk.PlatformImage;
-import com.sun.prism.Image;
-import com.sun.prism.impl.PrismSettings;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-/**
- * 边加载边播放的gif加载器
- *
- * @author daniel
- */
-class PrismImageLoader2 implements com.sun.javafx.tk.ImageLoader {
-
-    private Image[] images;
-    private int[] delayTimes;
-    private int width;
-    private int height;
-    private int gifCount = 1;
-    private Exception exception;
-
-    public PrismImageLoader2(final String url, int gifCount, final int width, final int height,
-                             final boolean preserveRatio, final boolean smooth) {
-        this.gifCount = gifCount;
-        images = new Image[gifCount];
-        delayTimes = new int[gifCount];
-        this.width = width;
-        this.height = height;
-        ExecutorService es = Executors.newSingleThreadExecutor(new NamedThreadFactory("PrismImageLoader2"));
-        es.execute(new Runnable() {
-            @Override
-            public void run() {
-                InputStream inputStream = null;
-                try {
-                    inputStream = ImageTools.createInputStream(url);
-                    loadAll(inputStream, width, height, preserveRatio, smooth);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                } finally {
-                    try {
-                        if (inputStream != null) {
-                            inputStream.close();
-                        }
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-        });
-        es.shutdown();
-    }
-
-    @Override
-    public int getWidth() {
-        return width;
-    }
-
-    @Override
-    public int getHeight() {
-        return height;
-    }
-
-    @Override
-    public int getFrameCount() {
-        return gifCount;
-    }
-
-    @Override
-    @SuppressWarnings("squid:S2142")
-    public PlatformImage getFrame(int index) {
-        while (images[index] == null) {
-            synchronized (this) {
-                if (images[index] == null) {
-                    try {
-                        this.wait();
-                    } catch (InterruptedException e) {
-                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
-                    }
-                }
-            }
-        }
-        return images[index];
-    }
-
-
-    @Override
-    public int getFrameDelay(int index) {
-//        while (images[0] == null) {
-//            synchronized (this) {
-//                if(images[0] == null) {
-//                    try {
-//                        this.wait();
-//                    } catch (InterruptedException e) {
-//                        e.printStackTrace();
-//                    }
-//                }
-//            }
-//            return 0;
-//        }
-//        return delayTimes[0];
-        // 直接使用第一帧的时间
-        return 40;
-    }
-
-    @Override
-    public int getLoopCount() {
-        return 0;
-    }
-
-    @Override
-    public Exception getException() {
-        return exception;
-    }
-
-
-    @SuppressWarnings("squid:S244")
-    private void loadAll(InputStream stream, int w, int h,
-                         boolean preserveRatio, boolean smooth) {
-        ImageLoadListener listener = new PrismLoadListener();
-
-        try {
-            ImageLoader loader = null;
-            loader = GIFImageLoaderFactory.getInstance().createImageLoader(stream);
-            loader.addListener(listener);
-
-            for (int i = 0; i < gifCount; i++) {
-                ImageFrame imageFrame = loader.load(i, w, h, preserveRatio, smooth);
-                images[i] = convert(imageFrame);
-                synchronized (this) {
-                    notifyAll();
-                }
-            }
-        } catch (ImageStorageException e) {
-            handleException(e);
-        } catch (Exception e) {
-            handleException(e);
-        }
-    }
-
-    private void handleException(final ImageStorageException isException) {
-        // unwrap ImageStorageException if possible
-        final Throwable exceptionCause = isException.getCause();
-        if (exceptionCause instanceof Exception) {
-            handleException((Exception) exceptionCause);
-        } else {
-            handleException((Exception) isException);
-        }
-    }
-
-    private void handleException(final Exception exception) {
-        if (PrismSettings.verbose) {
-            exception.printStackTrace(System.err);
-        }
-        this.exception = exception;
-    }
-
-    private Image convert(ImageFrame imgFrames) {
-        ImageFrame frame = imgFrames;
-        Image image = Image.convertImageFrame(frame);
-        ImageMetadata metadata = frame.getMetadata();
-        if (metadata != null) {
-            Integer delay = metadata.delayTime;
-            if (delay != null) {
-                delayTimes[0] = delay.intValue();
-            }
-        }
-        return image;
-    }
-
-
-    private class PrismLoadListener implements ImageLoadListener {
-        @Override
-        public void imageLoadWarning(ImageLoader loader, String message) {
-
-        }
-
-        @Override
-        public void imageLoadProgress(ImageLoader loader,
-                                      float percentageComplete) {
-            // progress only matters when backgroundLoading=true, but
-            // currently we are relying on AbstractRemoteResource for tracking
-            // progress of the InputStream, so there's no need to implement
-            // this for now; eventually though we might want to consider
-            // moving away from AbstractRemoteResource and instead use
-            // the built-in support for progress in the javafx-iio library...
-        }
-
-        @Override
-        public void imageLoadMetaData(ImageLoader loader, ImageMetadata metadata) {
-            // We currently have no need to listen for ImageMetadata ready.
-        }
-    }
-
-}