Merge remote-tracking branch 'origin/feature/x' into feature/x

build.gradle

@@ -60,10 +60,10 @@ allprojects {
         implementation 'com.fr.third:jxbrowser:6.23'
         implementation 'com.fr.third:jxbrowser-mac:6.23'
         implementation 'com.fr.third:jxbrowser-win64:6.23'
-        implementation 'com.fr.third:jxbrowser-v7:7.5'
+        implementation 'com.fr.third:jxbrowser-v7:7.7'
-        implementation 'com.fr.third:jxbrowser-mac-v7:7.5'
+        implementation 'com.fr.third:jxbrowser-mac-v7:7.7'
-        implementation 'com.fr.third:jxbrowser-win64-v7:7.5'
+        implementation 'com.fr.third:jxbrowser-win64-v7:7.7'
-        implementation 'com.fr.third:jxbrowser-swing:7.5'
+        implementation 'com.fr.third:jxbrowser-swing-v7:7.7'
         implementation 'com.fr.third.server:servlet-api:3.0'
         implementation 'org.swingexplorer:swexpl:2.0.1'
         implementation 'org.swingexplorer:swag:1.0'

designer-base/src/main/java/com/fr/design/border/UIRoundedBorder.java

@@ -1,32 +1,33 @@
 package com.fr.design.border;
 
 import com.fr.base.GraphHelper;
+import com.fr.stable.GraphDrawHelper;
 
 import javax.swing.border.LineBorder;
-import java.awt.Color;
+import java.awt.*;
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
 import java.awt.geom.RoundRectangle2D;
 
 public class UIRoundedBorder extends LineBorder {
 
 	private static final long serialVersionUID = 1L;
 
+	private BasicStroke stroke4Thickness;
 	private int roundedCorner;
 	private int lineStyle;
 
 	public UIRoundedBorder(Color color) {
 		super(color);
+		this.stroke4Thickness = new BasicStroke(thickness, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER);
 	}
 
 	public UIRoundedBorder(Color color, int thickness){
 		super(color, thickness);
+		this.stroke4Thickness = new BasicStroke(thickness, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER);
 	}
 
 	public UIRoundedBorder(Color color, int thickness, int roundedCorners){
 		super(color, thickness, true);
+		this.stroke4Thickness = new BasicStroke(thickness, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER);
 		this.roundedCorner = roundedCorners;
 	}
 
@@ -51,7 +52,19 @@ public class UIRoundedBorder extends LineBorder {
         Graphics2D g2d = (Graphics2D)g;
         g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         g2d.setColor(lineColor);
-		GraphHelper.draw(g2d, new RoundRectangle2D.Double(x, y, width - 1.0D, height - 1.0D, roundedCorner, roundedCorner), lineStyle);
+
+        Shape shape = new RoundRectangle2D.Double(x, y, width - 1.0D, height - 1.0D, roundedCorner, roundedCorner);
+
+        if (stroke4Thickness != null) {
+			Stroke oldStroke = g2d.getStroke();
+			g2d.setStroke(stroke4Thickness);
+			g2d.draw(shape);
+
+			g2d.setStroke(oldStroke);
+		} else {
+			GraphHelper.draw(g2d, shape, lineStyle);
+		}
+
         g2d.setColor(oldColor);
         g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
 	}

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

@@ -1,8 +1,9 @@
 package com.fr.design.data.datapane.connect;
 
+import com.fr.base.GraphHelper;
 import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.pool.DBCPConnectionPoolAttr;
-import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.editor.editor.IntegerEditor;
 import com.fr.design.gui.icombobox.UIComboBox;
@@ -12,14 +13,36 @@ 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 java.awt.BorderLayout;
+import com.fr.general.ComparatorUtils;
-import java.awt.Component;
+import com.fr.stable.StringUtils;
-import javax.swing.BorderFactory;
+
 import javax.swing.JPanel;
+import javax.swing.JTextField;
 import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Window;
+import java.awt.event.InputMethodEvent;
+import java.awt.event.InputMethodListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class DBCPAttrPane extends BasicPane {
     public static final int TIME_MULTIPLE = 1000;
+    private static final Pattern FETCHSIZE_PATTERN = Pattern.compile("^0$|^[1-9][\\d]*[\\d]*$");;
+    private static final Pattern CHAR_NEED_ESCAPE = Pattern.compile("[?|$^*\\\\\\[\\](){}.+]");
+    private static final int MAX_FETCHSIZE = 1000000;
+    private static final Map<String, Integer> DEFAULT_FETCHSIZE_MAP = new HashMap<>();
+    private static final int ORACLE_DEFAULT_FETCHSIZE = 128;
+    private static final int DB2_DEFAULT_FETCHSIZE = 50;
+    private static final int POSTGRE_DEFAULT_FETCHSIZE = 10000;
+    private static final int EMPTY_FETCHSIZE = -2;
     // carl:DBCP的一些属性
     private IntegerEditor DBCP_INITIAL_SIZE = new IntegerEditor();
     private IntegerEditor DBCP_MAX_ACTIVE = new IntegerEditor();
@@ -36,11 +59,24 @@ public class DBCPAttrPane extends BasicPane {
     private IntegerEditor DBCP_NUMTESTSPEREVICTIONRUN = new IntegerEditor();
     private IntegerEditor DBCP_MINEVICTABLEIDLETIMEMILLIS = new IntegerEditor();
 
+    private UITextField FETCHSIZE = new UITextField();
+
+    private JPanel defaultPane;
+    private JPanel northFlowPane;
+    private JPanel southFlowPane;
+
+    static {
+        DEFAULT_FETCHSIZE_MAP.put("Oracle", ORACLE_DEFAULT_FETCHSIZE);
+        DEFAULT_FETCHSIZE_MAP.put("DB2", DB2_DEFAULT_FETCHSIZE);
+        DEFAULT_FETCHSIZE_MAP.put("Postgre", POSTGRE_DEFAULT_FETCHSIZE);
+    }
+
     public DBCPAttrPane() {
-        JPanel defaultPane = this;
+        defaultPane = this;
 
         // JPanel northFlowPane
-        JPanel northFlowPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
+        northFlowPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr"));
+        northFlowPane.setPreferredSize(new Dimension(630, 320));
         defaultPane.add(northFlowPane, BorderLayout.NORTH);
 
         DBCP_VALIDATION_QUERY.setColumns(15);
@@ -67,7 +103,6 @@ public class DBCPAttrPane extends BasicPane {
                         DBCP_MINEVICTABLEIDLETIMEMILLIS}};
 
         JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSize, columnSize, 10, 4);
-        contextPane.setBorder(BorderFactory.createMatteBorder(1, 1, 1, 1, UIConstants.LINE_COLOR));
         northFlowPane.add(contextPane);
     }
 
@@ -89,6 +124,14 @@ public class DBCPAttrPane extends BasicPane {
         this.DBCP_MINEVICTABLEIDLETIMEMILLIS.setValue(dbcpAttr.getMinEvictableIdleTimeMillis() / TIME_MULTIPLE);
         this.DBCP_NUMTESTSPEREVICTIONRUN.setValue(dbcpAttr.getNumTestsPerEvictionRun());
         this.DBCP_TIMEBETWEENEVICTIONRUNSMILLS.setValue(dbcpAttr.getTimeBetweenEvictionRunsMillis());
+        Integer fetchSize = DEFAULT_FETCHSIZE_MAP.get(JDBCConnectionDef.getInstance().getDatabaseName());
+        if (fetchSize != null) {
+            if (jdbcDatabase.getFetchSize() == EMPTY_FETCHSIZE) {
+                this.FETCHSIZE.setText(StringUtils.EMPTY);
+            } else {
+                this.FETCHSIZE.setText(jdbcDatabase.getFetchSize() == -1 ? String.valueOf(fetchSize) : String.valueOf(jdbcDatabase.getFetchSize()));
+            }
+        }
     }
 
     public void update(JDBCDatabaseConnection jdbcDatabase) {
@@ -109,10 +152,98 @@ public class DBCPAttrPane extends BasicPane {
         dbcpAttr.setMinEvictableIdleTimeMillis(((Number) this.DBCP_MINEVICTABLEIDLETIMEMILLIS.getValue()).intValue() * TIME_MULTIPLE);
         dbcpAttr.setNumTestsPerEvictionRun(((Number) this.DBCP_NUMTESTSPEREVICTIONRUN.getValue()).intValue());
         dbcpAttr.setTimeBetweenEvictionRunsMillis(((Number) this.DBCP_TIMEBETWEENEVICTIONRUNSMILLS.getValue()).intValue());
+        Integer fetchSize = DEFAULT_FETCHSIZE_MAP.get(JDBCConnectionDef.getInstance().getDatabaseName());
+        if (fetchSize != null) {
+            if (StringUtils.isEmpty(this.FETCHSIZE.getText())) {
+                jdbcDatabase.setFetchSize(EMPTY_FETCHSIZE);
+            } else {
+                jdbcDatabase.setFetchSize(Integer.parseInt(this.FETCHSIZE.getText()));
+            }
+        }
+    }
+
+    @Override
+    public BasicDialog showWindow(Window window) {
+        String databaseName = JDBCConnectionDef.getInstance().getDatabaseName();
+        if (showOtherConfig(databaseName)) {
+            southFlowPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Report_Other"));
+            southFlowPane.setPreferredSize(new Dimension(630, 200));
+            double f = TableLayout.FILL;
+            double[] rowSize = {f};
+            double otherColumnSize = GraphHelper.getWidth(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Evictionruns_millis")) + 6;
+            double[] columnSize = {otherColumnSize, otherColumnSize};
+            FETCHSIZE.addKeyListener(fetchSizeKeyListener);
+            FETCHSIZE.addInputMethodListener(fetchSizeInputMethodListener);
+            FETCHSIZE.setHorizontalAlignment(JTextField.RIGHT);
+            Component[][] comps = {
+                    {new UILabel("Fetchsize:", SwingConstants.RIGHT), FETCHSIZE}
+            };
+            JPanel otherConfigPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSize, columnSize, 10, 4);
+            southFlowPane.add(otherConfigPane);
+
+            defaultPane.removeAll();
+            defaultPane.add(northFlowPane, BorderLayout.NORTH);
+            defaultPane.add(southFlowPane, BorderLayout.SOUTH);
+        } else {
+            if (southFlowPane != null) {
+                defaultPane.remove(southFlowPane);
+            }
+        }
+        return this.showWindow(window, null);
+    }
+
+    private boolean showOtherConfig(Object dbType) {
+        return ComparatorUtils.equals(dbType, "Oracle") || ComparatorUtils.equals(dbType, "DB2") || ComparatorUtils.equals(dbType, "Postgre");
+    }
+
+    KeyListener fetchSizeKeyListener = new KeyAdapter() {
+        @Override
+        public void keyReleased(KeyEvent e) {
+            String fetchSize = FETCHSIZE.getText();
+            if (!isFetchSizeValid(fetchSize)) {
+                FETCHSIZE.setText(fetchSize.replaceAll(getCharNeedReplace(e.getKeyChar()), ""));
+                if (!isFetchSizeValid(FETCHSIZE.getText())) {
+                    FETCHSIZE.setText(StringUtils.EMPTY);
+                }
+            } else if (FETCHSIZE.getText().length() > String.valueOf(MAX_FETCHSIZE).length() || Long.parseLong(FETCHSIZE.getText()) > MAX_FETCHSIZE) {
+                FETCHSIZE.setText(String.valueOf(MAX_FETCHSIZE));
+            }
+        }
+    };
+
+    InputMethodListener fetchSizeInputMethodListener = new InputMethodListener() {
+        @Override
+        public void inputMethodTextChanged(InputMethodEvent event) {
+            if (null == event.getText()) {
+                return;
+            }
+            char ch = event.getText().current();
+            if (!(ch >= '0' && ch <= '9')) {
+                event.consume();
+            }
+        }
+
+        @Override
+        public void caretPositionChanged(InputMethodEvent event) {
+
+        }
+    };
+
+    private boolean isFetchSizeValid(String fetchSize) {
+        return FETCHSIZE_PATTERN.matcher(fetchSize).find();
+    }
+
+    private String getCharNeedReplace(char c) {
+        String charNeedReplace = c + "";
+        Matcher matcher = CHAR_NEED_ESCAPE.matcher(charNeedReplace);
+        if (matcher.find()) {
+            charNeedReplace = "\\" + charNeedReplace;
+        }
+        return charNeedReplace;
     }
 
     @Override
     protected String title4PopupWindow() {
-        return Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr");
+        return Toolkit.i18nText("Fine-Design_Basic_Advanced_Setup");
     }
 }

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

@@ -12,7 +12,6 @@ import com.fr.data.solution.entity.DriverPage;
 import com.fr.data.solution.processor.ClassNotFoundExceptionSolutionProcessor;
 import com.fr.data.solution.processor.SolutionProcessor;
 import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.ActionLabel;
@@ -338,7 +337,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
                 Toolkit.i18nText("Fine-Design_Basic_Advanced")
         ));
         if (mainPanel instanceof JDBCDefPane) {
-            ActionLabel actionLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr"));
+            ActionLabel actionLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Basic_Advanced_Setup"));
             actionLabel.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent evt) {
                     JDialog wDialog = createJDialog();
@@ -418,7 +417,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
             return false;
         }
 
-        protected static BasicPane getAdvancedAttrPane() {
+        protected static DBCPAttrPane getAdvancedAttrPane() {
             return dbcpAttrPane;
         }
 

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

@@ -0,0 +1,47 @@
+package com.fr.design.data.datapane.connect;
+
+import com.fr.data.impl.JDBCDatabaseConnection;
+
+/**
+ *  JDBCDefPane和DBCPAttrPane沟通的桥梁
+ *
+ */
+public class JDBCConnectionDef {
+
+    private static volatile JDBCConnectionDef instance;
+
+    private String databaseName;
+    private JDBCDatabaseConnection connection;
+
+    public static JDBCConnectionDef getInstance() {
+        if (instance == null) {
+            synchronized (JDBCConnectionDef.class) {
+                if (instance == null) {
+                    instance = new JDBCConnectionDef();
+                }
+            }
+        }
+        return instance;
+    }
+
+    private JDBCConnectionDef() {
+
+    }
+
+    public String getDatabaseName() {
+        return databaseName;
+    }
+
+    public void setDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+    }
+
+    public JDBCDatabaseConnection getConnection() {
+        return connection;
+    }
+
+    public void setConnection(String databaseName, JDBCDatabaseConnection connection) {
+        this.databaseName = databaseName;
+        this.connection = connection;
+    }
+}

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

@@ -330,6 +330,8 @@ public class JDBCDefPane extends JPanel {
                 jdbcDatabase.setDatabase(StringUtils.EMPTY);
             }
             changePane(dbtypeComboBox.getSelectedItem());
+            JDBCConnectionDef.getInstance().setConnection((String) dbtypeComboBox.getSelectedItem(), jdbcDatabase);
+            DatabaseConnectionPane.JDBC.getAdvancedAttrPane().populate(jdbcDatabase);
         }
     };
 

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

@@ -26,6 +26,7 @@ import com.fr.design.gui.itableeditorpane.UITableEditorPane;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.gui.itoolbar.UIToolbar;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
@@ -612,7 +613,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
 
     private void setTextField(FileTableData ob) {
         if (ob.getFilePath() != null) {
-            if (ob.getFilePath().indexOf("http") != -1) {
+            if (ob.getFilePath().contains("http")) {
                 urlRadioSelectAction();
                 urlText.setText(ob.getFilePath());
             } else {
@@ -625,6 +626,15 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
     @Override
     public FileTableData updateBean() {
         String filePath = getFilePathFromUrlOrLocal();
+        // 安全要求禁止 file 协议访问本地磁盘
+        if (FileTableData.isInvalidFilePath(filePath)) {
+            FineJOptionPane.showMessageDialog(this,
+                    Toolkit.i18nText("Fine-Design_File_Table_Data_Path_Invalid"),
+                    Toolkit.i18nText("Fine-Design_Basic_Widget_Error_Tip"),
+                    JOptionPane.ERROR_MESSAGE);
+            // 阻止对话框关闭
+            throw new RuntimeException(Toolkit.i18nText("Fine-Design_File_Table_Data_Path_Invalid"));
+        }
         if (StringUtils.isNotBlank(filePath)) {
             this.params = getEditorPaneParameter().length == 0 ? null : getEditorPaneParameter();
             if (fileTypeComboBox.getSelectedIndex() == EXCEL) {
@@ -786,6 +796,14 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         if (this.fileTableData == null) {
             return;
         }
+        String filePath = getFilePathFromUrlOrLocal();
+        if (FileTableData.isInvalidFilePath(filePath)) {
+            FineJOptionPane.showMessageDialog(this,
+                    Toolkit.i18nText("Fine-Design_File_Table_Data_Path_Invalid"),
+                    Toolkit.i18nText("Fine-Design_Basic_Widget_Error_Tip"),
+                    JOptionPane.ERROR_MESSAGE);
+            return;
+        }
         PreviewTablePane.previewTableData(this.updateBean());
     }
 
@@ -802,7 +820,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
             xmlNodeTree = new XMLNodeTree();
             this.add(new JScrollPane(xmlNodeTree));
 
-            keyPointLaber = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Key_Point") + ":");
+            keyPointLaber = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Key_Point") + ":");
             refreshAction = new RefreshParameterAction();
             ToolBarDef toolbarDef = new ToolBarDef();
             toolbarDef.addShortCut(refreshAction);
@@ -820,7 +838,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
 
         private class RefreshParameterAction extends UpdateAction {
             public RefreshParameterAction() {
-                this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh"));
+                this.setName(Toolkit.i18nText("Fine-Design_Basic_Refresh"));
                 this.setMnemonic('r');
                 this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
             }

designer-base/src/main/java/com/fr/design/editor/editor/Editor.java

@@ -4,6 +4,7 @@
 package com.fr.design.editor.editor;
 
 import com.fr.base.BaseUtils;
+import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -34,6 +35,9 @@ public abstract class Editor<T> extends JComponent {
 	// 约定图片的文件名为this.getName(),处理起来方便些
 	// b:这里国际化没有考虑
 	public Icon getIcon() {
+		if (StringUtils.isEmpty(this.getIconName())) {
+			return null;
+		}
 		String iconName = "com/fr/design/images/buttonicon/" + this.getIconName() + ".png";
 		try {
 			return BaseUtils.readIcon(iconName);

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

@@ -1,5 +0,0 @@
-package com.fr.design.file;
-
-public interface Releasable {
-    void releaseResources();
-}

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

@@ -0,0 +1,30 @@
+package com.fr.design.gui.frpane;
+
+import com.fr.design.gui.ilable.UILabel;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * @author Starryi
+ * @version 10.0.18
+ * Created by Starryi on 2021/7/3
+ */
+public class UIPercentDragPane extends JPanel {
+
+    private final UINumberDragPane dragPane = new UINumberDragPane(0, 100, 1);
+
+    public UIPercentDragPane() {
+        setLayout(new BorderLayout());
+        add(dragPane, BorderLayout.CENTER);
+        add(new UILabel(" %"), BorderLayout.EAST);
+    }
+
+    public void populateBean(double value) {
+        dragPane.populateBean(value * 100);
+    }
+
+    public double updateBean() {
+        return dragPane.updateBean() / 100.0;
+    }
+}

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

@@ -3,22 +3,14 @@
  */
 package com.fr.design.gui.icombobox;
 
-import com.fr.base.FRContext;
 import com.fr.base.GraphHelper;
-import com.fr.base.ScreenResolution;
-import com.fr.general.FRFont;
 import com.fr.stable.Constants;
-import java.awt.Component;
+import com.fr.stable.StringUtils;
-import java.awt.Dimension;
+
-import java.awt.Font;
+import javax.swing.*;
-import java.awt.FontMetrics;
+import java.awt.*;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.Point2D;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JLabel;
-import javax.swing.JList;
 
 
 /**
@@ -59,6 +51,13 @@ public class LineComboBox extends UIComboBox {
     	this.setSelectedItem(new Integer(style));
     }
 
+    protected String toStringFromStyle(int style) {
+        if (style == Constants.LINE_NONE) {
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None");
+        }
+        return null;
+    }
+
     /**
      * CellRenderer.
      */
@@ -67,33 +66,29 @@ public class LineComboBox extends UIComboBox {
                 JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
         	JLabel comp= (JLabel)super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
             this.style = ((Integer) value).intValue();
+            String displayString = toStringFromStyle(style);
+            if (StringUtils.isNotEmpty(displayString)) {
+                comp.setText(" " + displayString);
+            } else {
                 comp.setText(null);
+            }
             return comp;
         }
 
         public void paint(Graphics g) {
         	super.paint(g);
+        	if (StringUtils.isEmpty(toStringFromStyle(style))) {
                 Graphics2D g2d = (Graphics2D) g;
 
                 Dimension d = getSize();
                 g2d.setColor(getForeground());
-            
-            FRFont font = FRContext.getDefaultValues().getFRFont();
-            int resolution = ScreenResolution.getScreenResolution();
-            Font rfont = font.applyResolutionNP(resolution);
-            g2d.setFont(rfont);
-            FontMetrics fm = GraphHelper.getFontMetrics(rfont);
-            if (style == Constants.LINE_NONE) {
-                //draw "none" string
-                GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"), 4, (d.height - fm.getHeight()) / 2D + fm.getAscent());
-            } else {
                 GraphHelper.drawLine(g2d, 4, d.height / 2D, d.width - 8D, d.height / 2D, style);
-            }
 
                 if(isShowAxisWithLineStyle()) { //  带有坐标轴箭头的样式.
                     drawArrow(g2d, new Point2D.Double(4, d.height / 2D), new Point2D.Double(d.width - 8D, d.height / 2D));
                 }
             }
+        }
         
         private void drawArrow(Graphics2D g2d, Point2D p0, Point2D p1) {
         	Point2D s = new Point2D.Double(p1.getX() - p0.getX(), p1.getY() - p0.getY());

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

@@ -70,6 +70,12 @@ public class UIPasswordFieldWithFixedLength extends UIPassWordField {
             public void mouseClicked(MouseEvent e) {
                 UIPasswordFieldWithFixedLength.this.clearPassword = true;
             }
+
+            @Override
+            public void mousePressed(MouseEvent e) {
+                // 防止拖动进入
+                UIPasswordFieldWithFixedLength.this.clearPassword = true;
+            }
         });
         this.addKeyListener(new KeyAdapter() {
             @Override

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

@@ -58,6 +58,7 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
      * Spinner内的数字文本框长度
      */
     private int numberFieldColumns;
+    private boolean hasTextFieldFocus = false;
 
     public UISpinner() {
 
@@ -318,7 +319,7 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
 
             @Override
             public void mouseWheelMoved(MouseWheelEvent e) {
-                if (isEnabled() && e.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL) {
+                if (hasTextFieldFocus && isEnabled() && e.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL) {
                     setValue(value - e.getWheelRotation());
                 }
             }
@@ -330,8 +331,14 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
         textField.getDocument().removeDocumentListener(docListener);
         textField.getDocument().addDocumentListener(docListener);
         textField.addFocusListener(new FocusAdapter() {
+            @Override
+            public void focusGained(FocusEvent e) {
+                hasTextFieldFocus = true;
+            }
+
             @Override
             public void focusLost(FocusEvent e) {
+                hasTextFieldFocus = false;
                 textField.getDocument().removeDocumentListener(docListener);
                 textField.setValue(value);
                 textField.getDocument().addDocumentListener(docListener);

designer-base/src/main/java/com/fr/design/gui/style/BackgroundPane.java

@@ -70,13 +70,13 @@ public class BackgroundPane extends AbstractBasicStylePane {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
-                new Component[]{null, null},
+                new Component[]{null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill") + "     ", SwingConstants.LEFT),typeComboBox},
+                new Component[]{typeComboBox},
-                new Component[]{null, centerPane}
+                new Component[]{centerPane}
         };
         double[] rowSize = {p, p, p};
-        double[] columnSize = {p,f};
+        double[] columnSize = {f};
-        int[][] rowCount = {{1, 1},{1, 1},{1, 1}};
+        int[][] rowCount = {{1},{1},{1}};
         JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_MEDIUM);
         this.add(panel, BorderLayout.CENTER);
 

designer-base/src/main/java/com/fr/design/gui/style/BackgroundSpecialPane.java

@@ -39,7 +39,7 @@ public class BackgroundSpecialPane extends BackgroundPane{
                 fireStateChanged();
             }
         });
-        GradientBackgroundQuickPane gradientPane = new GradientBackgroundQuickPane();
+        GradientBackgroundQuickPane gradientPane = createGradientBackgroundQuickPane();
         gradientPane.registerChangeListener(new UIObserverListener() {
             @Override
             public void doChange() {
@@ -68,4 +68,9 @@ public class BackgroundSpecialPane extends BackgroundPane{
 
         return kinds.toArray(new BackgroundQuickPane[kinds.size()]);
     }
+
+    protected GradientBackgroundQuickPane createGradientBackgroundQuickPane() {
+        // 使用默认的150宽度构建渐变条
+        return new GradientBackgroundQuickPane();
+    }
 }

designer-base/src/main/java/com/fr/design/locale/impl/BbsRegisterMark.java

@@ -16,8 +16,8 @@ import java.util.Map;
 public class BbsRegisterMark implements LocaleMark<String> {
 
     private final Map<Locale, String> map = new HashMap<>();
-    private static final String BBS_REGISTER_CN = CloudCenter.getInstance().acquireUrlByKind("bbs.register", "http://id.fanruan.com/register/register.php?clueSource=activityfr");
+    private static final String BBS_REGISTER_CN = CloudCenter.getInstance().acquireUrlByKind("bbs.register", "https://id.fanruan.com/register/register.php?clueSource=activityfr");
-    private static final String BBS_REGISTER_TW = CloudCenter.getInstance().acquireUrlByKind("bbs.register", "http://id.fanruan.com/register/register.php?clueSource=activityfr");
+    private static final String BBS_REGISTER_TW = CloudCenter.getInstance().acquireUrlByKind("bbs.register", "https://id.fanruan.com/register/register.php?clueSource=activityfr");
     private static final String BBS_REGISTER_EN = CloudCenter.getInstance().acquireUrlByKind("bbs.register.en_US", "https://id.fanruan.com/en/register/register.php");
     private static final String BBS_REGISTER_KR = CloudCenter.getInstance().acquireUrlByKind("bbs.register.en_US", "https://id.fanruan.com/en/register/register.php");
     private static final String BBS_REGISTER_JP = CloudCenter.getInstance().acquireUrlByKind("bbs.register.en_US", "https://id.fanruan.com/en/register/register.php");

designer-base/src/main/java/com/fr/design/locale/impl/BbsResetMark.java

@@ -16,8 +16,8 @@ import java.util.Map;
 public class BbsResetMark implements LocaleMark<String> {
 
     private final Map<Locale, String> map = new HashMap<>();
-    private static final String BBS_RESET_CN = CloudCenter.getInstance().acquireUrlByKind("bbs.reset", "http://id.fanruan.com/forget/forget.php?clue=activityfr");
+    private static final String BBS_RESET_CN = CloudCenter.getInstance().acquireUrlByKind("bbs.reset", "https://id.fanruan.com/forget/forget.php?clue=activityfr");
-    private static final String BBS_RESET_TW = CloudCenter.getInstance().acquireUrlByKind("bbs.reset", "http://id.fanruan.com/forget/forget.php?clue=activityfr");
+    private static final String BBS_RESET_TW = CloudCenter.getInstance().acquireUrlByKind("bbs.reset", "https://id.fanruan.com/forget/forget.php?clue=activityfr");
     private static final String BBS_RESET_EN = CloudCenter.getInstance().acquireUrlByKind("bbs.reset.en_US", "https://id.fanruan.com/en/forget/forget.php");
     private static final String BBS_RESET_KR = CloudCenter.getInstance().acquireUrlByKind("bbs.reset.en_US", "https://id.fanruan.com/en/forget/forget.php");
     private static final String BBS_RESET_JP = CloudCenter.getInstance().acquireUrlByKind("bbs.reset.en_US", "https://id.fanruan.com/en/forget/forget.php");

designer-base/src/main/java/com/fr/design/login/AbstractDesignerSSO.java

@@ -20,6 +20,10 @@ public abstract class AbstractDesignerSSO extends UpdateAction {
     @Override
     public void actionPerformed(ActionEvent event) {
         String url = getJumpUrl();
+        if (!DesignerLoginUtils.isOnline()) {
+            BrowseUtils.browser(url);
+            return;
+        }
         DesignerEnvManager manager = DesignerEnvManager.getEnvManager();
         int uid = manager.getDesignerLoginUid();
         if (uid > 0) {

designer-base/src/main/java/com/fr/design/login/guide/DesignerGuideHelper.java

@@ -4,9 +4,13 @@ import com.fr.base.FRContext;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.event.DesignerOpenedListener;
+import com.fr.design.login.utils.DesignerLoginUtils;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.update.push.DesignerPushUpdateManager;
+import com.fr.general.CloudCenter;
+import com.fr.general.CloudCenterConfig;
+import com.fr.general.http.HttpToolbox;
 import com.fr.stable.StringUtils;
 import javax.swing.WindowConstants;
 
@@ -35,7 +39,7 @@ public class DesignerGuideHelper {
 
     public static void prepareShowGuideDialog() {
         // 如果存在更新升级的弹窗，则不显示引导页面
-        if (!SupportOSImpl.DESIGNER_LOGIN.support() || !FRContext.isChineseEnv() || DesignerPushUpdateManager.getInstance().isShouldPopUp()) {
+        if (!DesignerLoginUtils.isOnline() || !SupportOSImpl.DESIGNER_LOGIN.support() || !FRContext.isChineseEnv() || DesignerPushUpdateManager.getInstance().isShouldPopUp()) {
             return;
         }
         if (isActivatedForOneWeek()) {

designer-base/src/main/java/com/fr/design/login/message/DesignerMessageHelper.java

@@ -51,6 +51,9 @@ public class DesignerMessageHelper {
     }
 
     public void prepareShowMessage() {
+        if (!DesignerLoginUtils.isOnline()) {
+            return;
+        }
         DesignerContext.getDesignerFrame().addDesignerOpenedListener(new DesignerOpenedListener() {
             @Override
             public void designerOpened() {

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

@@ -3,10 +3,13 @@ package com.fr.design.login.utils;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.mainframe.toast.DesignerToastMsgUtil;
 import com.fr.general.CloudCenter;
+import com.fr.general.CloudCenterConfig;
 import com.fr.general.GeneralContext;
+import com.fr.general.http.HttpToolbox;
 import com.fr.general.log.MessageFormatter;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
 import com.fr.third.org.bouncycastle.util.encoders.Hex;
 import java.awt.Window;
 import java.security.SecureRandom;
@@ -49,6 +52,9 @@ public class DesignerLoginUtils {
     }
 
     public static String generateDesignerSSOUrl(String referrer) {
+        if (!DesignerLoginUtils.isOnline()) {
+            return referrer;
+        }
         String ssoTemplate = CloudCenter.getInstance().acquireUrlByKind("designer.sso.api", "https://id.fanruan.com/api/app/?code={}&referrer={}");
         try {
             String code = generateLoginCode();
@@ -60,6 +66,19 @@ public class DesignerLoginUtils {
         return referrer;
     }
 
+    public static boolean isOnline() {
+        if (CloudCenterConfig.getInstance().isOnline()) {
+            String ping = CloudCenter.getInstance().acquireConf("ping", StringUtils.EMPTY);
+            if (StringUtils.isNotEmpty(ping)) {
+                try {
+                    return StringUtils.isEmpty(HttpToolbox.get(ping));
+                } catch (Exception ignore) {
+                }
+            }
+        }
+        return false;
+    }
+
     private static String generateLoginCode() throws Exception {
         DesignerEnvManager manager = DesignerEnvManager.getEnvManager();
         JSONObject jo = JSONObject.create();

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

@@ -19,6 +19,7 @@ import com.fr.design.actions.file.SaveAsTemplateAction;
 import com.fr.design.actions.file.SaveTemplateAction;
 import com.fr.design.actions.file.WebPreviewUtils;
 import com.fr.design.base.mode.DesignModeContext;
+import com.fr.design.data.datapane.TableDataTreePane;
 import com.fr.design.designer.DesignerProxy;
 import com.fr.design.designer.TargetComponent;
 import com.fr.design.dialog.FineJOptionPane;
@@ -393,6 +394,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
                 addCenterPane();
 
                 refreshToolArea();
+
+                TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).refreshDockingView();
             }
         });
 

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

@@ -52,8 +52,15 @@ public class ImagePreviewPane extends JComponent implements Scrollable, ImagePre
     private boolean isLoading = false;
 
     public ImagePreviewPane() {
+        this(true);
+    }
+
+    public ImagePreviewPane(boolean showSizeLabel) {
+        if (showSizeLabel) {
             sizeLabel = new UILabel();
             this.add(sizeLabel);
+        }
+
         this.setBorder(BorderFactory.createEmptyBorder(10, 10, 20, 10));
         this.setLayout(new BorderLayout());
         this.add(new JPanel() {
@@ -117,7 +124,9 @@ public class ImagePreviewPane extends JComponent implements Scrollable, ImagePre
                 ((JViewport) this.getParent()).setMinimumSize(newDimension);
                 ((JViewport) this.getParent()).setMaximumSize(newDimension);
             }
+            if (sizeLabel != null) {
                 sizeLabel.setText(null);
+            }
         } else {
             isLoading = false;
             // wait for the size of image.
@@ -128,11 +137,15 @@ public class ImagePreviewPane extends JComponent implements Scrollable, ImagePre
             int totalwidth = ImagePreviewPane.this.getWidth();
             int totalheight = ImagePreviewPane.this.getHeight();
             String text = imageWidth + "x" + imageHeight;
+            if (sizeLabel != null) {
                 sizeLabel.setText(text);
+            }
             FontMetrics cellFM = this.getFontMetrics(getFont());
             int width = cellFM.stringWidth(text);
+            if (sizeLabel != null) {
                 sizeLabel.setBounds(totalwidth - width - LABEL_DELTA_X, totalheight - LABEL_DELTA_Y, width, LABEL_HEIGHT);
             }
+        }
         fireChangeListener();
         this.revalidate();
     }

designer-base/src/main/java/com/fr/design/ui/ModernUIPane.java

@@ -5,8 +5,10 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.itoolbar.UIToolbar;
 import com.fr.design.i18n.Toolkit;
+import com.fr.design.ui.compatible.BuilderDiff;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.web.struct.AssembleComponent;
+import com.teamdev.jxbrowser.browser.callback.InjectJsCallback;
 import com.teamdev.jxbrowser.chromium.Browser;
 import com.teamdev.jxbrowser.chromium.BrowserType;
 import com.teamdev.jxbrowser.chromium.JSValue;
@@ -42,6 +44,10 @@ public class ModernUIPane<T> extends BasicPane {
         initialize(browserType);
     }
 
+    protected ModernUIPane() {
+
+    }
+
     private void initialize(BrowserType browserType) {
         if (browser == null) {
             setLayout(new BorderLayout());
@@ -151,7 +157,7 @@ public class ModernUIPane<T> extends BasicPane {
         return null;
     }
 
-    public static class Builder<T> {
+    public static class Builder<T> implements BuilderDiff<T> {
 
         private ModernUIPane<T> pane;
 
@@ -271,6 +277,22 @@ public class ModernUIPane<T> extends BasicPane {
             return this;
         }
 
+        @Override
+        public Builder<T> prepareForV6(ScriptContextListener contextListener) {
+            return prepare(contextListener);
+        }
+
+        @Override
+        public Builder<T> prepareForV6(LoadListener loadListener) {
+            return prepare(loadListener);
+        }
+
+        @Override
+        public Builder<T> prepareForV7(InjectJsCallback callback) {
+            // do nothing
+            return this;
+        }
+
         public ModernUIPane<T> build() {
             return pane;
         }

designer-base/src/main/java/com/fr/design/ui/compatible/BuilderDiff.java

@@ -0,0 +1,24 @@
+package com.fr.design.ui.compatible;
+
+import com.fr.design.ui.ModernUIPane;
+import com.teamdev.jxbrowser.browser.callback.InjectJsCallback;
+import com.teamdev.jxbrowser.chromium.events.LoadListener;
+import com.teamdev.jxbrowser.chromium.events.ScriptContextListener;
+
+/**
+ * 封装jxbrwoser v6/v7的构建方式的差异
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/6/13
+ */
+public interface BuilderDiff<T> {
+
+    ModernUIPane.Builder<T> prepareForV6(ScriptContextListener contextListener);
+
+    ModernUIPane.Builder<T> prepareForV6(LoadListener loadListener);
+
+    ModernUIPane.Builder<T> prepareForV7(InjectJsCallback callback);
+
+
+}

designer-base/src/main/java/com/fr/design/ui/compatible/ModernUIPaneFactory.java

@@ -0,0 +1,20 @@
+package com.fr.design.ui.compatible;
+
+import com.fr.design.ui.ModernUIPane;
+import com.fr.stable.os.OperatingSystem;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/6/13
+ */
+public class ModernUIPaneFactory {
+
+    public static <T> ModernUIPane.Builder<T> modernUIPaneBuilder() {
+        if (OperatingSystem.isWindows()) {
+            return new NewModernUIPane.Builder<>();
+        } else {
+            return new ModernUIPane.Builder<>();
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/ui/compatible/NewModernUIPane.java

@@ -0,0 +1,301 @@
+package com.fr.design.ui.compatible;
+
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.itoolbar.UIToolbar;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.ui.ModernUIConstants;
+import com.fr.design.ui.ModernUIPane;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.web.struct.AssembleComponent;
+import com.teamdev.jxbrowser.browser.Browser;
+import com.teamdev.jxbrowser.browser.callback.InjectJsCallback;
+import com.teamdev.jxbrowser.chromium.events.LoadListener;
+import com.teamdev.jxbrowser.chromium.events.ScriptContextListener;
+import com.teamdev.jxbrowser.engine.Engine;
+import com.teamdev.jxbrowser.engine.EngineOptions;
+import com.teamdev.jxbrowser.engine.RenderingMode;
+import com.teamdev.jxbrowser.js.JsObject;
+import com.teamdev.jxbrowser.net.Network;
+import com.teamdev.jxbrowser.net.callback.InterceptRequestCallback;
+import com.teamdev.jxbrowser.view.swing.BrowserView;
+
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.util.Map;
+import java.util.Optional;
+import javax.swing.JDialog;
+import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
+
+/**
+ * 基于v7 jxbrowser实现
+ *
+ * @author richie
+ * @version 10.0
+ * Created by richie on 2019-03-04
+ * 用于加载html5的Swing容器，可以在设计选项设置中打开调试窗口，示例可查看：com.fr.design.ui.ModernUIPaneTest
+ */
+public class NewModernUIPane<T> extends ModernUIPane<T> {
+
+    private Browser browser;
+    private String namespace = "Pool";
+    private String variable = "data";
+    private String expression = "update()";
+
+    private NewModernUIPane() {
+        super();
+        initialize();
+    }
+
+    private void initialize() {
+        setLayout(new BorderLayout());
+        if (browser == null) {
+            if (DesignerEnvManager.getEnvManager().isOpenDebug()) {
+                UIToolbar toolbar = new UIToolbar();
+                add(toolbar, BorderLayout.NORTH);
+                UIButton openDebugButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Open_Debug_Window"));
+                toolbar.add(openDebugButton);
+                UIButton reloadButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Reload"));
+                toolbar.add(reloadButton);
+                UIButton closeButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Close_Window"));
+                toolbar.add(closeButton);
+
+                openDebugButton.addActionListener(e -> showDebuggerDialog());
+
+                reloadButton.addActionListener(e -> browser.navigation().reloadIgnoringCache());
+
+                closeButton.addActionListener(e -> SwingUtilities.getWindowAncestor(
+                        NewModernUIPane.this).setVisible(false));
+                initializeBrowser();
+                add(BrowserView.newInstance(browser), BorderLayout.CENTER);
+            } else {
+                initializeBrowser();
+                add(BrowserView.newInstance(browser), BorderLayout.CENTER);
+            }
+        }
+    }
+
+    private void showDebuggerDialog() {
+        JDialog dialog = new JDialog(SwingUtilities.getWindowAncestor(this));
+        Engine engine = Engine.newInstance(
+                EngineOptions.newBuilder(RenderingMode.HARDWARE_ACCELERATED)
+                        .addSwitch("--disable-google-traffic")
+                        .remoteDebuggingPort(9222).build());
+        Browser debugger = engine.newBrowser();
+        BrowserView debuggerView = BrowserView.newInstance(debugger);
+        dialog.add(debuggerView, BorderLayout.CENTER);
+        dialog.setSize(new Dimension(800, 400));
+        GUICoreUtils.centerWindow(dialog);
+        dialog.setVisible(true);
+        dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        browser.devTools().remoteDebuggingUrl().ifPresent(url -> {
+            debugger.navigation().loadUrl(url);
+        });
+    }
+
+    private void initializeBrowser() {
+        Engine engine = Engine.newInstance(EngineOptions.newBuilder(RenderingMode.HARDWARE_ACCELERATED).addSwitch("--disable-google-traffic").build());
+        browser = engine.newBrowser();
+
+        // 初始化的时候，就把命名空间对象初始化好，确保window.a.b.c（"a.b.c"为命名空间）对象都是初始化过的
+        browser.set(InjectJsCallback.class, params -> {
+            params.frame().executeJavaScript(String.format(ModernUIConstants.SCRIPT_INIT_NAME_SPACE, namespace));
+            return InjectJsCallback.Response.proceed();
+        });
+    }
+
+    /**
+     * 转向一个新的地址，相当于重新加载
+     *
+     * @param url 新的地址
+     */
+    @Override
+    public void redirect(String url) {
+        browser.navigation().loadUrl(url);
+    }
+
+    /**
+     * 转向一个新的地址，相当于重新加载
+     *
+     * @param url 新的地址
+     * @param map 初始化参数
+     */
+    @Override
+    public void redirect(String url, Map<String, String> map) {
+        Network network = browser.engine().network();
+        network.set(InterceptRequestCallback.class, new NxInterceptRequestCallback(network, map));
+        browser.navigation().loadUrl(url);
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return "Modern";
+    }
+
+    @Override
+    public void populate(final T t) {
+        browser.set(InjectJsCallback.class, params -> {
+            JsObject ns = params.frame().executeJavaScript("window." + namespace);
+            if (ns != null) {
+                ns.putProperty(variable, t);
+            }
+            return InjectJsCallback.Response.proceed();
+        });
+    }
+
+    @Override
+    public T update() {
+        if (browser.mainFrame().isPresent()) {
+            return browser.mainFrame().get().executeJavaScript("window." + namespace + "." + expression);
+        }
+        return null;
+    }
+
+    public static class Builder<T> extends ModernUIPane.Builder<T> {
+
+        private NewModernUIPane<T> pane = new NewModernUIPane<>();
+
+        public NewModernUIPane.Builder<T> prepare(InjectJsCallback callback) {
+            pane.browser.set(InjectJsCallback.class, callback);
+            return this;
+        }
+
+        /**
+         * 加载jar包中的资源
+         *
+         * @param path 资源路径
+         */
+        @Override
+        public NewModernUIPane.Builder<T> withEMB(final String path) {
+            Network network = pane.browser.engine().network();
+            network.set(InterceptRequestCallback.class, new NxComplexInterceptRequestCallback(network, null));
+            pane.browser.navigation().loadUrl("emb:" + path);
+            return this;
+        }
+
+        /**
+         * 加载url指向的资源
+         *
+         * @param url 文件的地址
+         */
+        @Override
+        public NewModernUIPane.Builder<T> withURL(final String url) {
+            Network network = pane.browser.engine().network();
+            network.set(InterceptRequestCallback.class, new NxInterceptRequestCallback(network));
+            pane.browser.navigation().loadUrl(url);
+            return this;
+        }
+
+        /**
+         * 加载url指向的资源
+         *
+         * @param url 文件的地址
+         */
+        @Override
+        public NewModernUIPane.Builder<T> withURL(final String url, Map<String, String> map) {
+            Network network = pane.browser.engine().network();
+            network.set(InterceptRequestCallback.class, new NxInterceptRequestCallback(network, map));
+            pane.browser.navigation().loadUrl(url);
+            return this;
+        }
+
+        /**
+         * 加载Atom组件
+         *
+         * @param component Atom组件
+         */
+        @Override
+        public NewModernUIPane.Builder<T> withComponent(AssembleComponent component) {
+            Network network = pane.browser.engine().network();
+            network.set(InterceptRequestCallback.class, new NxComplexInterceptRequestCallback(network, component));
+            pane.browser.navigation().loadUrl("emb:dynamic");
+            return this;
+        }
+
+        /**
+         * 加载Atom组件
+         *
+         * @param component Atom组件
+         */
+        @Override
+        public NewModernUIPane.Builder<T> withComponent(AssembleComponent component, Map<String, String> map) {
+            Network network = pane.browser.engine().network();
+            network.set(InterceptRequestCallback.class, new NxComplexInterceptRequestCallback(network, component, map));
+            pane.browser.navigation().loadUrl("emb:dynamic");
+            return this;
+        }
+
+
+        /**
+         * 加载html文本内容
+         *
+         * @param html 要加载html文本内容
+         */
+        @Override
+        public NewModernUIPane.Builder<T> withHTML(String html) {
+            Network network = pane.browser.engine().network();
+            network.set(InterceptRequestCallback.class, new NxInterceptRequestCallback(network));
+            pane.browser.mainFrame().ifPresent(frame -> {
+                frame.loadHtml(html);
+            });
+            return this;
+        }
+
+        /**
+         * 设置该前端页面做数据交换所使用的对象
+         *
+         * @param namespace 对象名
+         */
+        @Override
+        public NewModernUIPane.Builder<T> namespace(String namespace) {
+            pane.namespace = namespace;
+            return this;
+        }
+
+        /**
+         * java端往js端传数据时使用的变量名字
+         *
+         * @param name 变量的名字
+         */
+        @Override
+        public NewModernUIPane.Builder<T> variable(String name) {
+            pane.variable = name;
+            return this;
+        }
+
+        /**
+         * js端往java端传数据时执行的函数表达式
+         *
+         * @param expression 函数表达式
+         */
+        @Override
+        public NewModernUIPane.Builder<T> expression(String expression) {
+            pane.expression = expression;
+            return this;
+        }
+
+        @Override
+        public NewModernUIPane.Builder<T> prepareForV6(ScriptContextListener contextListener) {
+            // do nothing
+            return this;
+        }
+
+        @Override
+        public NewModernUIPane.Builder<T> prepareForV6(LoadListener loadListener) {
+            // do nothing
+            return this;
+        }
+
+        @Override
+        public NewModernUIPane.Builder<T> prepareForV7(InjectJsCallback callback) {
+            return prepare(callback);
+        }
+
+        @Override
+        public NewModernUIPane<T> build() {
+            return pane;
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/ui/compatible/NxComplexInterceptRequestCallback.java

@@ -49,6 +49,9 @@ public class NxComplexInterceptRequestCallback extends NxInterceptRequestCallbac
                 path = path.substring(4);
             }
             InputStream inputStream = IOUtils.readResource(path);
+            if (inputStream == null) {
+                return Response.proceed();
+            }
             return InterceptRequestCallback.Response.intercept(generateBasicUrlRequestJob(urlRequest, getMimeType(path), IOUtils.inputStream2Bytes(inputStream)));
         }
     }

designer-base/src/main/java/com/fr/design/ui/compatible/NxInterceptRequestCallback.java

@@ -100,6 +100,11 @@ public class NxInterceptRequestCallback implements InterceptRequestCallback {
     }
 
     String getMimeType(String path) {
+        // 去除 xxx?xxx 后面部分
+        int index = path.indexOf("?");
+        if (index != -1) {
+            path = path.substring(0, path.indexOf("?"));
+        }
         if (StringUtils.isBlank(path)) {
             return "text/html";
         }
@@ -124,6 +129,15 @@ public class NxInterceptRequestCallback implements InterceptRequestCallback {
         if (path.endsWith(".gif")) {
             return "image/gif";
         }
+        if (path.endsWith(".woff")) {
+            return "font/woff";
+        }
+        if (path.endsWith(".ttf")) {
+            return "truetype";
+        }
+        if (path.endsWith(".eot")) {
+            return "embedded-opentype";
+        }
         Path file = new File(path).toPath();
         try {
             return Files.probeContentType(file);

designer-base/src/main/java/com/fr/design/upm/NewUpmBridge.java

@@ -0,0 +1,502 @@
+package com.fr.design.upm;
+
+import com.fr.decision.webservice.v10.plugin.helper.category.impl.UpmResourceLoader;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.bridge.exec.JSBridge;
+import com.fr.design.bridge.exec.JSCallback;
+import com.fr.design.extra.PluginOperateUtils;
+import com.fr.design.extra.PluginUtils;
+import com.fr.design.extra.exe.GetInstalledPluginsExecutor;
+import com.fr.design.extra.exe.GetPluginCategoriesExecutor;
+import com.fr.design.extra.exe.GetPluginFromStoreExecutor;
+import com.fr.design.extra.exe.GetPluginPrefixExecutor;
+import com.fr.design.extra.exe.PluginLoginExecutor;
+import com.fr.design.extra.exe.ReadUpdateOnlineExecutor;
+import com.fr.design.extra.exe.SearchOnlineExecutor;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.upm.event.CertificateEvent;
+import com.fr.design.upm.event.DownloadEvent;
+import com.fr.design.upm.exec.NewUpmBrowserExecutor;
+import com.fr.design.upm.task.UpmTaskWorker;
+import com.fr.event.EventDispatcher;
+import com.fr.general.GeneralUtils;
+import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
+import com.fr.plugin.context.PluginMarker;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.StringUtils;
+import com.teamdev.jxbrowser.js.JsAccessible;
+import com.teamdev.jxbrowser.js.JsFunction;
+import com.teamdev.jxbrowser.js.JsObject;
+
+import javax.swing.JFileChooser;
+import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
+import javax.swing.filechooser.FileNameExtensionFilter;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.RunnableFuture;
+
+/**
+ * @author richie
+ * @version 10.0
+ * Created by richie on 2019-04-12
+ * 桥接Java和JavaScript的类
+ */
+public class NewUpmBridge extends UpmBridge  {
+
+    public static NewUpmBridge getBridge(JsObject jsObject) {
+        return new NewUpmBridge(jsObject);
+    }
+
+    private JsObject jsObject;
+
+    private NewUpmBridge(JsObject jsObject) {
+        this.jsObject = jsObject;
+    }
+
+    /**
+     * 更新插件管理中心资源文件，这个方法仅仅是为了语义上的作用（更新）
+     *
+     * @param callback 安装完成后的回调函数
+     */
+    @JSBridge
+    @JsAccessible
+    public void update(final JsFunction callback) {
+        callback.invoke(jsObject, "start", Toolkit.i18nText("Fine-Design_Basic_Update_Plugin_Manager_Download_Start"));
+        try {
+            UpmResourceLoader.INSTANCE.download();
+            UpmResourceLoader.INSTANCE.install();
+            callback.invoke(jsObject, "success", Toolkit.i18nText("Fine-Design_Basic_Update_Plugin_Manager_Download_Success"));
+            EventDispatcher.fire(DownloadEvent.UPDATE, "success");
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            callback.invoke(jsObject, "error", Toolkit.i18nText("Fine-Design_Basic_Update_Plugin_Manager_Download_Error"));
+        }
+    }
+
+    /**
+     * 下载并安装插件管理中心的资源文件
+     *
+     * @param callback 安装完成后的回调函数
+     */
+    @JSBridge
+    @JsAccessible
+    public void startDownload(final JsFunction callback) {
+        callback.invoke(jsObject, "start", Toolkit.i18nText("Fine-Design_Basic_Update_Plugin_Manager_Download_Start"));
+        new SwingWorker<Void, Void>() {
+            @Override
+            protected Void doInBackground() throws Exception {
+                UpmResourceLoader.INSTANCE.download();
+                UpmResourceLoader.INSTANCE.install();
+                return null;
+            }
+
+            @Override
+            protected void done() {
+                try {
+                    get();
+                    callback.invoke(jsObject, "success", Toolkit.i18nText("Fine-Design_Basic_Update_Plugin_Manager_Download_Success"));
+                    EventDispatcher.fire(DownloadEvent.SUCCESS, "success");
+                } catch (Exception e) {
+                    callback.invoke(jsObject, "error", Toolkit.i18nText("Fine-Design_Basic_Update_Plugin_Manager_Download_Error"));
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                    EventDispatcher.fire(DownloadEvent.ERROR, "error");
+                }
+            }
+        }.execute();
+    }
+
+    /**
+     * 获取upm的版本信息
+     *
+     * @return 版本信息
+     */
+    @JSBridge
+    @JsAccessible
+    @Override
+    public String getVersion() {
+        return super.getVersion();
+    }
+
+    @JSBridge
+    @JsAccessible
+    @Override
+    public String i18nText(String key) {
+        return super.i18nText(key);
+    }
+
+    @JSBridge
+    @JsAccessible
+    @Override
+    public void closeWindow() {
+        super.closeWindow();
+    }
+
+    @JSBridge
+    @JsAccessible
+    @Override
+    public boolean isDesigner() {
+        return super.isDesigner();
+    }
+
+    @JSBridge
+    @JsAccessible
+    public void getPackInfo(final JsFunction callback) {
+        callback.invoke(jsObject, StringUtils.EMPTY);
+    }
+
+    @JSBridge
+    @JsAccessible
+    public void getPluginPrefix(final JsFunction callback) {
+        UpmTaskWorker<Void> task = new UpmTaskWorker<>(new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback)), new GetPluginPrefixExecutor());
+        task.execute();
+    }
+
+    /**
+     * 在线获取插件分类
+     *
+     * @param callback 回调函数
+     */
+    @JSBridge
+    @JsAccessible
+    public void getPluginCategories(final JsFunction callback) {
+        UpmTaskWorker<Void> task = new UpmTaskWorker<>(new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback)), new GetPluginCategoriesExecutor());
+        task.execute();
+    }
+
+    /**
+     * 根据条件获取在线插件
+     *
+     * @param info     插件信息
+     * @param callback 回调函数
+     */
+    @JSBridge
+    @JsAccessible
+    public void getPluginFromStoreNew(String info, final JsFunction callback) {
+        UpmTaskWorker<Void> task = new UpmTaskWorker<>(new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback)), new GetPluginFromStoreExecutor(new JSONObject(info)));
+        task.execute();
+    }
+
+    /**
+     * 已安装插件检查更新
+     */
+    @JSBridge
+    @JsAccessible
+    public void readUpdateOnline(final JsFunction callback) {
+        UpmTaskWorker<Void> task = new UpmTaskWorker<>(new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback)), new ReadUpdateOnlineExecutor());
+        task.execute();
+    }
+
+    /**
+     * 获取已经安装的插件的数组
+     */
+    @JSBridge
+    @JsAccessible
+    public void getInstalledPlugins(final JsFunction callback) {
+        UpmTaskWorker<Void> task = new UpmTaskWorker<>(new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback)), new GetInstalledPluginsExecutor());
+        task.execute();
+    }
+
+    /**
+     * 从插件服务器上更新选中的插件
+     *
+     * @param pluginIDs 插件集合
+     */
+    @JSBridge
+    @JsAccessible
+    public void updatePluginOnline(JsObject pluginIDs, final JsFunction callback) {
+        JSCallback jsCallback = new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback));
+        List<PluginMarker> pluginMarkerList = new ArrayList<>();
+        for (String key : pluginIDs.propertyNames()) {
+            pluginIDs.property(key).ifPresent(v -> {
+                pluginMarkerList.add(PluginUtils.createPluginMarker(GeneralUtils.objectToString(v)));
+            });
+        }
+        PluginOperateUtils.updatePluginOnline(pluginMarkerList, jsCallback);
+    }
+
+    @JSBridge
+    @JsAccessible
+    public void updatePluginOnline(String pluginID, final JsFunction callback) {
+        JSCallback jsCallback = new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback));
+        List<PluginMarker> pluginMarkerList = new ArrayList<>();
+        pluginMarkerList.add(PluginUtils.createPluginMarker(pluginID));
+        PluginOperateUtils.updatePluginOnline(pluginMarkerList, jsCallback);
+    }
+
+    /**
+     * 搜索在线插件
+     *
+     * @param keyword 关键字
+     */
+    @JSBridge
+    @JsAccessible
+    public void searchPlugin(String keyword, final JsFunction callback) {
+        UpmTaskWorker<Void> worker = new UpmTaskWorker<>(new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback)), new SearchOnlineExecutor(keyword));
+        worker.execute();
+    }
+
+    /**
+     * 从磁盘上选择插件安装包进行安装
+     *
+     * @param filePath 插件包的路径
+     */
+    @JSBridge
+    @JsAccessible
+    public void installPluginFromDisk(final String filePath, final JsFunction callback) {
+        JSCallback jsCallback = new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback));
+        File file = new File(filePath);
+        PluginOperateUtils.installPluginFromDisk(file, jsCallback);
+    }
+
+    /**
+     * 卸载当前选中的插件
+     *
+     * @param pluginInfo 插件信息
+     */
+    @JSBridge
+    @JsAccessible
+    public void uninstallPlugin(final String pluginInfo, final boolean isForce, final JsFunction callback) {
+        JSCallback jsCallback = new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback));
+        PluginOperateUtils.uninstallPlugin(pluginInfo, isForce, jsCallback);
+    }
+
+    /**
+     * 从插件服务器上安装插件
+     *
+     * @param pluginInfo 插件的ID
+     * @param callback   回调函数
+     */
+    @JSBridge
+    @JsAccessible
+    public void installPluginOnline(final String pluginInfo, final JsFunction callback) {
+        JSCallback jsCallback = new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback));
+        PluginMarker pluginMarker = PluginUtils.createPluginMarker(pluginInfo);
+        PluginOperateUtils.installPluginOnline(pluginMarker, jsCallback);
+    }
+
+    /**
+     * 从磁盘上选择插件安装包进行插件升级
+     *
+     * @param filePath 插件包的路径
+     */
+    @JSBridge
+    @JsAccessible
+    public void updatePluginFromDisk(String filePath, final JsFunction callback) {
+        JSCallback jsCallback = new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback));
+        File file = new File(filePath);
+        PluginOperateUtils.updatePluginFromDisk(file, jsCallback);
+    }
+
+    /**
+     * 修改选中的插件的活跃状态
+     *
+     * @param pluginID 插件ID
+     */
+    @JSBridge
+    @JsAccessible
+    public void setPluginActive(String pluginID, final JsFunction callback) {
+        JSCallback jsCallback = new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback));
+        PluginOperateUtils.setPluginActive(pluginID, jsCallback);
+    }
+
+    /**
+     * 选择文件对话框
+     *
+     * @return 选择的文件的路径
+     */
+    @JSBridge
+    @JsAccessible
+    @Override
+    public String showFileChooser() {
+        return super.showFileChooser();
+    }
+
+    /**
+     * 选择文件对话框
+     *
+     * @param des    过滤文件描述
+     * @param filter 文件的后缀
+     * @return 选择的文件的路径
+     * 这里换用JFileChooser会卡死,不知道为什么
+     */
+    @JSBridge
+    @JsAccessible
+    @Override
+    public String showFileChooserWithFilter(final String des, final String filter) {
+        return super.showFileChooserWithFilter(des, filter);
+    }
+
+    /**
+     * 选择文件对话框
+     *
+     * @param des  过滤文件描述
+     * @param args 文件的后缀
+     * @return 选择的文件的路径
+     */
+    @JSBridge
+    @JsAccessible
+    public String showFileChooserWithFilters(final String des, final String args) {
+        RunnableFuture<String> future = new FutureTask<>(() -> {
+            JFileChooser fileChooser = new JFileChooser();
+            List<String> filterList = new ArrayList<>();
+            filterList.add(args);
+            String[] filters = filterList.toArray(new String[0]);
+            if (ArrayUtils.isNotEmpty(filters)) {
+                FileNameExtensionFilter filter = new FileNameExtensionFilter(des, UpmUtils.findMatchedExtension(filters));
+                fileChooser.setFileFilter(filter);
+            }
+            int result = fileChooser.showOpenDialog(UpmFinder.getDialog());
+            if (result == JFileChooser.APPROVE_OPTION) {
+                return fileChooser.getSelectedFile().getAbsolutePath();
+            }
+            return null;
+        });
+        SwingUtilities.invokeLater(future);
+        try {
+            return future.get();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    /**
+     * 选择文件对话框
+     *
+     * @param des  过滤文件描述
+     * @param args 文件的后缀
+     * @return 选择的文件的路径
+     */
+    @JSBridge
+    @JsAccessible
+    public String showFileChooserWithFilters(final String des, final JsObject args) {
+        RunnableFuture<String> future = new FutureTask<>(() -> {
+            JFileChooser fileChooser = new JFileChooser();
+            List<String> filterList = new ArrayList<>();
+            for (String key : args.propertyNames()) {
+                args.property(key).ifPresent(v -> {
+                    filterList.add(GeneralUtils.objectToString(v));
+                });
+            }
+            String[] filters = filterList.toArray(new String[0]);
+            if (ArrayUtils.isNotEmpty(filters)) {
+                FileNameExtensionFilter filter = new FileNameExtensionFilter(des, UpmUtils.findMatchedExtension(filters));
+                fileChooser.setFileFilter(filter);
+            }
+            int result = fileChooser.showOpenDialog(UpmFinder.getDialog());
+            if (result == JFileChooser.APPROVE_OPTION) {
+                return fileChooser.getSelectedFile().getAbsolutePath();
+            }
+            return null;
+        });
+        SwingUtilities.invokeLater(future);
+        try {
+            return future.get();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    ////////登录相关///////
+
+    /**
+     * 获取系统登录的用户名
+     */
+    @JSBridge
+    @JsAccessible
+    public String getLoginInfo(final JsFunction callback) {
+        registerLoginInfo(callback);
+        return DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
+    }
+
+    /**
+     * 系统登录注册
+     *
+     * @param callback 回调函数
+     */
+    @JSBridge
+    @JsAccessible
+    public void registerLoginInfo(final JsFunction callback) {
+        JSCallback jsCallback = new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback));
+        String username = DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
+        if (StringUtils.isEmpty(username)) {
+            jsCallback.execute(StringUtils.EMPTY);
+            EventDispatcher.fire(CertificateEvent.LOGOUT, StringUtils.EMPTY);
+        } else {
+            jsCallback.execute(username);
+            EventDispatcher.fire(CertificateEvent.LOGIN, username);
+        }
+    }
+
+
+    /**
+     * 设计器端的用户登录
+     *
+     * @param username 用户名
+     * @param password 密码
+     * @param callback 回调函数
+     */
+    @JSBridge
+    @JsAccessible
+    public void defaultLogin(String username, String password, final JsFunction callback) {
+        UpmTaskWorker<Void> worker = new UpmTaskWorker<>(new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback)), new PluginLoginExecutor(username, password));
+        worker.execute();
+    }
+
+    /**
+     * 清除用户信息
+     */
+    @JsAccessible
+    @JSBridge
+    @Override
+    public void clearUserInfo() {
+        super.clearUserInfo();
+    }
+
+    /**
+     * 打开论坛消息界面
+     */
+    @JSBridge
+    @JsAccessible
+    @Override
+    public void getPriviteMessage() {
+        super.getPriviteMessage();
+    }
+
+    /**
+     * 忘记密码
+     */
+    @JSBridge
+    @JsAccessible
+    @Override
+    public void forgetHref() {
+        super.forgetHref();
+    }
+
+    /**
+     * 立即注册
+     */
+    @JSBridge
+    @JsAccessible
+    @Override
+    public void registerHref() {
+        super.registerHref();
+    }
+
+    /**
+     * 使用系统浏览器打开网页
+     *
+     * @param url 要打开的网页
+     */
+    @JSBridge
+    @JsAccessible
+    @Override
+    public void openShopUrlAtWebBrowser(String url) {
+        super.openShopUrlAtWebBrowser(url);
+    }
+}

designer-base/src/main/java/com/fr/design/upm/UpmBridge.java

@@ -66,6 +66,10 @@ public class UpmBridge {
         this.window = browser.executeJavaScriptAndReturnValue("window").asObject();
     }
 
+    protected UpmBridge() {
+
+    }
+
     /**
      * 更新插件管理中心资源文件，这个方法仅仅是为了语义上的作用（更新）
      * @param callback 安装完成后的回调函数

designer-base/src/main/java/com/fr/design/upm/UpmFinder.java

@@ -15,6 +15,7 @@ import com.fr.event.Listener;
 import com.fr.general.GeneralContext;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StableUtils;
+import com.fr.stable.os.OperatingSystem;
 import com.fr.workspace.Workspace;
 import com.fr.workspace.WorkspaceEvent;
 
@@ -31,7 +32,7 @@ public class UpmFinder {
 
     private static final String UPM_DIR = "/upm";
     private static final String MAIN_RESOURCE_PATH = UPM_DIR + "/plugin_design.html";
-    private static final String JXBROWSER = "com.teamdev.jxbrowser.chromium.Browser";
+    private static final String JXBROWSER = OperatingSystem.isWindows() ? "com.teamdev.jxbrowser.browser.Browser" : "com.teamdev.jxbrowser.chromium.Browser";
 
     public static String installHome = FRContext.getCommonOperator().getWebRootPath();
 

designer-base/src/main/java/com/fr/design/upm/UpmShowPane.java

@@ -2,14 +2,17 @@ package com.fr.design.upm;
 
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.ui.ModernUIPane;
+import com.fr.design.ui.compatible.ModernUIPaneFactory;
 import com.fr.design.upm.event.DownloadEvent;
 import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
 import com.fr.event.Listener;
+import com.teamdev.jxbrowser.browser.callback.InjectJsCallback;
 import com.teamdev.jxbrowser.chromium.JSValue;
 import com.teamdev.jxbrowser.chromium.events.ScriptContextAdapter;
 import com.teamdev.jxbrowser.chromium.events.ScriptContextEvent;
 
+import com.teamdev.jxbrowser.js.JsObject;
 import java.awt.*;
 
 /**
@@ -29,16 +32,23 @@ public class UpmShowPane extends BasicPane {
 
     UpmShowPane() {
         setLayout(new BorderLayout());
-//        先屏蔽掉这个判断，后续可能修改交互
+        modernUIPane = ModernUIPaneFactory.modernUIPaneBuilder()
-//        if (UpmFinder.checkUPMResourcesExist()) {
+                .prepareForV6(new ScriptContextAdapter() {
-        modernUIPane = new ModernUIPane.Builder<>()
-                .prepare(new ScriptContextAdapter() {
                     @Override
                     public void onScriptContextCreated(ScriptContextEvent event) {
+                        // 6.x
                         JSValue window = event.getBrowser().executeJavaScriptAndReturnValue("window");
                         window.asObject().setProperty("PluginHelper", UpmBridge.getBridge(event.getBrowser()));
                     }
                 })
+                .prepareForV7(params -> {
+                    // 7.x
+                    JsObject window = params.frame().executeJavaScript("window");
+                    if (window != null) {
+                        window.putProperty("PluginHelper", NewUpmBridge.getBridge(window));
+                    }
+                    return InjectJsCallback.Response.proceed();
+                })
                 .withURL(UpmFinder.getMainResourcePath(), UpmUtils.renderMap())
                 .build();
         EventDispatcher.listen(DownloadEvent.UPDATE, new Listener<String>() {
@@ -47,23 +57,6 @@ public class UpmShowPane extends BasicPane {
                 modernUIPane.redirect(UpmFinder.getMainResourcePath(), UpmUtils.renderMap());
             }
         });
-//        } else {
-//            modernUIPane = new ModernUIPane.Builder<>()
-//                    .withComponent(WarnComponent.KEY)
-//                    .prepare(new ScriptContextAdapter() {
-//                        @Override
-//                        public void onScriptContextCreated(ScriptContextEvent event) {
-//                            JSValue window = event.getBrowser().executeJavaScriptAndReturnValue("window");
-//                            window.asObject().setProperty("PluginHelper", UpmBridge.getBridge(event.getBrowser()));
-//                        }
-//                    }).build();
-//            EventDispatcher.listen(DownloadEvent.SUCCESS, new Listener<String>() {
-//                @Override
-//                public void on(Event event, String param) {
-//                    modernUIPane.redirect(UpmFinder.getMainResourcePath(), UpmUtils.renderMap());
-//                }
-//            });
-//        }
         add(modernUIPane, BorderLayout.CENTER);
     }
 }

designer-base/src/main/java/com/fr/design/upm/exec/NewUpmBrowserExecutor.java

@@ -0,0 +1,30 @@
+package com.fr.design.upm.exec;
+
+import com.fr.design.bridge.exec.JSExecutor;
+import com.teamdev.jxbrowser.js.JsFunction;
+import com.teamdev.jxbrowser.js.JsObject;
+
+/**
+ * @author richie
+ * @version 10.0
+ * Created by richie on 2019-04-18
+ */
+public class NewUpmBrowserExecutor implements JSExecutor {
+
+    public static NewUpmBrowserExecutor create(JsObject window, JsFunction callback) {
+        return new NewUpmBrowserExecutor(window, callback);
+    }
+
+    private final JsFunction callback;
+    private final JsObject window;
+
+    private NewUpmBrowserExecutor(JsObject window, JsFunction callback) {
+        this.window = window;
+        this.callback = callback;
+    }
+
+    @Override
+    public void executor(String newValue) {
+        callback.invoke(window, newValue);
+    }
+}

designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java

@@ -10,6 +10,7 @@ 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.BorderLayout;
@@ -45,23 +46,28 @@ public class WidgetBoundsPaneFactory {
 
     private static final int RIGHT_PANE_WIDTH = 145;
 
-    public static UIExpandablePane createBoundsPane(UISpinner width, UISpinner height) {
+    public static UIExpandablePane createBoundsPane(UISpinner width, UISpinner height, JComponent ratioLocked) {
         JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
-                new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Basic_Component_Size")), createRightPane(width, height)},
+                new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Basic_Component_Size")),
+                        ratioLocked != null ? createRightPane(width, ratioLocked, height) : createRightPane(width, height)},
                 new Component[]{null, createRightPane(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Tree_Width"), SwingConstants.CENTER), new UILabel(Toolkit.i18nText("Fine-Design_Basic_Tree_Height"), SwingConstants.CENTER))},
         };
         double[] rowSize = {p, p};
         double[] columnSize = {f, RIGHT_PANE_WIDTH};
-        int[][] rowCount = {{1, 1}, {1, 1}};
+        int[][] rowCount = ratioLocked != null ? new int[][]{{1, 1}, {1, 1, 1}} : new int[][]{{1, 1}, {1, 1}};
         final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W5, IntervalConstants.INTERVAL_L6);
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         boundsPane.add(panel);
         return new UIExpandablePane(Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"), 280, 24, boundsPane);
     }
 
+    public static UIExpandablePane createBoundsPane(UISpinner width, UISpinner height) {
+        return createBoundsPane(width, height, null);
+    }
+
     public static JPanel createRightPane(Component com1, Component com2) {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
@@ -74,21 +80,41 @@ public class WidgetBoundsPaneFactory {
         return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L1);
     }
 
-    public static UIExpandablePane createAbsoluteBoundsPane(UISpinner x, UISpinner y, UISpinner width, UISpinner height, NameAttribute nameAttribute) {
+    public static JPanel createRightPane(Component com1, Component com2, Component com3) {
+        double f = TableLayout.FILL;
+        double p = TableLayout.PREFERRED;
+        double[] rowSize = {p};
+        double[] columnSize = {f, 24, f};
+        int[][] rowCount = {{1, 1, 1}};
+        Component[][] components = new Component[][]{
+                new Component[]{com1, com2, com3}
+        };
+        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 0, IntervalConstants.INTERVAL_L1);
+    }
+
+    public static UIExpandablePane createAbsoluteBoundsPane(UISpinner x, UISpinner y, UISpinner width, UISpinner height, JComponent ratioLocked, NameAttribute nameAttribute) {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
 
+        UILabel positionLabel = FRWidgetFactory.createLineWrapLabel(nameAttribute.getPositionName());
+        UILabel xLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_X_Coordinate"), SwingConstants.CENTER);
+        UILabel yLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Y_Coordinate"), SwingConstants.CENTER);
+
+        UILabel sizeLabel = FRWidgetFactory.createLineWrapLabel(nameAttribute.getSizeName());
+        UILabel widthLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Tree_Width"), SwingConstants.CENTER);
+        UILabel heightLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Tree_Height"), SwingConstants.CENTER);
+
         Component[][] northComponents = new Component[][]{
-                new Component[]{FRWidgetFactory.createLineWrapLabel(nameAttribute.getPositionName()), createRightPane(x, y)},
+                new Component[]{positionLabel, ratioLocked != null ? createRightPane(x, null, y) :  createRightPane(x, y)},
-                new Component[]{null, createRightPane(new UILabel(Toolkit.i18nText("Fine-Design_Basic_X_Coordinate"), SwingConstants.CENTER), new UILabel(Toolkit.i18nText("Fine-Design_Basic_Y_Coordinate"), SwingConstants.CENTER))},
+                new Component[]{null,          ratioLocked != null ? createRightPane(xLabel, null, yLabel) : createRightPane(xLabel, yLabel)},
         };
         Component[][] centerComponents = new Component[][]{
-                new Component[]{FRWidgetFactory.createLineWrapLabel(nameAttribute.getSizeName()), createRightPane(width, height)},
+                new Component[]{sizeLabel, ratioLocked != null ? createRightPane(width, ratioLocked, height) : createRightPane(width, height)},
-                new Component[]{null, createRightPane(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Tree_Width"), SwingConstants.CENTER), new UILabel(Toolkit.i18nText("Fine-Design_Basic_Tree_Height"), SwingConstants.CENTER))},
+                new Component[]{null,      ratioLocked != null ? createRightPane(widthLabel, null, heightLabel) :  createRightPane(widthLabel, heightLabel)},
         };
         double[] rowSize = {p, p};
         double[] columnSize = {f, RIGHT_PANE_WIDTH};
-        int[][] rowCount = {{1, 1}, {1, 1}};
+        int[][] rowCount = ratioLocked != null ? new int[][]{{1, 1, 1}, {1, 1, 1}} : new int[][]{{1, 1}, {1, 1}};
         final JPanel northPanel = TableLayoutHelper.createGapTableLayoutPane(northComponents, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W5, IntervalConstants.INTERVAL_L6);
         final JPanel centerPanel = TableLayoutHelper.createGapTableLayoutPane(centerComponents, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W5, IntervalConstants.INTERVAL_L6);
         JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
@@ -99,6 +125,10 @@ public class WidgetBoundsPaneFactory {
         return new UIExpandablePane(Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"), 230, 24, boundsPane);
     }
 
+    public static UIExpandablePane createAbsoluteBoundsPane(UISpinner x, UISpinner y, UISpinner width, UISpinner height, NameAttribute nameAttribute) {
+        return createAbsoluteBoundsPane(x, y, width, height, null, nameAttribute);
+    }
+
     public static UIExpandablePane createAbsoluteBoundsPane(UISpinner x, UISpinner y, UISpinner width, UISpinner height) {
         return createAbsoluteBoundsPane(x, y, width, height, NameAttribute.DEFAULT);
     }

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

@@ -168,7 +168,7 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
         JPanel buttonPanel = FRGUIPaneFactory.createBorderLayout_M_Pane();
         buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
         boolean Sync = false;
-        if (Sync && isOnline()) {
+        if (isOnline() && Sync) {
             ignoreButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Sync_Ignore"));
             ignoreButton.addActionListener(this);
             syncButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Sync_To_Local"));
@@ -308,6 +308,7 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
         @Override
         public void mouseClicked(MouseEvent e) {
             ignoreButton.setEnabled(false);
+            syncButton.setEnabled(false);
             String[] option = {Toolkit.i18nText("Fine-Design_Report_Yes"), Toolkit.i18nText("Fine-Design_Report_No")};
             if (!jarConsistency) {
                 int a = FineJOptionPane.showOptionDialog(getParent(), Toolkit.i18nText("Fine-Design_Basic_Sync_Info_Information"),
@@ -349,6 +350,7 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
 
                     @Override
                     protected JSONArray doInBackground() {
+                        progressBar.setVisible(true);
                         progressBar.setString(Toolkit.i18nText("Fine-Design_Basic_Sync_Plugins"));
                         progressBar.setValue(0);
                         return VersionCheckUtils.syncPlugins(differentPlugins);

designer-base/src/main/java/com/fr/env/utils/DesignerInteractionHistory.java

@@ -0,0 +1,148 @@
+package com.fr.env.utils;
+
+import com.fr.common.annotations.Compatible;
+import com.fr.general.IOUtils;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.EncodeConstants;
+import com.fr.stable.ProductConstants;
+import com.fr.stable.StableUtils;
+import com.fr.stable.StringUtils;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLReadable;
+import com.fr.stable.xml.XMLTools;
+import com.fr.stable.xml.XMLWriter;
+import com.fr.stable.xml.XMLableReader;
+import com.fr.third.javax.xml.stream.XMLStreamException;
+
+import java.io.BufferedWriter;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * @author Starryi
+ * @version 10.0.18
+ * Created by Starryi on 2021/7/7
+ * 设计器访问和获取关键历史交互信息的持久化工具，该关键历史交互信息，
+ * 如用户是否点击过某按钮，是否查看过某弹窗信息，上次选择过的文件所在目录等
+ */
+@Compatible
+public class DesignerInteractionHistory implements XMLReadable, XMLWriter {
+
+    private static final String FILE_NAME = "designer.ix.history.info";
+    private static final String ROOT_TAG = "History";
+
+    private static DesignerInteractionHistory history;
+    public static DesignerInteractionHistory getInstance() {
+        if (history == null) {
+            history = new DesignerInteractionHistory();
+
+            readXMLFile(history, history.getHistoryFile());
+        }
+
+        return history;
+    }
+
+    private File getHistoryFile() {
+        return new File(StableUtils.pathJoin(ProductConstants.getEnvHome(), FILE_NAME));
+    }
+
+    private static void readXMLFile(XMLReadable xmlReadable, File xmlFile) {
+        if (xmlFile == null || !xmlFile.exists()) {
+            return;
+        }
+        String charset = EncodeConstants.ENCODING_UTF_8;
+        try {
+            String decodeContent = getFileContent(xmlFile);
+            InputStream xmlInputStream = new ByteArrayInputStream(decodeContent.getBytes(charset));
+            InputStreamReader inputStreamReader = new InputStreamReader(xmlInputStream, charset);
+
+            XMLableReader xmlReader = XMLableReader.createXMLableReader(inputStreamReader);
+
+            if (xmlReader != null) {
+                xmlReader.readXMLObject(xmlReadable);
+            }
+            xmlInputStream.close();
+        } catch (IOException | XMLStreamException e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+
+    }
+
+    private static String getFileContent(File xmlFile) throws FileNotFoundException, UnsupportedEncodingException {
+        InputStream encodeInputStream = new FileInputStream(xmlFile);
+        return IOUtils.inputStream2String(encodeInputStream);
+    }
+
+    private static void writeContentToFile(String fileContent, File file) {
+        try (FileOutputStream fos = new FileOutputStream(file);
+             OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
+             BufferedWriter bw = new BufferedWriter(osw)) {
+            bw.write(fileContent);
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+    }
+
+    public void saveXMLFile() {
+        File xmlFile = this.getHistoryFile();
+        try {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            XMLTools.writeOutputStreamXML(this, out);
+            out.flush();
+            out.close();
+            String fileContent = new String(out.toByteArray(), StandardCharsets.UTF_8);
+            writeContentToFile(fileContent, xmlFile);
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+    }
+
+
+    private static final String HAS_SHOWN_SHIFT_DRAG_RESIZING_TOOLTIP = "hasShownShiftDragResizingTooltip";
+    private static final String LAST_SELECTED_BORDER_IMAGE_DIR = "lastSelectedBorderImageDir";
+
+    // 是否已展示过按下Shift键可锁定比例拖拽尺寸的Tooltip
+    private boolean hasShownShiftDragResizingTooltip = false;
+    // 用户上次通过文件选择器选择的边框图片所在目录
+    private String lastSelectedBorderImageDir = StringUtils.EMPTY;
+
+    public boolean isHasShownShiftDragResizingTooltip() {
+        return hasShownShiftDragResizingTooltip;
+    }
+
+    public void setHasShownShiftDragResizingTooltip(boolean shown) {
+        this.hasShownShiftDragResizingTooltip = shown;
+    }
+
+    public String getLastSelectedBorderImageDir() {
+        return lastSelectedBorderImageDir;
+    }
+
+    public void setLastSelectedBorderImageDir(String dirPath) {
+        this.lastSelectedBorderImageDir = dirPath;
+    }
+
+    @Override
+    public void writeXML(XMLPrintWriter writer) {
+        writer.startTAG(ROOT_TAG)
+                .attr(HAS_SHOWN_SHIFT_DRAG_RESIZING_TOOLTIP, isHasShownShiftDragResizingTooltip())
+                .attr(LAST_SELECTED_BORDER_IMAGE_DIR, getLastSelectedBorderImageDir())
+                .end();
+    }
+
+    @Override
+    public void readXML(XMLableReader reader) {
+        setHasShownShiftDragResizingTooltip(reader.getAttrAsBoolean(HAS_SHOWN_SHIFT_DRAG_RESIZING_TOOLTIP, false));
+        setLastSelectedBorderImageDir(reader.getAttrAsString(LAST_SELECTED_BORDER_IMAGE_DIR, StringUtils.EMPTY));
+    }
+}

designer-chart/src/main/java/com/fr/design/chart/gui/ChartWidgetOption.java

@@ -1,10 +1,12 @@
 package com.fr.design.chart.gui;
 
 import com.fr.base.chart.BaseChartGetter;
+import com.fr.chart.chartattr.ChartCollection;
 import com.fr.design.gui.core.WidgetOption;
 import com.fr.form.ui.ChartEditor;
 import com.fr.form.ui.Widget;
 import com.fr.log.FineLoggerFactory;
+import com.fr.plugin.chart.vanchart.VanChart;
 
 import javax.swing.Icon;
 
@@ -37,7 +39,12 @@ public class ChartWidgetOption extends WidgetOption {
 		Class<? extends ChartEditor> clz = widgetClass();
 		try {
 			ChartEditor widget = clz.newInstance();
-			widget.resetChangeChartCollection(BaseChartGetter.createChartCollection(this.chartID));
+			ChartCollection chartCollection = (ChartCollection) BaseChartGetter.createChartCollection(this.chartID);
+			VanChart vanChart = chartCollection.getSelectedChartProvider(VanChart.class);
+			if (vanChart !=null) {
+                vanChart.resetAttrInForm();
+			}
+			widget.resetChangeChartCollection(chartCollection);
 			return widget;
 		} catch (InstantiationException e) {
 			FineLoggerFactory.getLogger().error(e.getMessage(), e);

designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java

@@ -20,6 +20,7 @@ import com.fr.design.mainframe.chart.gui.ChartOtherPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.ChartTypePane;
 import com.fr.design.mainframe.chart.info.ChartInfoCollector;
+import com.fr.form.main.Form;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.vanchart.VanChart;
@@ -168,6 +169,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange, Prepare
                 AbstractChartAttrPane[] otherPaneList = ChartTypeInterfaceManager.getInstance().getAttrPaneArray(chartID, listener);
                 for (int i = 0; i < otherPaneList.length; i++) {
                     otherPaneList[i].addAttributeChangeListener(listener);
+                    otherPaneList[i].registerChartEditPane(this);
                     paneList.add(otherPaneList[i]);
                 }
                 this.isDefaultPane = false;
@@ -366,4 +368,14 @@ public class ChartEditPane extends BasicPane implements AttributeChange, Prepare
             }
         });
     }
+
+    public boolean isInForm() {
+        if (container != null && container.getEPane() != null) {
+            Object target = container.getEPane().getTarget();
+            if (target instanceof Form) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

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

@@ -67,6 +67,8 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
         registerSupportChangeConfigChartClass(VanChart.class);
     }
 
+    private boolean inForm;
+
     private UIButton addButton;
     private UIButton configButton;
     private UIButton copyButton;
@@ -109,15 +111,10 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
         northPane.setLayout(new BorderLayout());
         northPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5));
 
-        JPanel addPanel = new JPanel();
-        addPanel.setLayout(new BorderLayout());
-        addPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 3));
-        addPanel.add(addButton, BorderLayout.CENTER);
-
         JPanel button = new JPanel();
-        button.setPreferredSize(new Dimension(95, 20));
+        button.setPreferredSize(new Dimension(89, 20));
-        button.setLayout(new GridLayout(1, 4, 0, 0));
+        button.setLayout(new GridLayout(1, 4, 3, 0));
-        button.add(addPanel);
+        button.add(addButton);
         button.add(copyButton);
         button.add(moveForwardButton);
         button.add(moveBackButton);
@@ -133,14 +130,11 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
         addButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
         configButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/config.png"));
         copyButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png"));
-        copyButton.setBorderPainted(false);
         copyButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Action_Copy"));
         moveForwardButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/control/left.png"));
         moveForwardButton.setToolTipText(Toolkit.i18nText("Fine-Design_Report_HF_Move_Left"));
-        moveForwardButton.setBorderPainted(false);
         moveBackButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/control/right.png"));
         moveBackButton.setToolTipText(Toolkit.i18nText("Fine-Design_Report_HF_Move_Right"));
-        moveBackButton.setBorderPainted(false);
         initAddButton();
         initConfigButton();
         initMoveButton();
@@ -160,10 +154,17 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
         addButton.addActionListener((e) -> {
             String name = getNewChartName();
             ChartProvider chart = getChangeStateNewChart();
+            checkInForm(chart);
             addNewChart(chart, name, editingCollection.getChartCount());
         });
     }
 
+    private void checkInForm(ChartProvider chart) {
+        if (inForm) {
+            chart.resetAttrInForm();
+        }
+    }
+
     private void initConfigButton() {
         configButton.setPreferredSize(new Dimension(20, 20));
         configButton.addActionListener((e) -> showConfigDialog());
@@ -303,7 +304,7 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
     }
 
     private String getCopyChartName() {
-        String chartName = "CopyOf" + editingCollection.getChartName(editingCollection.getSelectedIndex());
+        String chartName = editingCollection.getChartName(editingCollection.getSelectedIndex()) + "_Copy";
         if (!nameRepeated(chartName)) {
             return chartName;
         }
@@ -680,4 +681,8 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
             currentEditingEditor.requestFocus();
         }
     }
+
+    public void refreshChartInForm(boolean inForm) {
+        this.inForm = inForm;
+    }
 }

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

@@ -47,6 +47,7 @@ public class ChartTypePane extends AbstractChartAttrPane {
     private ChartEditPane editPane;
     private ChartCollection editingCollection;
     private ActionListener autoButtonListener;
+    private boolean inForm;
 
     @Override
     protected JPanel createContentPane() {
@@ -54,6 +55,7 @@ public class ChartTypePane extends AbstractChartAttrPane {
         JPanel content = new JPanel(new BorderLayout());
 
         buttonPane = new ChartTypeButtonPane(this);
+        buttonPane.refreshChartInForm(inForm);
         content.add(buttonPane, BorderLayout.NORTH);
 
         if (editingCollection != null) {
@@ -180,7 +182,9 @@ public class ChartTypePane extends AbstractChartAttrPane {
             }
             //这一步会替换plot
             ((AbstractChartTypePane) getSelectedPane()).updateBean(chart);
-
+            if (inForm) {
+                chart.resetAttrInForm();
+            }
             reLayoutEditPane(chart, lastPlotID);
         }
 
@@ -405,5 +409,6 @@ public class ChartTypePane extends AbstractChartAttrPane {
      */
     public void registerChartEditPane(ChartEditPane currentEditPane) {
         this.editPane = currentEditPane;
+        this.inForm = editPane.isInForm();
     }
 }

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

@@ -31,11 +31,11 @@ public class VanChartBubbleStylePane extends VanChartScatterStylePane {
     }
 
     @Override
-    protected void addVanChartAreaPane(List<BasicPane> paneList) {
+    protected VanChartAreaPane createVanChartAreaPane() {
         if (((VanChartBubblePlot) getChart().getPlot()).isForceBubble()) {
-            paneList.add(new VanChartForceBubbleAreaPane(getChart().getPlot(), VanChartBubbleStylePane.this));
+            return new VanChartForceBubbleAreaPane(getChart().getPlot(), VanChartBubbleStylePane.this);
         } else {
-            paneList.add(new VanChartAreaPane(getChart().getPlot(), VanChartBubbleStylePane.this));
+            return new VanChartAreaPane(getChart().getPlot(), VanChartBubbleStylePane.this);
         }
     }
 

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

@@ -11,6 +11,7 @@ import com.fr.plugin.chart.custom.VanChartCustomPlot;
 import com.fr.plugin.chart.custom.type.CustomPlotType;
 import com.fr.van.chart.designer.component.richText.VanChartRichEditorPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
+import com.fr.van.chart.designer.style.background.VanChartAreaPane;
 
 import java.util.List;
 
@@ -61,8 +62,8 @@ public class VanChartCustomStylePane extends VanChartStylePane {
 
 
     @Override
-    protected void addVanChartAreaPane(List<BasicPane> paneList) {
+    protected VanChartAreaPane createVanChartAreaPane() {
-        paneList.add(new VanChartCustomAreaPane(getChart().getPlot(), VanChartCustomStylePane.this));
+       return new VanChartCustomAreaPane(getChart().getPlot(), VanChartCustomStylePane.this);
     }
 
     @Override

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

@@ -423,7 +423,7 @@ public class PlotFactory {
 
     //大数据模式 恢复用注释。删除下面2个方法 largeDataModel lineMapLargeModel。
     public static boolean largeDataModel(Plot plot) {
-        return plot != null && plot.getDataProcessor().getMark() == LargeDataModel.MARK;
+        return plot != null && plot.isLargeDataModel();
     }
 
     public static boolean lineMapLargeModel(Plot plot) {

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

@@ -12,8 +12,8 @@ import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import javax.swing.border.Border;
-import java.awt.Component;
 import java.util.Arrays;
+import java.awt.Component;
 
 /**
  * 布局 标题+组件
@@ -54,13 +54,23 @@ public class TableLayout4VanChartHelper {
         return createGapTableLayoutPane(title, component, EDIT_AREA_WIDTH);
     }
 
+    public static JPanel createGapTableLayoutPaneWithoutTop(String title, Component component) {
+        return createGapTableLayoutPane(title, component, EDIT_AREA_WIDTH, false);
+    }
+
     public static JPanel createGapTableLayoutPane(String title, Component component, double componentWidth) {
+        return createGapTableLayoutPane(title, component, componentWidth, true);
+    }
+
+    public static JPanel createGapTableLayoutPane(String title, Component component, double componentWidth, boolean topLabel) {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double[] columnSize = {f, componentWidth};
         double[] rowSize = {p, p};
         UILabel label = FRWidgetFactory.createLineWrapLabel(title);
+        if (topLabel) {
             label.setVerticalAlignment(SwingConstants.TOP);
+        }
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
                 new Component[]{label, UIComponentUtils.wrapWithBorderLayoutPane(component)},
@@ -93,6 +103,7 @@ public class TableLayout4VanChartHelper {
 
     /**
      * 标题布局(二级菜单距左边框46)
+     *
      * @param title     标题
      * @param component 组件
      * @return 布局好的组件
@@ -103,6 +114,7 @@ public class TableLayout4VanChartHelper {
 
     /**
      * 标题布局(二级菜单距左边框46)
+     *
      * @param label     标题label
      * @param component 组件
      * @return 布局好的组件
@@ -113,6 +125,7 @@ public class TableLayout4VanChartHelper {
 
     /**
      * 标题布局(三级菜单距二级左侧20)
+     *
      * @param title     标题
      * @param component 组件
      * @return 布局好的组件
@@ -123,6 +136,7 @@ public class TableLayout4VanChartHelper {
 
     /**
      * 标题布局（指定gap）
+     *
      * @param title     标题
      * @param component 组件
      * @param gap       距左侧距离
@@ -134,6 +148,7 @@ public class TableLayout4VanChartHelper {
 
     /**
      * 标题布局（指定gap）
+     *
      * @param label     标题label
      * @param component 组件
      * @param gap       距左侧距离

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

@@ -8,15 +8,19 @@ import com.fr.chart.chartglyph.ConditionAttr;
 import com.fr.chart.chartglyph.ConditionCollection;
 import com.fr.chartx.attr.LargeDataModeType;
 import com.fr.design.formula.TinyFormulaPane;
+import com.fr.design.gui.frpane.UINumberDragPane;
+import com.fr.design.gui.frpane.UINumberDragPaneWithPercent;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.ispinner.UnsignedIntUISpinner;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.widget.FRWidgetFactory;
 import com.fr.plugin.chart.attr.axis.VanChartAxis;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot;
@@ -32,6 +36,8 @@ 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.type.AxisType;
+import com.fr.plugin.chart.type.ControlType;
 import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.stable.StableUtils;
 import com.fr.van.chart.custom.component.VanChartHyperLinkPane;
@@ -45,14 +51,15 @@ import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.BorderLayout;
+import java.awt.CardLayout;
 import java.awt.Component;
-import java.awt.event.ActionEvent;
+import java.awt.Dimension;
-import java.awt.event.ActionListener;
 
 public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
 
     private static final long serialVersionUID = 8135452818502145597L;
     private static final int AUTO_REFRESH_LEFT_GAP = 18;
+    private static final double PERCENT = 100.0;
 
     protected UICheckBox isSort;
     protected UICheckBox exportImages;
@@ -72,15 +79,20 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
     private AutoRefreshPane autoRefreshPane;
 
     //图表缩放新设计 恢复用注释。删除下面八行代码。
-    private UIButtonGroup zoomWidget;
+    private UICheckBox zoomWidget;
     protected UIButtonGroup zoomGesture;//地图手势缩放
-    private UIButtonGroup zoomResize;
-    private TinyFormulaPane from;
-    private TinyFormulaPane to;
     private UIButtonGroup<String> zoomType;
     private JPanel changeEnablePane;
     private JPanel zoomTypePane;
 
+    private UIButtonGroup<ControlType> controlType;
+    protected JPanel centerPane;
+    private UISpinner categoryNum;
+    private UINumberDragPane scaling;
+    private UIButtonGroup zoomResize;
+    private TinyFormulaPane from;
+    private TinyFormulaPane to;
+
     //图表缩放新设计 恢复用注释。取消注释。
     //private ZoomPane zoomPane;
 
@@ -126,7 +138,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
                 //new Component[]{createLargeDataModePane(), null},
                 new Component[]{createAnimationPane(), null},
                 new Component[]{createAxisRotationPane(new double[]{p, p}, columnSize, plot), null},
-                new Component[]{createZoomPane(new double[]{p, p, p}, columnSize, plot), null},
+                new Component[]{createZoomPane(plot), null},
                 new Component[]{createAutoRefreshPane(plot), null},
                 new Component[]{createHyperlinkPane(), null}
         };
@@ -172,7 +184,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
         return false;
     }
 
-    protected JPanel createZoomPane(double[] row, double[] col, VanChartPlot plot) {
+    protected JPanel createZoomPane(VanChartPlot plot) {
         //图表缩放新设计 恢复用注释。取消注释。
 //        zoomPane = createZoomPane();
 //        if (zoomPane == null) {
@@ -184,47 +196,118 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
         if (!plot.isSupportZoomDirection()) {
             return null;
         }
-        zoomWidget = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});
+        zoomWidget = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Open_Zoom_Control"));
-        zoomResize = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Change"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Non_Adjustment")});
+        zoomGesture = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Open"), Toolkit.i18nText("Fine-Design_Chart_Close")});
-        from = new TinyFormulaPane();
+        JPanel zoomWidgetPane = TableLayout4VanChartHelper.createGapTableLayoutPaneWithoutTop(Toolkit.i18nText("Fine-Design_Chart_Zoom_Widget"), zoomWidget);
-        to = new TinyFormulaPane();
+        JPanel zoomGesturePane = TableLayout4VanChartHelper.createGapTableLayoutPaneWithoutTop(Toolkit.i18nText("Fine-Design_Chart_ZoomGesture"), zoomGesture);
         zoomType = new UIButtonGroup(getNameArray(), getValueArray());
-        zoomGesture = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});
+        zoomTypePane = getZoomTypePane(zoomType);
 
-        JPanel zoomWidgetPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Zoom_Widget"), zoomWidget);
+        JPanel panel = createZoomPaneContent(zoomWidgetPane, zoomGesturePane, plot);
-        JPanel zoomGesturePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ZoomGesture"), zoomGesture);
+        zoomWidget.addActionListener((event) -> checkZoomPane());
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Use_Zoom"), panel);
+    }
 
-        Component[][] components = new Component[][]{
+    private void createChangeEnablePane(VanChartRectanglePlot plot) {
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Boundary")), zoomResize},
+        String scaleAxis = Toolkit.i18nText("Fine-Design_Chart_Scale_Axis");
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_From")), from},
+        String scroll = Toolkit.i18nText("Fine-Design_Chart_Scroll");
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_To")), to},
+        controlType = new UIButtonGroup<>(new String[]{scaleAxis, scroll}, ControlType.values());
+        JPanel scaleAxisPane = createScaleAxisPane();
+        JPanel scrollPane = createScrollPane(plot);
+
+        centerPane = new JPanel(new CardLayout()) {
+            @Override
+            public Dimension getPreferredSize() {
+                if (controlType.getSelectedItem() == ControlType.ZOOM) {
+                    return scaleAxisPane.getPreferredSize();
+                } else {
+                    return scrollPane.getPreferredSize();
+                }
+            }
         };
+        centerPane.add(scaleAxisPane, scaleAxis);
+        centerPane.add(scrollPane, scroll);
 
+        double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double e = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH;
         double[] columnSize = {f, e};
+        double[] row = {p, p};
+        Component[][] components = new Component[][]{
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Control_Type")), controlType},
+                new Component[]{centerPane, null}
+        };
         changeEnablePane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, columnSize);
-        changeEnablePane.setBorder(BorderFactory.createEmptyBorder(10, 12, 0, 0));
+        changeEnablePane.setBorder(BorderFactory.createEmptyBorder(5, 12, 0, 0));
-        zoomTypePane = getzoomTypePane(zoomType);
+
-        JPanel panel = createZoomPaneContent(zoomWidgetPane, zoomGesturePane, changeEnablePane, zoomTypePane, plot);
+        controlType.addActionListener((event) -> checkCardPane());
-        zoomWidget.addActionListener(new ActionListener() {
+    }
-            @Override
+
-            public void actionPerformed(ActionEvent e) {
+    private JPanel createScaleAxisPane() {
-                checkZoomPane();
+        zoomResize = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Change"), Toolkit.i18nText("Fine-Design_Chart_Non_Adjustment")});
+        from = new TinyFormulaPane();
+        to = new TinyFormulaPane();
+        Component[][] components = new Component[][]{
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Widget_Boundary")), zoomResize},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_From")), from},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_To")), to},
+        };
+
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH;
+        double[] columnSize = {f, e};
+        double[] row = {p, p, p};
+        JPanel resizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, columnSize);
+        return resizePane;
+    }
+
+
+    private JPanel createScrollPane(VanChartRectanglePlot plot) {
+        VanChartAxis vanChartAxis = plot.getCategoryAxisList().get(0);
+        AxisType axisType = vanChartAxis.getAxisType();
+
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH;
+        double[] columnSize = {f, e};
+        double[] row = {p};
+        Component[][] components;
+        if (axisType == AxisType.AXIS_CATEGORY) {
+            categoryNum = new UnsignedIntUISpinner(1, Double.MAX_VALUE, 1);
+            components = new Component[][]{
+                    new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Initial_Cate_Num")), categoryNum},
+            };
+        } else {
+            scaling = new UINumberDragPaneWithPercent(1, 100, 1);
+            components = new Component[][]{
+                    new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Scaling")), scaling},
+            };
+        }
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, columnSize);
+    }
+
+    protected void checkCardPane() {
+        if (centerPane != null && controlType != null) {
+            CardLayout cardLayout = (CardLayout) centerPane.getLayout();
+            if (controlType.getSelectedItem() == ControlType.ZOOM) {
+                cardLayout.show(centerPane, Toolkit.i18nText("Fine-Design_Chart_Scale_Axis"));
+            } else {
+                cardLayout.show(centerPane, Toolkit.i18nText("Fine-Design_Chart_Scroll"));
+            }
         }
-        });
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Zoom"), panel);
     }
 
     //图表缩放新设计 恢复用注释。删除下面八个方法getzoomTypePane createZoomPaneContent
     // checkZoomEnabled getNameArray getValueArray checkZoomPane populateChartZoom updateChartZoom。
-    protected JPanel getzoomTypePane(UIButtonGroup zoomType) {
+    protected JPanel getZoomTypePane(UIButtonGroup zoomType) {
-        return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Zoom_Direction"), zoomType);
+        return TableLayout4VanChartHelper.createGapTableLayoutPaneWithoutTop(Toolkit.i18nText("Fine-Design_Chart_Zoom_Direction"), zoomType);
     }
 
-    protected JPanel createZoomPaneContent(JPanel zoomWidgetPane, JPanel zoomGesturePane, JPanel changeEnablePane, JPanel zoomTypePane, VanChartPlot plot) {
+    protected JPanel createZoomPaneContent(JPanel zoomWidgetPane, JPanel zoomGesturePane, VanChartPlot plot) {
         JPanel panel = new JPanel(new BorderLayout(0, 4));
         if (plot.isSupportZoomCategoryAxis()) {//支持缩放控件
+            createChangeEnablePane((VanChartRectanglePlot) plot);
             panel.add(zoomWidgetPane, BorderLayout.NORTH);
             panel.add(changeEnablePane, BorderLayout.CENTER);
         }
@@ -236,17 +319,18 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
         if (zoomWidget != null && axisRotation != null) {
             if (axisRotation.getSelectedIndex() == 0) {
                 //只有开启坐标轴翻转，才需要将缩放控件强制关闭。
-                zoomWidget.setSelectedIndex(1);
+                zoomWidget.setSelected(false);
             }
             checkZoomPane();
             zoomWidget.setEnabled(axisRotation.getSelectedIndex() == 1);
         }
+        checkCardPane();
     }
 
 
     protected String[] getNameArray() {
-        return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Axis")
+        return new String[]{Toolkit.i18nText("Fine-Design_Chart_X_Axis"), Toolkit.i18nText("Fine-Design_Chart_Y_Axis")
-                , com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_XY_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")};
+                , Toolkit.i18nText("Fine-Design_Chart_XY_Axis"), Toolkit.i18nText("Fine-Design_Chart_Use_None")};
     }
 
     protected String[] getValueArray() {
@@ -256,9 +340,11 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
     }
 
     private void checkZoomPane() {
-        boolean zoomWidgetEnabled = zoomWidget.getSelectedIndex() == 0;
+        boolean zoomWidgetEnabled = zoomWidget.isSelected();
+        if (changeEnablePane != null) {
             changeEnablePane.setVisible(zoomWidgetEnabled);
-        zoomType.setEnabled(!zoomWidgetEnabled);
+        }
+        zoomTypePane.setVisible(!zoomWidgetEnabled);
     }
 
     private void populateChartZoom(VanChart chart) {
@@ -266,8 +352,13 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
         if (zoom == null) {
             zoom = new VanChartZoom();
         }
-        zoomWidget.setSelectedIndex(zoom.isZoomVisible() ? 0 : 1);
+        zoomWidget.setSelected(zoom.isZoomVisible());
         zoomGesture.setSelectedIndex(zoom.isZoomGesture() ? 0 : 1);
+        zoomType.setSelectedItem(zoom.getZoomType());
+
+        if (changeEnablePane != null) {
+            controlType.setSelectedItem(zoom.getControlType());
+
             zoomResize.setSelectedIndex(zoom.isZoomResize() ? 0 : 1);
             if (zoom.getFrom() instanceof BaseFormula) {
                 from.populateBean(((BaseFormula) zoom.getFrom()).getContent());
@@ -279,7 +370,13 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
             } else {
                 to.populateBean(Utils.objectToString(zoom.getTo()));
             }
-        zoomType.setSelectedItem(zoom.getZoomType());
+            if (categoryNum != null) {
+                categoryNum.setValue(zoom.getCategoryNum());
+            }
+            if (scaling != null) {
+                scaling.populateBean(zoom.getScaling() * PERCENT);
+            }
+        }
     }
 
     private void updateChartZoom(VanChart chart) {
@@ -288,8 +385,12 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
             zoom = new VanChartZoom();
             chart.setVanChartZoom(zoom);
         }
-        zoom.setZoomVisible(zoomWidget.getSelectedIndex() == 0);
+        zoom.setZoomVisible(zoomWidget.isSelected());
         zoom.setZoomGesture(zoomGesture.getSelectedIndex() == 0);
+        zoom.setZoomType(zoomType.getSelectedItem());
+        if (changeEnablePane != null) {
+            zoom.setControlType(controlType.getSelectedItem());
+            if (zoom.getControlType() == ControlType.ZOOM) {
                 zoom.setZoomResize(zoomResize.getSelectedIndex() == 0);
                 String fromString = from.updateBean();
                 Object fromObject;
@@ -307,7 +408,15 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
                     toObject = toString;
                 }
                 zoom.setTo(toObject);
-        zoom.setZoomType(zoomType.getSelectedItem());
+            } else {
+                if (categoryNum != null) {
+                    zoom.setCategoryNum((int) categoryNum.getValue());
+                }
+                if (scaling != null) {
+                    zoom.setScaling(scaling.updateBean() / PERCENT);
+                }
+            }
+        }
     }
 
     protected ZoomPane createZoomPane() {
@@ -467,7 +576,6 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
         //图表缩放新设计 恢复用注释。删除下面三行代码。
         if (plot.isSupportZoomDirection()) {//支持缩放方向=方向+控件
             populateChartZoom((VanChart) chart);
-            checkZoomPane();
         }
 
         if (plot.getAxisPlotType() == AxisPlotType.RECTANGLE) {

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

@@ -12,7 +12,7 @@ public class VanChartInteractivePaneWithMapZoom extends VanChartInteractivePaneW
 
     //图表缩放新设计 恢复用注释。删除下面方法 createZoomPaneContent。
     @Override
-    protected JPanel createZoomPaneContent(JPanel zoomWidgetPane, JPanel zoomGesturePane, JPanel changeEnablePane, JPanel zoomTypePane, VanChartPlot plot) {
+    protected JPanel createZoomPaneContent(JPanel zoomWidgetPane, JPanel zoomGesturePane, VanChartPlot plot) {
         JPanel panel = new JPanel(new BorderLayout(0, 4));
         panel.add(zoomWidgetPane, BorderLayout.NORTH);
         panel.add(zoomGesturePane, BorderLayout.CENTER);

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

@@ -3,6 +3,7 @@ package com.fr.van.chart.designer.style;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.plugin.chart.attr.plot.VanChartAxisPlot;
 import com.fr.van.chart.designer.component.richText.VanChartRichEditorPane;
@@ -19,14 +20,20 @@ public class VanChartStylePane extends ChartStylePane {
 
     private static final long serialVersionUID = 186776958263021761L;
 
+    private ChartEditPane chartEditPane;
+
     public VanChartStylePane(AttributeChangeListener listener) {
         super(listener);
     }
 
-    protected java.util.List<BasicPane> getPaneList() {
+    protected List<BasicPane> getPaneList() {
-        java.util.List<BasicPane> paneList = new ArrayList<BasicPane>();
+        List<BasicPane> paneList = new ArrayList<BasicPane>();
         Plot plot = getChart().getPlot();
-        paneList.add(createVanChartTitlePane());
+
+        boolean inForm = chartEditPane != null ? chartEditPane.isInForm() : false;
+        VanChartTitlePane vanChartTitlePane = createVanChartTitlePane();
+        vanChartTitlePane.refreshTooltipLabel(inForm);
+        paneList.add(vanChartTitlePane);
         if (plot.isSupportLegend()) {
             paneList.add(new VanChartLegendPane(VanChartStylePane.this));
         }
@@ -47,7 +54,9 @@ public class VanChartStylePane extends ChartStylePane {
             }
         }
 
-        addVanChartAreaPane(paneList);
+        VanChartAreaPane vanChartAreaPane = createVanChartAreaPane();
+        vanChartAreaPane.refreshTooltipLabel(inForm);
+        paneList.add(vanChartAreaPane);
 
         addVanChartTooltipPane(paneList);
 
@@ -61,8 +70,8 @@ public class VanChartStylePane extends ChartStylePane {
     protected void addOtherAxisPane(java.util.List<BasicPane> paneList, Plot plot) {
     }
 
-    protected void addVanChartAreaPane(List<BasicPane> paneList) {
+    protected VanChartAreaPane createVanChartAreaPane() {
-        paneList.add(new VanChartAreaPane(getChart().getPlot(), VanChartStylePane.this));
+        return new VanChartAreaPane(getChart().getPlot(), VanChartStylePane.this);
     }
 
     protected void createVanChartAxisPane(List<BasicPane> paneList, VanChartAxisPlot plot) {
@@ -80,4 +89,9 @@ public class VanChartStylePane extends ChartStylePane {
     public void refreshTableFieldNames() {
         VanChartRichEditorPane.refreshCommonChartFieldNames(getChart());
     }
+
+    public void registerChartEditPane(ChartEditPane currentEditPane) {
+        this.chartEditPane = currentEditPane;
+    }
+
 }

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

@@ -13,6 +13,7 @@ import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
@@ -36,6 +37,7 @@ import javax.swing.SwingConstants;
 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.Point;
 import java.awt.event.ActionEvent;
@@ -69,6 +71,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
     private JPanel maxProportionPane;
     //区域显示策略 恢复用注释。取消注释。
     //private LimitPane limitPane;
+    private UILabel tooltipLabel;
 
     protected VanChartStylePane parent;
 
@@ -88,21 +91,30 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
         }
 
         private void initComponents() {
-            isTitleVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Title_Visible"));
+            isTitleVisible = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Title_Visible"));
-            titlePane = createTitlePane();
+            tooltipLabel = new UILabel("<html>" + Toolkit.i18nText("Fine-Design_Chart_Title_Tooltip") + "</html>");
+            tooltipLabel.setForeground(Color.gray);
+            tooltipLabel.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10));
+            tooltipLabel.setVisible(false);
+
+            JPanel panel = new JPanel();
+            panel.setLayout(new BorderLayout());
+            panel.add(isTitleVisible, BorderLayout.NORTH);
+            panel.add(tooltipLabel, BorderLayout.CENTER);
 
+            titlePane = createTitlePane();
             double p = TableLayout.PREFERRED;
             double f = TableLayout.FILL;
             double[] columnSize = {f};
             double[] rowSize = {p, p, p};
             Component[][] components = new Component[][]{
-                    new Component[]{isTitleVisible},
+                    new Component[]{panel},
                     new Component[]{titlePane}
             };
 
-            JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+            JPanel panel1 = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
             this.setLayout(new BorderLayout());
-            this.add(panel, BorderLayout.CENTER);
+            this.add(panel1, BorderLayout.CENTER);
 
             isTitleVisible.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
@@ -370,4 +382,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
         ChartInfoCollector.getInstance().updateChartConfig(chart, ConfigType.TITLE, chart.getBuryingPointTitleConfig());
     }
 
+    public void refreshTooltipLabel(boolean inForm) {
+        tooltipLabel.setVisible(inForm);
+    }
 }

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

@@ -293,7 +293,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
                     DateEditor dateEditor = (DateEditor)minValueField.getCurrentEditor();
                     String dateString = dateEditor.getUIDatePickerFormat().format(datetmp);
                     timeAxis.setCustomMinValue(StringUtils.isNotEmpty(dateString));
-                    timeAxis.setMinValue(BaseFormula.createFormulaBuilder().build(dateString));
+                    timeAxis.setMinValue(createDataFormula(dateString));
                 }
             } else {
                 timeAxis.setCustomMinValue(false);
@@ -308,7 +308,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
                     DateEditor dateEditor = (DateEditor)maxValueField.getCurrentEditor();
                     String dateString = dateEditor.getUIDatePickerFormat().format(datetmp);
                     timeAxis.setCustomMaxValue(StringUtils.isNotEmpty(dateString));
-                    timeAxis.setMaxValue(BaseFormula.createFormulaBuilder().build(dateString));
+                    timeAxis.setMaxValue(createDataFormula(dateString));
                 }
             } else {
                 timeAxis.setCustomMaxValue(false);
@@ -332,6 +332,11 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
             checkBoxUse();
         }
 
+        private BaseFormula createDataFormula(String dateString) {
+            String formulaString = "\"" + dateString + "\"";
+            return BaseFormula.createFormulaBuilder().build(formulaString);
+        }
+
         public void populate(VanChartTimeAxis timeAxis){
             // 最小值
             if (timeAxis.isCustomMinValue() && timeAxis.getMinValue() != null) {

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

@@ -3,6 +3,8 @@ package com.fr.van.chart.designer.style.background;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
+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.PaneTitleConstants;
@@ -12,8 +14,10 @@ import com.fr.van.chart.designer.component.background.VanChartBackgroundPane;
 import com.fr.van.chart.designer.component.border.VanChartBorderWithRadiusPane;
 import com.fr.van.chart.designer.style.background.radar.VanChartRadarAxisAreaPane;
 
+import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Component;
 
 //图表区|绘图区 边框和背景
@@ -25,6 +29,7 @@ public class VanChartAreaBackgroundPane extends AbstractVanChartScrollPane<Chart
     private VanChartAxisAreaPane chartAxisAreaPane;
 
     private JPanel contentPane;
+    private UILabel tooltipLabel;
 
     private boolean isPlot;//绘图区
 
@@ -58,6 +63,14 @@ public class VanChartAreaBackgroundPane extends AbstractVanChartScrollPane<Chart
         };
         JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
         contentPane.add(panel, BorderLayout.CENTER);
+
+        if (!isPlot) {
+            tooltipLabel = new UILabel("<html>" + Toolkit.i18nText("Fine-Design_Chart_Background_Tooltip") + "</html>");
+            tooltipLabel.setForeground(Color.gray);
+            tooltipLabel.setBorder(BorderFactory.createEmptyBorder(0, 10, 5, 10));
+            contentPane.add(tooltipLabel, BorderLayout.NORTH);
+            tooltipLabel.setVisible(false);
+        }
         return contentPane;
     }
 
@@ -104,6 +117,7 @@ public class VanChartAreaBackgroundPane extends AbstractVanChartScrollPane<Chart
 
     /**
      * 标题
+     *
      * @return 标题
      */
     public String title4PopupWindow() {
@@ -157,4 +171,8 @@ public class VanChartAreaBackgroundPane extends AbstractVanChartScrollPane<Chart
     public Chart updateBean() {
         return null;
     }
+
+    public void refreshTooltipLabel(boolean inForm) {
+        tooltipLabel.setVisible(inForm);
+    }
 }

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

@@ -50,6 +50,7 @@ public class VanChartAreaPane extends ThirdTabPane<VanChart> implements AutoSele
 
     /**
      * 界面 使用标题
+     *
      * @return 标题
      */
     public String title4PopupWindow() {
@@ -111,4 +112,10 @@ public class VanChartAreaPane extends ThirdTabPane<VanChart> implements AutoSele
             }
         }
     }
+
+    public void refreshTooltipLabel(boolean inForm) {
+        if (areaPane != null) {
+            areaPane.refreshTooltipLabel(inForm);
+        }
+    }
 }

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

@@ -42,7 +42,7 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
         Component[][] components = new Component[][]{
                 new Component[]{createToolBarPane(new double[]{p, p, p}, columnSize), null},
                 new Component[]{createAnimationPane(), null},
-                new Component[]{createZoomPane(new double[]{p, p, p}, columnSize, plot), null},
+                new Component[]{createZoomPane(plot), null},
                 new Component[]{createDrillToolsPane(), null},
                 new Component[]{createAutoRefreshPane(plot), null},
                 new Component[]{createHyperlinkPane(), null}

designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/SeriesTypeUseComboxPaneWithOutFilter.java

@@ -26,6 +26,7 @@ public class SeriesTypeUseComboxPaneWithOutFilter extends SeriesTypeUseComboxPan
     protected void initComponents() {
         super.initComponents();
         this.setSelectedIndex(1);
+        this.checkCardPane();
     }
 
     @Override

designer-form/src/main/java/com/fr/design/designer/beans/events/DesignerEditor.java

@@ -1,5 +1,6 @@
 package com.fr.design.designer.beans.events;
 
+import com.fr.form.ui.PaddingMargin;
 import com.fr.stable.core.PropertyChangeAdapter;
 import com.fr.stable.core.PropertyChangeListener;
 import com.fr.design.utils.gui.LayoutUtils;
@@ -76,6 +77,28 @@ public class DesignerEditor<T extends JComponent> implements PropertyChangeListe
 		}
 	}
 
+	public void paintEditor(Graphics g, Dimension size, PaddingMargin margin) {
+		if (this.comp != null) {
+			int marginLeft = margin != null ? margin.getLeft() : 0;
+			int marginTop = margin != null ? margin.getTop() : 0;
+			int marginRight = margin != null ? margin.getRight() : 0;
+			int marginBottom = margin != null ? margin.getBottom() : 0;
+			int horizonMargin = marginLeft + marginRight;
+			int verticalMargin = marginTop + marginBottom;
+
+			int x = 1 + marginLeft;
+			int y = 1 + marginTop;
+			int width = size.width - 2 - horizonMargin;
+			int height = size.height - 2 - verticalMargin;
+
+			comp.setSize(new Dimension(width, height));
+			LayoutUtils.layoutContainer(comp);
+			comp.setBounds(comp.getX() + x, comp.getY() + y, width, height);
+			Graphics clipg = g.create(x, y, width, height);
+			this.comp.paint(clipg);
+		}
+	}
+
 	public T getEditorTarget() {
 		return comp;
 	}

designer-form/src/main/java/com/fr/design/designer/beans/location/AccessDirection.java

@@ -5,13 +5,17 @@ package com.fr.design.designer.beans.location;
 
 import com.fr.design.beans.location.Absorptionline;
 import com.fr.design.beans.location.MoveUtils;
-import com.fr.design.designer.creator.*;
+import com.fr.design.designer.creator.XCreatorUtils;
+import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.designer.creator.XWAbsoluteLayout;
+import com.fr.design.designer.creator.XWBorderLayout;
+import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormSelection;
 import com.fr.design.utils.ComponentUtils;
+import com.fr.env.utils.DesignerInteractionHistory;
 import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
-import com.fr.form.ui.container.WParameterLayout;
 
 import java.awt.*;
 
@@ -193,8 +197,29 @@ public abstract class AccessDirection implements Direction {
 		if (type != formEditor.getCursor().getType()) {
 			// 设置当前形状
 			formEditor.setCursor(Cursor.getPredefinedCursor(type));
+
+			// 显示/改变Tooltip
+            showTooltip(formEditor);
+		}
+	}
+
+	private void showTooltip(FormDesigner formEditor) {
+        // 显示拖拽改变组件尺寸相关的提示信息
+        int cursorType = formEditor.getCursor().getType();
+        if (Cursor.SW_RESIZE_CURSOR <= cursorType && cursorType <= Cursor.E_RESIZE_CURSOR) {
+            FormSelection selection = formEditor.getSelectionModel().getSelection();
+            boolean canLockAspectRatioOnlyByShift = !selection.isCreatorAspectRatioLockedInAbsLayout(formEditor) && selection.isCreatorInAbsLayout(formEditor);
+            DesignerInteractionHistory history = DesignerInteractionHistory.getInstance();
+            if (canLockAspectRatioOnlyByShift && !history.isHasShownShiftDragResizingTooltip()) {
+                formEditor.setToolTipText(getTooltip());
+                history.setHasShownShiftDragResizingTooltip(true);
             }
         }
+    }
+
+	public String getTooltip() {
+	    return null;
+    }
 	
 	/**
 	 * 生成组件备用的bound

designer-form/src/main/java/com/fr/design/designer/beans/location/Bottom.java

@@ -15,6 +15,12 @@ public class Bottom extends AccessDirection {
 			Rectangle oldbounds) {
 		current_bounds.height = sorption(0, oldbounds.height + dy + oldbounds.y, current_bounds, designer)[1]
 				- oldbounds.y;
+
+        if (designer.getStateModel().isAspectRatioLocked()) {
+            Rectangle backupBounds = designer.getSelectionModel().getSelection().getBackupBounds();
+            current_bounds.width = (int) (backupBounds.width * current_bounds.height / backupBounds.height * 1.0);
+        }
+
 		return current_bounds;
 	}
 
@@ -23,6 +29,11 @@ public class Bottom extends AccessDirection {
         return Cursor.S_RESIZE_CURSOR;
     }
 
+    @Override
+    public String getTooltip() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Lock_Aspect_Ratio_Mouse_ToolTip");
+    }
+
     @Override
     public int getActual() {
         return Direction.BOTTOM;

designer-form/src/main/java/com/fr/design/designer/beans/location/Left.java

@@ -15,6 +15,12 @@ public class Left extends AccessDirection  {
 			Rectangle oldbounds) {
 		current_bounds.x = sorption(oldbounds.x + dx, 0, current_bounds, designer)[0];
 		current_bounds.width = oldbounds.width - current_bounds.x + oldbounds.x;
+
+        if (designer.getStateModel().isAspectRatioLocked()) {
+            Rectangle backupBounds = designer.getSelectionModel().getSelection().getBackupBounds();
+            current_bounds.height = (int) (backupBounds.height * current_bounds.width / backupBounds.width * 1.0);
+        }
+
 		return current_bounds;
 	}
 
@@ -23,6 +29,11 @@ public class Left extends AccessDirection  {
         return Cursor.W_RESIZE_CURSOR;
     }
 
+    @Override
+    public String getTooltip() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Lock_Aspect_Ratio_Mouse_ToolTip");
+    }
+
      @Override
     public int getActual() {
         return Direction.LEFT;

designer-form/src/main/java/com/fr/design/designer/beans/location/LeftBottom.java

@@ -17,6 +17,21 @@ public class LeftBottom extends AccessDirection  {
 		current_bounds.x = xy[0];
 		current_bounds.width = oldbounds.width - current_bounds.x + oldbounds.x;
 		current_bounds.height = xy[1] - oldbounds.y;
+
+        if (designer.getStateModel().isAspectRatioLocked()) {
+            Rectangle backupBounds = designer.getSelectionModel().getSelection().getBackupBounds();
+            double current_diagonal = Math.pow(current_bounds.width, 2) + Math.pow(current_bounds.height, 2);
+            double backup_diagonal = Math.pow(backupBounds.width, 2) + Math.pow(backupBounds.height, 2);
+
+            int width = (int) (Math.sqrt((current_diagonal / backup_diagonal) * (Math.pow(backupBounds.width, 2))));
+            int height = (int) (Math.sqrt((current_diagonal / backup_diagonal) * (Math.pow(backupBounds.height, 2))));
+
+            int currentRight = current_bounds.x + current_bounds.width;
+            current_bounds.width = width;
+            current_bounds.height = height;
+            current_bounds.x = currentRight - width;
+        }
+
 		return current_bounds;
 	}
 
@@ -25,6 +40,11 @@ public class LeftBottom extends AccessDirection  {
         return Cursor.SW_RESIZE_CURSOR;
     }
 
+    @Override
+    public String getTooltip() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Lock_Aspect_Ratio_Mouse_ToolTip");
+    }
+
      @Override
     public int getActual() {
         return Direction.LEFT_BOTTOM;

designer-form/src/main/java/com/fr/design/designer/beans/location/LeftTop.java

@@ -6,6 +6,7 @@ import java.awt.Rectangle;
 import com.fr.design.mainframe.FormDesigner;
 
 public class LeftTop extends AccessDirection {
+
     public LeftTop() {
     }
 
@@ -17,6 +18,23 @@ public class LeftTop extends AccessDirection {
         current_bounds.y = xy[1];
         current_bounds.width = oldbounds.width - current_bounds.x + oldbounds.x;
         current_bounds.height = oldbounds.height - current_bounds.y + oldbounds.y;
+
+        if (designer.getStateModel().isAspectRatioLocked()) {
+            Rectangle backupBounds = designer.getSelectionModel().getSelection().getBackupBounds();
+            double current_diagonal = Math.pow(current_bounds.width, 2) + Math.pow(current_bounds.height, 2);
+            double backup_diagonal = Math.pow(backupBounds.width, 2) + Math.pow(backupBounds.height, 2);
+
+            int width = (int) (Math.sqrt((current_diagonal / backup_diagonal) * (Math.pow(backupBounds.width, 2))));
+            int height = (int) (Math.sqrt((current_diagonal / backup_diagonal) * (Math.pow(backupBounds.height, 2))));
+
+            int currentRight = current_bounds.x + current_bounds.width;
+            int currentBottom = current_bounds.y + current_bounds.height;
+            current_bounds.width = width;
+            current_bounds.height = height;
+            current_bounds.x = currentRight - width;
+            current_bounds.y = currentBottom - height;
+        }
+
         return current_bounds;
     }
 
@@ -25,6 +43,11 @@ public class LeftTop extends AccessDirection {
         return Cursor.NW_RESIZE_CURSOR;
     }
 
+    @Override
+    public String getTooltip() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Lock_Aspect_Ratio_Mouse_ToolTip");
+    }
+
      @Override
     public int getActual() {
         return Direction.LEFT_TOP;

designer-form/src/main/java/com/fr/design/designer/beans/location/Right.java

@@ -3,7 +3,9 @@ package com.fr.design.designer.beans.location;
 import java.awt.Cursor;
 import java.awt.Rectangle;
 
+import com.fr.design.designer.creator.XCreator;
 import com.fr.design.mainframe.FormDesigner;
+import com.fr.form.ui.Widget;
 
 public class Right extends AccessDirection  {
 
@@ -15,6 +17,12 @@ public class Right extends AccessDirection  {
 			Rectangle oldbounds) {
 		current_bounds.width = sorption(oldbounds.x + dx + oldbounds.width, 0, current_bounds, designer)[0]
 				- oldbounds.x;
+
+        if (designer.getStateModel().isAspectRatioLocked()) {
+            Rectangle backupBounds = designer.getSelectionModel().getSelection().getBackupBounds();
+            current_bounds.height = (int) (backupBounds.height * current_bounds.width / backupBounds.width * 1.0);
+        }
+
 		return current_bounds;
 	}
 
@@ -23,6 +31,11 @@ public class Right extends AccessDirection  {
         return Cursor.E_RESIZE_CURSOR;
     }
 
+    @Override
+    public String getTooltip() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Lock_Aspect_Ratio_Mouse_ToolTip");
+    }
+
      @Override
     public int getActual() {
         return Direction.RIGHT;

designer-form/src/main/java/com/fr/design/designer/beans/location/RightBottom.java

@@ -16,6 +16,19 @@ public class RightBottom extends AccessDirection {
 		int[] xy = sorption(oldbounds.x + dx + oldbounds.width, oldbounds.height + dy + oldbounds.y, current_bounds, designer);
         current_bounds.width = xy[0] - oldbounds.x;
         current_bounds.height = xy[1] - oldbounds.y;
+
+        if (designer.getStateModel().isAspectRatioLocked()) {
+            Rectangle backupBounds = designer.getSelectionModel().getSelection().getBackupBounds();
+            double current_diagonal = Math.pow(current_bounds.width, 2) + Math.pow(current_bounds.height, 2);
+            double backup_diagonal = Math.pow(backupBounds.width, 2) + Math.pow(backupBounds.height, 2);
+
+            int width = (int) (Math.sqrt((current_diagonal / backup_diagonal) * (Math.pow(backupBounds.width, 2))));
+            int height = (int) (Math.sqrt((current_diagonal / backup_diagonal) * (Math.pow(backupBounds.height, 2))));
+
+            current_bounds.width = width;
+            current_bounds.height = height;
+        }
+
         return current_bounds;
     }
 
@@ -24,6 +37,11 @@ public class RightBottom extends AccessDirection {
         return Cursor.SE_RESIZE_CURSOR;
     }
 
+    @Override
+    public String getTooltip() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Lock_Aspect_Ratio_Mouse_ToolTip");
+    }
+
      @Override
     public int getActual() {
         return Direction.RIGHT_BOTTOM;

designer-form/src/main/java/com/fr/design/designer/beans/location/RightTop.java

@@ -16,6 +16,21 @@ public class RightTop extends AccessDirection {
 		current_bounds.y = xy[1];
 		current_bounds.height = oldbounds.height - current_bounds.y + oldbounds.y;
 		current_bounds.width = xy[0] - oldbounds.x;
+
+        if (designer.getStateModel().isAspectRatioLocked()) {
+            Rectangle backupBounds = designer.getSelectionModel().getSelection().getBackupBounds();
+            double current_diagonal = Math.pow(current_bounds.width, 2) + Math.pow(current_bounds.height, 2);
+            double backup_diagonal = Math.pow(backupBounds.width, 2) + Math.pow(backupBounds.height, 2);
+
+            int width = (int) (Math.sqrt((current_diagonal / backup_diagonal) * (Math.pow(backupBounds.width, 2))));
+            int height = (int) (Math.sqrt((current_diagonal / backup_diagonal) * (Math.pow(backupBounds.height, 2))));
+
+            int currentBottom = current_bounds.y + current_bounds.height;
+            current_bounds.width = width;
+            current_bounds.height = height;
+            current_bounds.y = currentBottom - height;
+        }
+
 		return current_bounds;
 	}
 
@@ -24,6 +39,11 @@ public class RightTop extends AccessDirection {
         return Cursor.NE_RESIZE_CURSOR;
     }
 
+    @Override
+    public String getTooltip() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Lock_Aspect_Ratio_Mouse_ToolTip");
+    }
+
      @Override
     public int getActual() {
         return Direction.RIGHT_TOP;

designer-form/src/main/java/com/fr/design/designer/beans/location/Top.java

@@ -15,6 +15,12 @@ public class Top extends AccessDirection {
 			Rectangle oldbounds) {
 		current_bounds.y = sorption(0, dy + oldbounds.y, current_bounds, designer)[1];
 		current_bounds.height = oldbounds.height - current_bounds.y + oldbounds.y;
+
+        if (designer.getStateModel().isAspectRatioLocked()) {
+            Rectangle backupBounds = designer.getSelectionModel().getSelection().getBackupBounds();
+            current_bounds.width = (int) (backupBounds.width * current_bounds.height / backupBounds.height * 1.0);
+        }
+
 		return current_bounds;
 	}
 
@@ -23,6 +29,11 @@ public class Top extends AccessDirection {
         return Cursor.N_RESIZE_CURSOR;
     }
 
+    @Override
+    public String getTooltip() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Lock_Aspect_Ratio_Mouse_ToolTip");
+    }
+
      @Override
     public int getActual() {
         return Direction.TOP;

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

@@ -30,6 +30,7 @@ import com.fr.design.utils.ComponentUtils;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.stable.ArrayUtils;
+import com.fr.stable.StringUtils;
 
 import java.awt.LayoutManager;
 import java.awt.Rectangle;
@@ -83,7 +84,14 @@ public class SelectionModel {
         XCreator comp = designer.getComponentAt(e);
         if (e.getButton() == MouseEvent.BUTTON3 || (!InputEventBaseOnOS.isControlDown(e) && !e.isShiftDown())) {
             // 如果Ctrl或者Shift键盘没有按下，则清除已经选择的组件
+            XCreator selectXCreator = selection.getSelectedCreator();
+            if (selectXCreator != null && comp != null) {
+                if (StringUtils.equals(selectXCreator.toData().getWidgetName(), comp.toData().getWidgetName())) {
+                    return;
+                }
+            }
             selection.reset();
+
         } else {
             //按下Ctrl或者shift键时鼠标可以进行多选,两次点击同一控件就取消选中
             XLayoutContainer topLayout = XCreatorUtils.getHotspotContainer(comp).getTopLayout();

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

@@ -15,6 +15,7 @@ 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.mainframe.FormDesigner;
+import com.fr.design.mainframe.FormSelection;
 import com.fr.design.mainframe.FormSelectionUtils;
 import com.fr.design.utils.ComponentUtils;
 
@@ -55,6 +56,8 @@ public class StateModel {
     // 当前是否处于拖拽选择状态
     private boolean selecting;
     private boolean dragging;
+    // 拖拽时需要保持组件尺寸比例
+    private boolean aspectRatioLocked;
 
     private boolean addable;
 
@@ -83,6 +86,10 @@ public class StateModel {
         return selecting;
     }
 
+    public boolean isAspectRatioLocked() {
+        return  this.aspectRatioLocked;
+    }
+
     /**
      * 是否能拖拽
      *
@@ -393,6 +400,7 @@ public class StateModel {
      * 重置model
      */
     public void resetModel() {
+        aspectRatioLocked = false;
         dragging = false;
         selecting = false;
     }
@@ -402,6 +410,7 @@ public class StateModel {
      */
     public void reset() {
         driection = Location.outer;
+        aspectRatioLocked = false;
         dragging = false;
         selecting = false;
     }
@@ -482,6 +491,10 @@ public class StateModel {
         }
         checkAddable(e);
         setDependLinePainter(e);
+
+        FormSelection selection = this.selectionModel.getSelection();
+        this.aspectRatioLocked = selection.isCreatorAspectRatioLockedInAbsLayout(designer)  ||
+                (this.selectionModel.getSelection().isCreatorInAbsLayout(designer) && e.isShiftDown());
         driection.drag(getMouseXY(e).x - currentX, getMouseXY(e).y - currentY, designer);
         this.dragging = true;
     }
@@ -508,6 +521,7 @@ public class StateModel {
      * @param e 鼠标事件
      */
     public void releaseDragging(MouseEvent e) {
+        this.aspectRatioLocked = false;
         this.dragging = false;
         if (addable) {
             adding(e.getX(), e.getY());

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

@@ -18,8 +18,7 @@ import com.fr.stable.bridge.StableFactory;
 
 import javax.swing.JComponent;
 import javax.swing.JPanel;
-import java.awt.Dimension;
+import java.awt.*;
-import java.awt.Graphics;
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
 
@@ -102,7 +101,8 @@ public class XAutoChartCreator extends XChartEditor {
     }
 
 
-    public void paint(Graphics g) {
+    @Override
+    public void paintForeground(Graphics2D g) {
         BufferedImage bufferedImage = IOUtils.readImage("com/fr/design/form/images/auto_chart_preview.png");
         GraphHelper.paintImage(
                 g, this.getWidth(), this.getHeight(), bufferedImage,
@@ -110,7 +110,7 @@ public class XAutoChartCreator extends XChartEditor {
                 0,
                 0, -1, -1
         );
-        super.paint(g);
+        super.paintForeground(g);
     }
 
     private void initChart(BaseChartCollection chartCollection) {

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

@@ -11,6 +11,7 @@ import com.fr.form.ui.Widget;
 import com.fr.form.ui.WidgetTitle;
 import com.fr.form.ui.WidgetValue;
 import com.fr.form.ui.container.WTitleLayout;
+import com.fr.general.Background;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.act.BorderPacker;
 import com.fr.general.act.TitlePacker;
@@ -18,7 +19,11 @@ import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
+import javax.swing.border.Border;
+import javax.swing.border.LineBorder;
 import java.awt.*;
+import java.awt.geom.Rectangle2D;
+import java.awt.geom.RoundRectangle2D;
 
 /**
  * Created with IntelliJ IDEA.
@@ -29,6 +34,7 @@ import java.awt.*;
 
 public class XBorderStyleWidgetCreator extends XWidgetCreator{
 	protected static final Dimension BORDER_PREFERRED_SIZE = new Dimension(250, 150);
+	protected Background background4Painting;	// 设计器预览界面中绘制组件背景图
 
     public XBorderStyleWidgetCreator(Widget widget, Dimension initSize) {
         super(widget, initSize);
@@ -39,6 +45,15 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 		}
     }
 
+	public Background getBackground4Painting() {
+		return this.background4Painting;
+	}
+
+	public void setBackground4Painting(Background background4Painting) {
+		this.background4Painting = background4Painting;
+		this.repaint();
+	}
+
 	/**
 	 * 返回容器对应的widget
 	 * @return 同上
@@ -48,24 +63,47 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
         return (AbstractBorderStyleWidget) data;
     }
 
+	@Override
+	protected void addToWrapper(XLayoutContainer parentPanel, int width, int minHeight) {
+		super.addToWrapper(parentPanel, width, minHeight);
+		// REPORT-53175: 新创建的图表组件默认显示标题 since 10.0.18
+		// 将当前对象添加到父容器后，初始化默认样式的效果
+		initStyle();
+	}
+
 	protected void initStyle() {
     	BorderPacker style = toData().getBorderStyle();
-     	initBorderStyle();
+     	initBorderAndBackgroundStyle();
         if (ComparatorUtils.equals(style.getType(), LayoutBorderStyle.TITLE)) {
           	initTitleStyle(style);
         } else {
         	clearTitleWidget();
          }
+
+        // 编辑右侧栏组件样式面板后，重新调整组件/标题/边框的显示效果
+		reshuffleBorderAndBackgroundPaintingEffectIfTitleExists();
      }
 
-  // 边框默认值设为NONE,不然像scalelayout这种只用默认边框的会不显示边框
+    protected void initBorderAndBackgroundStyle() {
-    protected void initBorderStyle() {
     	BorderPacker style = toData().getBorderStyle();
-        if (style != null && style.getBorder() != Constants.LINE_NONE) {
+		LineBorder DEFAULT_LINE_BORDER = (LineBorder) DEFALUTBORDER;
-            this.setBorder(new UIRoundedBorder(style.getBorder(), style.getColor(), style.getBorderRadius()));
+
+		// 边框默认值设为NONE,不然像scalelayout这种只用默认边框的会不显示边框
+		Border border = DEFAULT_LINE_BORDER;
+        if (style != null) {
+        	int radius = style.getBorderRadius();	// 不管有无边框线, 圆角裁剪总是生效
+        	if (style.getBorder() != Constants.LINE_NONE) {
+        		// 设置了边框线
+        		border = new UIRoundedBorder(style.getBorder(), style.getColor(), radius);
 			} else {
-            this.setBorder(DEFALUTBORDER);
+        		// 为设置边框线
+				border = new UIRoundedBorder(DEFAULT_LINE_BORDER.getLineColor(), DEFAULT_LINE_BORDER.getThickness(), radius);
+			}
         }
+
+		this.setBorder(border);
+
+		this.setBackground4Painting(style != null ? style.getBackground() : null);
     }
     
     private void clearTitleWidget() {
@@ -121,6 +159,12 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
     	title.setFont(wTitle.getFrFont());
     	title.setTextalign(wTitle.getPosition());
     	title.setBackground(wTitle.getBackground());
+    	title.setBackgroundOpacity(wTitle.getBackgroundOpacity());
+
+		title.setInsetImage(wTitle.getInsetImage());
+    	title.setInsetImagePadding(wTitle.getInsetImagePadding());
+    	title.setInsetRelativeTextLeft(wTitle.isInsetRelativeTextLeft());
+    	title.setInsetRelativeTextRight(wTitle.isInsetRelativeTextRight());
     }
     
     private WidgetValue getTitleValue(TitlePacker wTitle){
@@ -129,6 +173,74 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
     	return new WidgetValue(value);
     }
 
+    // 如果存在标题栏，则需要重新弄调整边框和背景的显示效果，使得边框和背景的视觉效果出现在包含组件和标题的整体区域上，
+	// 而不是组件和标题各自出现独立的边框和背景，同时如存在标题栏，则标题栏下方还应有底部边框，作为标题和内容的分界线
+    protected void reshuffleBorderAndBackgroundPaintingEffectIfTitleExists() {
+    	Container parent = this.getParent();
+    	if (parent instanceof XWTitleLayout) {
+			XWTitleLayout titleParent = (XWTitleLayout) parent;
+			if (parent.getComponentCount() > 1) {
+				XCreator titleCreator = titleParent.getTitleCreator();
+				XCreator bodyXCreator = titleParent.getBodyCreator();
+
+				Border border = bodyXCreator.getBorder();
+
+				titleParent.setBorder(border);								// 容器绘制完整边框
+				bodyXCreator.setBorder(BorderFactory.createEmptyBorder());	// body不绘制边框
+				titleCreator.setBorder(BorderFactory.createEmptyBorder());	// title绘制底部边框
+				if (border instanceof LineBorder) {
+					Color color = ((LineBorder) border).getLineColor();
+					int thickness = ((LineBorder) border).getThickness();
+					titleCreator.setBorder(new BottomLineBorder(color, thickness));
+				}
+
+				if (bodyXCreator instanceof XBorderStyleWidgetCreator) {
+					XBorderStyleWidgetCreator styledBodyXCreator = (XBorderStyleWidgetCreator) bodyXCreator;
+					Background background4Painting = styledBodyXCreator.getBackground4Painting();
+
+					styledBodyXCreator.setBackground4Painting(null);			// body不绘制背景
+					titleParent.setBackground4Painting(background4Painting);	// 容器绘制完整背景
+				}
+			}
+		}
+	}
+
+
+	// 根据当前组件边框裁剪内容，如果当前组件存在圆角，则应当按圆角裁剪内容
+	private void clipByRoundedBorder(Graphics2D g2d) {
+		Border currentBorder = getBorder();
+		if (currentBorder instanceof UIRoundedBorder) {
+			int thickness = ((UIRoundedBorder) currentBorder).getThickness();
+			int radius = ((UIRoundedBorder) currentBorder).getRoundedCorner();
+			int currentClipX = 0;
+			int currentClipY = 0;
+			int currentClipWidth = getWidth();
+			int currentClipHeight = getHeight();
+			int currentClipRadius = Math.max(radius - thickness, 0);	// 应沿着边框外围进行裁剪
+			g2d.clip(new RoundRectangle2D.Double(currentClipX, currentClipY, currentClipWidth, currentClipHeight, currentClipRadius, currentClipRadius));
+		}
+	}
+
+	// 设计器预览界面中绘制组件背景效果
+	public void paintBackground(Graphics2D g2d) {
+    	Background background4Painting = getBackground4Painting();
+		if (background4Painting != null) {
+			background4Painting.paint(g2d, new Rectangle2D.Double(0, 0, getWidth(), getHeight()));
+		}
+	}
+
+	public void paintForeground(Graphics2D g2d) {
+		super.paint(g2d);
+		super.paintBorder(g2d);
+	}
+
+	@Override
+	public void paint(Graphics g) {
+    	this.clipByRoundedBorder((Graphics2D) g);
+		this.paintBackground((Graphics2D) g);
+		this.paintForeground((Graphics2D) g);
+	}
+
     @Override
     protected String getIconName() {
         return StringUtils.EMPTY;
@@ -159,4 +271,29 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 
 	}
 
+	// 适用于标题栏的底部边框
+	public static class BottomLineBorder extends LineBorder {
+
+		private BottomLineBorder(Color color, int thickness) {
+			super(color, thickness);
+		}
+
+		@Override
+		public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
+			Graphics2D g2d = (Graphics2D)g;
+
+			Color oldColor = g2d.getColor();
+			Stroke oldStroke = g2d.getStroke();
+
+			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+
+			g2d.setColor(getLineColor());
+			g2d.setStroke(new BasicStroke(getThickness()));
+			g2d.drawLine(0, height, width, height);
+
+			g2d.setStroke(oldStroke);
+			g2d.setColor(oldColor);
+			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+		}
+	}
 }

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

@@ -20,6 +20,7 @@ import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.form.ui.BaseChartEditor;
+import com.fr.form.ui.PaddingMargin;
 import com.fr.form.ui.Widget;
 import com.fr.stable.Constants;
 import com.fr.stable.core.PropertyChangeAdapter;
@@ -28,12 +29,8 @@ import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
+import java.awt.*;
 import java.beans.IntrospectionException;
-import java.awt.Color;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
 
 /**
@@ -149,6 +146,9 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
         if (isEditing) {
             g.setColor(OUTER_BORDER_COLOR);
             GraphHelper.draw(g, new Rectangle(bounds.x - BORDER_WIDTH, bounds.y - BORDER_WIDTH, bounds.width + BORDER_WIDTH + 1, bounds.height + BORDER_WIDTH + 1), Constants.LINE_LARGE);
+
+            g.setColor(INNER_BORDER_COLOR);
+            GraphHelper.draw(g, new Rectangle(bounds.x, bounds.y, bounds.width, bounds.height), Constants.LINE_MEDIUM);
         } else if (!isHovering) {
             super.paintBorder(g, bounds);
         }
@@ -165,7 +165,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
     @Override
     protected void initXCreatorProperties() {
         super.initXCreatorProperties();
-        initBorderStyle();
+        initBorderAndBackgroundStyle();
         BaseChartCollection collection = ((BaseChartEditor) data).getChartCollection();
         isRefreshing = true;
         ((MiddleChartComponent) designerEditor.getEditorTarget()).populate(collection);
@@ -227,12 +227,17 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
     /**
      * 渲染Painter
      */
-    public void paint(Graphics g) {
+    @Override
-        designerEditor.paintEditor(g, this.getSize());
+    public void paintForeground(Graphics2D g) {
+        Dimension size = getSize();
+        PaddingMargin margin = toData().getMargin();
+        designerEditor.paintEditor(g, size, margin);
         if (coverPanel != null) {
-            coverPanel.setSize(this.getSize());
+            int horizonMargin = margin != null ? margin.getLeft() + margin.getRight() : 0;
+            int verticalMargin = margin != null ? margin.getTop() + margin.getBottom() : 0;
+            coverPanel.setSize(size.width - horizonMargin, size.height - verticalMargin);
         }
-        super.paint(g);
+        super.paintForeground(g);
         if (isEditing) {
             g.setColor(INNER_BORDER_COLOR);
             GraphHelper.draw(g, new Rectangle(0, 0, getWidth(), getHeight()), Constants.LINE_MEDIUM);

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

@@ -11,6 +11,7 @@ import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.ComponentAdapter;
 import com.fr.design.designer.beans.events.DesignerEditor;
 import com.fr.design.designer.beans.models.SelectionModel;
+import com.fr.design.designer.ui.SelectedPopupDialog;
 import com.fr.design.fun.ShareWidgetUIProcessor;
 import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.gui.imenu.UIPopupMenu;
@@ -68,6 +69,9 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	private Rectangle backupBound;
 	private String shareId = StringUtils.EMPTY;//如果组件是共享的会有这个属性
 	private boolean isHelpBtnOnFocus = false;//焦点是否在帮助按钮上
+	// 当前组件是否处在选中状态
+	private boolean selected;
+	private SelectedPopupDialog popup;
 	private static final int SHORTS_SEPARATOR_POS = 4;  // 弹出菜单分割的位置
 
 	public XCreator(Widget ob, Dimension initSize) {
@@ -760,6 +764,24 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		GraphHelper.draw(g, bounds, Constants.LINE_MEDIUM);
 	}
 
+	/**
+	 * 选中时右侧展示小弹窗
+	 *
+	 * @param designer
+	 * @param bounds
+	 */
+	public void showSelectedPopup(FormDesigner designer, Rectangle bounds, boolean accept) {
+		if (popup == null) {
+			popup = new SelectedPopupDialog(this, designer);
+		}
+		int extraX = (int) ((bounds.x + bounds.width + SelectedPopupDialog.OFFSET_X) * designer.getScale());
+		int extraY = (int) (bounds.y * designer.getScale());
+		popup.setLocation(designer.getLocationOnScreen().x + designer.getPaintX()  + extraX, designer.getLocationOnScreen().y + designer.getPaintY() + extraY);
+		popup.updatePane(designer);
+		popup.setVisible(selected && accept && popup.hasVisibleButtons());
+		popup.setRelativeBounds(bounds);
+	}
+
 	/**
 	 * 创建右击弹出菜单
 	 *
@@ -797,5 +819,21 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	}
 
 
+	public boolean isSelected() {
+		return selected;
+	}
+
+	public void setSelected(boolean selected) {
+		this.selected = selected;
+		if (popup != null && !selected) {
+			popup.setVisible(false);
+		}
+	}
+
+	public void hidePopup() {
+		if (popup != null) {
+			popup.setVisible(false);
+		}
+	}
 
 }

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

@@ -1,6 +1,7 @@
 package com.fr.design.designer.creator;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.Releasable;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.designer.properties.mobile.ElementCasePropertyUI;
 import com.fr.design.form.util.XCreatorConstants;
@@ -32,7 +33,7 @@ import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;
 import java.util.Set;
 
-public class XElementCase extends XBorderStyleWidgetCreator implements FormElementCaseContainerProvider {
+public class XElementCase extends XBorderStyleWidgetCreator implements FormElementCaseContainerProvider , Releasable {
     private UILabel imageLable;
     private FormDesigner designer;
     private static BufferedImage DEFAULT_BACKGROUND;
@@ -57,7 +58,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
         super.initXCreatorProperties();
 
         // 报表块初始化时要加载对应的borderStyle
-        initBorderStyle();
+        initBorderAndBackgroundStyle();
     }
 
     /**
@@ -352,4 +353,9 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
     public boolean isSupportShared() {
         return true;
     }
+
+    @Override
+    public void releaseResources() {
+        imageLable.setIcon(null);
+    }
 }

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

@@ -5,6 +5,7 @@ package com.fr.design.designer.creator;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.Style;
+import com.fr.base.background.ImageBackground;
 import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.form.util.FontTransformUtil;
 import com.fr.design.form.util.XCreatorConstants;
@@ -17,6 +18,7 @@ import com.fr.design.mainframe.widget.renderer.LabelHorizontalAlignmentRenderer;
 import com.fr.form.ui.Label;
 import com.fr.form.ui.container.WParameterLayout;
 
+import com.fr.general.Background;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.core.PropertyChangeAdapter;
@@ -94,10 +96,18 @@ public class XLabel extends XWidgetCreator {
         }
         if (label.getWidgetValue() != null) {
             Graphics2D g2d = (Graphics2D) g.create();
-            BaseUtils.drawStringStyleInRotation(g2d, this.getWidth(), this.getHeight(), label.getWidgetValue()
+
-                            .toString(), Style.getInstance(label.getFont()).deriveHorizontalAlignment(label.getTextalign())
+            Background inset = label.getInsetImage();
+            Image insetImage = inset instanceof ImageBackground ? ((ImageBackground) inset).getImage() : null;
+
+            BaseUtils.drawStringStyleInRotation(g2d,
+                    this.getWidth(), this.getHeight(),
+                    label.getWidgetValue().toString(),
+                    Style.getInstance(label.getFont())
+                            .deriveHorizontalAlignment(label.getTextalign())
                             .deriveVerticalAlignment(label.isVerticalCenter() ? SwingConstants.CENTER : SwingConstants.TOP)
                             .deriveTextStyle(label.isWrap() ? Style.TEXTSTYLE_WRAPTEXT : Style.TEXTSTYLE_SINGLELINE),
+                    insetImage, label.getInsetImagePadding(), label.isInsetRelativeTextLeft(), label.isInsetRelativeTextRight(),
                     FontTransformUtil.getDesignerFontResolution());
 
         }

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

@@ -118,7 +118,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
     @Override
     protected void initXCreatorProperties() {
         super.initXCreatorProperties();
-        initBorderStyle();
+        initBorderAndBackgroundStyle();
         this.initLayoutManager();
         this.convert();
     }

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

@@ -91,7 +91,6 @@ public class XNameWidget extends XWidgetCreator {
 		if (editor != null) {
 			this.setLayout(FRGUIPaneFactory.createBorderLayout());
 			add(editor, BorderLayout.CENTER);
-			this.setVisible(toData().isVisible());
 		}
 	}
 	

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

@@ -106,7 +106,7 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout {
 
     @Override
     protected void initStyle() {
-        initBorderStyle();
+        initBorderAndBackgroundStyle();
     }
 
     /**

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

@@ -203,6 +203,11 @@ public class XWAbsoluteLayout extends XLayoutContainer {
             double percentH = ((double) backupBound.height / (double) currentBound.height);
             for (int index = 0, n = this.getComponentCount(); index < n; index++) {
                 XCreator creator = (XCreator) this.getComponent(index);
+                if (creator.toData().isAspectRatioLocked()) {
+                    // 因为percentW/H是旧尺寸与新尺寸之间的比例，所以实现组件选择宽度和高度中较小的缩放比例的规则，需要使用Math.max
+                    double percent = Math.max(percentW, percentH);
+                    percentW = percentH = percent;
+                }
                 BoundsWidget wgt = (BoundsWidget) layout.getBoundsWidget(creator.toData());
                 // 用当前的显示大小计算后调正具体位置
                 Rectangle wgtBound = creator.getBounds();

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

@@ -758,6 +758,11 @@ public class XWFitLayout extends XLayoutContainer {
 		int[] veris = getVeris(true);
 		int containerWidth = 0;
 		int containerHeight = 0;
+
+		PaddingMargin margin = toData().getMargin();
+		int maxW = this.getWidth() - margin.getRight();
+		int maxH = this.getHeight() - margin.getBottom();
+
 		for (int index=0, n=this.getComponentCount(); index<n; index++) {
 			XCreator creator = (XCreator) this.getComponent(index);
 			BoundsWidget wgt = (BoundsWidget) layout.getBoundsWidget(creator.toData());
@@ -780,8 +785,27 @@ public class XWFitLayout extends XLayoutContainer {
 					tabLayout.updateBoundsWidget();
 				}
 			}
+		}
+		layout.setContainerHeight(containerHeight);
+		layout.setContainerWidth(containerWidth);
+		addCompInterval(getAcualInterval());
+
+		// REPORT-54410: 决策报表，模板中其他组件的宽高修改会影响绝对画布块中组件的宽高和位置
+		// 绝对布局内的组件尺寸调整需要在绝对布局的bound排除GAP后进行，否则计算出的
+		// 组件尺寸缩放比例会有问题
+		for (int index = 0, n = this.getComponentCount(); index < n; index++) {
+			XCreator creator = (XCreator) this.getComponent(index);
+			BoundsWidget wgt = (BoundsWidget) layout.getBoundsWidget(creator.toData());
 			//如果子组件是绝对布局，则内部的widget也要更新
 			if (creator.acceptType(XWAbsoluteLayout.class)){
+
+				// backupBounds处理下内边距 否则计算缩放比例时总是存在一个内边距的误差
+				if (creator.getBackupBound() != null) {
+					Rectangle backUpBound = creator.getBackupBound();
+					processContainerMargin(margin, backUpBound, maxW, maxH);
+					creator.setBackupBound(backUpBound);
+				}
+
 				//更新的时候一定要带上backupBound
 				if (creator.getBackupBound() == null && wgt.getBeforeScaleBounds() != null) {
 					creator.setBackupBound(dealWgtBound(wgt.getBeforeScaleBounds()));
@@ -790,9 +814,6 @@ public class XWFitLayout extends XLayoutContainer {
 				creator.setBackupBound(creator.getBounds());
 			}
 		}
-		layout.setContainerHeight(containerHeight);
-		layout.setContainerWidth(containerWidth);
-		addCompInterval(getAcualInterval());
 	}
 
 	private Rectangle recalculateWidgetBounds(Rectangle rec, int[] hors, int[] veris) {
@@ -1056,6 +1077,12 @@ public class XWFitLayout extends XLayoutContainer {
 		for (int i=0; i<num; i++) {
 			Component comp = this.getComponent(i);
 			Rectangle rec = comp.getBounds();
+			processContainerMargin(margin, rec, maxW, maxH);
+			comp.setBounds(rec);
+		}
+	}
+
+	private void processContainerMargin(PaddingMargin margin, Rectangle rec, int maxW, int maxH) {
 		if (rec.x == margin.getLeft()) {
 			rec.x = 0;
 			rec.width += margin.getLeft();
@@ -1070,8 +1097,6 @@ public class XWFitLayout extends XLayoutContainer {
 		if (rec.y + rec.height == maxH) {
 			rec.height += margin.getBottom();
 		}
-			comp.setBounds(rec);
-		}
 	}
 
 	public Component getTopComp(int x, int y) {

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

@@ -10,10 +10,9 @@ import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.form.ui.Label;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.WidgetTitle;
+import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.form.ui.container.WTitleLayout;
 import com.fr.general.ComparatorUtils;
-import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
-import com.fr.stable.StringUtils;
 
 import java.awt.*;
 import java.awt.event.ContainerEvent;
@@ -46,6 +45,17 @@ public class XWTitleLayout extends DedicateLayoutContainer {
 		super(widget, initSize);
 	}
 
+	@Override
+	protected void initXCreatorProperties() {
+		super.initXCreatorProperties();
+
+		// 初始化后（如打开旧模版)，需要重新调整组件/标题/边框的显示效果
+		XCreator xCreator = getBodyCreator();
+		if (xCreator instanceof XBorderStyleWidgetCreator) {
+			((XBorderStyleWidgetCreator) xCreator).reshuffleBorderAndBackgroundPaintingEffectIfTitleExists();
+		}
+	}
+
 	/**
 	 * 初始化容器对应的布局 由于是只装一个需要保持原样高度的控件，布局设为absolute
 	 */

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

@@ -400,7 +400,7 @@ public class XWCardLayout extends XLayoutContainer {
     protected void initStyle() {
         BorderPacker style = toData().getBorderStyle();
         initBorderTitleStyle(style);
-        initBorderStyle();
+        initBorderAndBackgroundStyle();
         clearOrShowTitleLayout(ComparatorUtils.equals(style.getType(), LayoutBorderStyle.TITLE));
     }
 

designer-form/src/main/java/com/fr/design/designer/ui/PopupControlPanel.java

@@ -0,0 +1,242 @@
+package com.fr.design.designer.ui;
+
+import com.fr.design.designer.beans.AdapterBus;
+import com.fr.design.designer.beans.adapters.layout.FRAbsoluteLayoutAdapter;
+import com.fr.design.designer.beans.events.DesignerEvent;
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XWTitleLayout;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.VerticalFlowLayout;
+import com.fr.design.mainframe.CoverReportPane;
+import com.fr.design.mainframe.EditingMouseListener;
+import com.fr.design.mainframe.FormDesigner;
+import com.fr.general.IOUtils;
+import com.fr.stable.ArrayUtils;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/7/8
+ */
+public class PopupControlPanel extends JPanel {
+
+    private static final int ARC_VALUE = 4;
+    private static final Color FILLED_COLOR = new Color(60, 63, 65);
+    private static final int BUTTON_SIZE = 16;
+    private static final int BUTTON_MARGIN = 4;
+    private static final int PANE_WIDTH = BUTTON_SIZE + BUTTON_MARGIN * 2; // 24
+
+    private final Dimension defaultDimension = new Dimension(PANE_WIDTH, 0);
+    private Rectangle rectangle;
+
+    private final List<JComponent> buttons = new ArrayList<>();
+    private final JButton editButton;
+    private final JButton settingButton;
+    private final JToggleButton toggleButton;
+    private final XCreator creator;
+
+    public PopupControlPanel(XCreator creator, FormDesigner designer) {
+        setLayout(new VerticalFlowLayout(VerticalFlowLayout.TOP, 0, 0));
+        setBorder(BorderFactory.createEmptyBorder());
+        this.creator = creator;
+
+        editButton = createEditButton(designer);
+        toggleButton = createAspectRatioLockedButton(designer);
+        settingButton = createSettingButton();
+
+        addButton(editButton, 0);
+        addButton(toggleButton, 1);
+        addButton(settingButton, 2);
+
+        setButtonVisible(editButton, false);
+        setButtonVisible(toggleButton, false);
+        setButtonVisible(settingButton, false);
+    }
+
+    private JButton createEditButton(FormDesigner designer) {
+        JButton editButton =  createNormalButton(IOUtils.readIcon("/com/fr/design/images/control/show_edit.png"), Toolkit.i18nText("Fine-Design_Form_Edit_Widget"));
+        editButton.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                int x = rectangle.x + rectangle.width / 2;
+                int y = rectangle.y + rectangle.height / 2;
+                XCreator childCreator = PopupControlPanel.this.creator.getEditingChildCreator();
+                MouseListener[] listeners = designer.getMouseListeners();
+                if (ArrayUtils.isNotEmpty(listeners) && listeners[0] instanceof EditingMouseListener) {
+                    childCreator.respondClick(((EditingMouseListener) listeners[0]), new MouseEvent(childCreator, MouseEvent.MOUSE_CLICKED, e.getWhen(), e.getModifiers(), x, y, 2, false));
+                }
+            }
+        });
+        return editButton;
+    }
+
+    private JToggleButton createAspectRatioLockedButton(FormDesigner designer) {
+        JToggleButton button = new JToggleButton(IOUtils.readIcon("/com/fr/design/images/control/aspect_ratio_unlock.png"));
+        initButtonStyle(button);
+        button.setSelectedIcon(IOUtils.readIcon("com/fr/design/images/control/aspect_ratio_lock.png"));
+        button.setToolTipText(Toolkit.i18nText("Fine-Design_Form_UnLock_Widget_Ratio"));
+        button.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                JToggleButton toggleBtn = (JToggleButton) e.getSource();
+                String toolTipText = toggleBtn.isSelected() ? Toolkit.i18nText("Fine-Design_Form_Lock_Widget_Ratio") : Toolkit.i18nText("Fine-Design_Form_UnLock_Widget_Ratio");
+                toggleBtn.setToolTipText(toolTipText);
+                creator.toData().setAspectRatioLocked(toggleBtn.isSelected());
+                designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_RESIZED);
+            }
+        });
+        return button;
+    }
+
+    private JButton createSettingButton() {
+        JButton settingButton = createNormalButton(IOUtils.readIcon("/com/fr/design/images/control/show_setting.png"), Toolkit.i18nText("Fine-Design_Share_Help_Settings"));
+
+        settingButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                CoverReportPane.showShareConfig(creator.toData());
+            }
+        });
+        return settingButton;
+    }
+
+    private void addButton(JComponent component, int index) {
+        buttons.add(index, component);
+        if (index > 0) {
+            this.add(new SeparatorLabel(), index * 2 - 1);
+        }
+        this.add(component, index * 2);
+    }
+
+    private void setButtonVisible(JComponent component, boolean visible) {
+        int index = buttons.indexOf(component);
+
+        boolean hasVisibleButtonBeforeCurrent = false;
+        for (int i = 0; i < index; i++) {
+            if (buttons.get(i).isVisible()) {
+                hasVisibleButtonBeforeCurrent = true;
+                break;
+            }
+        }
+
+        if (hasVisibleButtonBeforeCurrent) {
+            buttons.get(index).setVisible(visible);
+            getComponent(2 * index - 1).setVisible(visible);
+            return;
+        }
+
+        // 在当前按钮之前没有可见的按钮了
+        if (index > 0) {
+            getComponent(2 * index - 1).setVisible(false);
+        }
+        buttons.get(index).setVisible(visible);
+
+        if (!visible) {
+            // 如果当前按钮设置为不可见，且在当前按钮之前的其他按钮也不可见，则下一个可见按钮前无分割线
+            for (int i = index + 1; i < buttons.size(); i++) {
+                if (buttons.get(i).isVisible()) {
+                    if (i > 0) {
+                        getComponent(2 * i - 1).setVisible(false);
+                    }
+                    break;
+                }
+            }
+        }
+    }
+
+    private JButton createNormalButton(Icon icon, String toolTipText) {
+        JButton button = new JButton(icon);
+        button.setPreferredSize(new Dimension(BUTTON_SIZE + 2 * BUTTON_MARGIN, BUTTON_SIZE + 2 * BUTTON_MARGIN));
+        button.setBorder(BorderFactory.createEmptyBorder(BUTTON_MARGIN, BUTTON_MARGIN, BUTTON_MARGIN, BUTTON_MARGIN));
+        initButtonStyle(button);
+        button.setToolTipText(toolTipText);
+        return button;
+    }
+
+    private void initButtonStyle(AbstractButton button) {
+        button.setPreferredSize(new Dimension(BUTTON_SIZE + 2 * BUTTON_MARGIN, BUTTON_SIZE + 2 * BUTTON_MARGIN));
+        button.setBorder(BorderFactory.createEmptyBorder(BUTTON_MARGIN, BUTTON_MARGIN, BUTTON_MARGIN, BUTTON_MARGIN));
+        button.setBorderPainted(false);
+        button.setContentAreaFilled(false);
+    }
+
+    @Override
+    protected void paintComponent(Graphics g) {
+        super.paintComponent(g);
+        int w = this.getWidth();
+        int h = this.getHeight();
+        Graphics2D g2d = (Graphics2D) g;
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g2d.setColor(FILLED_COLOR);
+        g2d.fillRoundRect(0, 0, w - 1, h - 1, ARC_VALUE, ARC_VALUE);
+        g2d.setColor(Color.WHITE);
+        g2d.drawRoundRect(0, 0, w - 1, h - 1, ARC_VALUE, ARC_VALUE);
+    }
+
+    public Dimension getDefaultDimension() {
+        return defaultDimension;
+    }
+
+    public void setRelativeBounds(Rectangle rectangle) {
+        this.rectangle = rectangle;
+    }
+
+    public void updatePane(FormDesigner designer) {
+        setButtonVisible(editButton, creator.acceptType(XWTitleLayout.class));
+        setButtonVisible(settingButton, creator.isShared());
+        setButtonVisible(toggleButton, AdapterBus.searchLayoutAdapter(designer, creator) instanceof FRAbsoluteLayoutAdapter);
+        toggleButton.setSelected(creator.toData().isAspectRatioLocked());
+
+        updateDimension();
+    }
+
+    public boolean hasVisibleButtons() {
+        for (int i = 0; i < buttons.size(); i++) {
+            if (buttons.get(i).isVisible()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void updateDimension() {
+        int height = 0;
+        for (int i = 0; i < buttons.size(); i++) {
+            JComponent component = buttons.get(i);
+            if (component.isVisible()) {
+                if (i > 0) {
+                    height += 1;
+                }
+                height += component.getHeight();
+            }
+        }
+        height += 2;
+
+        defaultDimension.height = height;
+    }
+
+    private static class SeparatorLabel extends UILabel {
+        public SeparatorLabel() {
+            setPreferredSize(new Dimension(PANE_WIDTH, 1));
+        }
+
+        @Override
+        public void paint(Graphics g) {
+            super.paint(g);
+            Graphics2D g2d = (Graphics2D) g;
+            g2d.setColor(Color.WHITE);
+            g2d.drawLine(BUTTON_MARGIN, 0, getWidth() - BUTTON_MARGIN, 0);
+        }
+    }
+}

designer-form/src/main/java/com/fr/design/designer/ui/SelectedPopupDialog.java

@@ -0,0 +1,45 @@
+package com.fr.design.designer.ui;
+
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.FormDesigner;
+import java.awt.Rectangle;
+import javax.swing.JDialog;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/7/09
+ */
+public class SelectedPopupDialog extends JDialog {
+
+    /**
+     * 弹窗的相对组件的偏移
+     */
+    public static final int OFFSET_X = 5;
+
+    private final PopupControlPanel controlPanel;
+
+    public SelectedPopupDialog(XCreator creator, FormDesigner designer) {
+        super(DesignerContext.getDesignerFrame());
+        this.setUndecorated(true);
+        this.setModal(false);
+        controlPanel = new PopupControlPanel(creator, designer);
+        this.getContentPane().add(controlPanel);
+        this.setSize(controlPanel.getDefaultDimension());
+    }
+
+    public void updatePane(FormDesigner designer) {
+        controlPanel.updatePane(designer);
+        this.setSize(controlPanel.getDefaultDimension());
+    }
+
+    public boolean hasVisibleButtons() {
+        return controlPanel.hasVisibleButtons();
+    }
+
+    public void setRelativeBounds(Rectangle rectangle) {
+        this.controlPanel.setRelativeBounds(rectangle);
+    }
+
+}