Merge remote-tracking branch 'origin/release/10.0' into release/10.0

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

@@ -1,21 +1,22 @@
 package com.fr.design.data.datapane;
 
 import com.fr.base.BaseUtils;
-import com.fr.general.NameObject;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.gui.itree.refreshabletree.UserObjectRefreshJTree;
 import com.fr.design.icon.IconPathConstants;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.NameObject;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JTree;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Component;
 
 /**
  * TableData Tree
@@ -31,6 +32,7 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
         this.setCellRenderer(tableDataTreeCellRenderer);
         this.setEditable(false);
     }
+
     // CellRenderer
     private DefaultTreeCellRenderer tableDataTreeCellRenderer = new DefaultTreeCellRenderer() {
         private static final long serialVersionUID = 1L;
@@ -66,14 +68,7 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
                 this.setIcon(null);
                 this.setText(PENDING.toString());
             }
-            // 这里新建一个Label作为render是因为JTree在动态刷新的时候，节点上render画布的的宽度不会变，会使得一部分比较长的数据显示为"..."
+            this.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0));
-            UILabel label = new UILabel();
-            label.setText(getText());
-            label.setIcon(getIcon());
-            Dimension dim = label.getPreferredSize();
-            dim.height += 2;
-            this.setSize(dim);
-            this.setPreferredSize(dim);
             this.setBackgroundNonSelectionColor(UIConstants.TREE_BACKGROUND);
             this.setTextSelectionColor(Color.WHITE);
             this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE);

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

@@ -70,6 +70,15 @@ public class TreeTableDataComboBox extends UIComboBox {
 		}
 	}
 
+	/**
+	 * 带参刷新方法
+	 * @param source 数据源数据集
+	 */
+	public void refresh(TableDataSource source) {
+		this.source = source;
+		refresh();
+	}
+
 	public void setSelectedTableDataByName(String name) {
 		TableDataWrapper tableDataWrapper;
 		if (res_map.get(name) != null) {

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

@@ -26,14 +26,14 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-
 import com.fr.stable.StringUtils;
-
-import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.List;
+import javax.swing.*;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
 
 public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previewable, EditOrNewLabel.Editable {
     private TreeTableDataComboBox treeTableDataComboBox;
@@ -61,6 +61,23 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
                 tdChange();
             }
         });
+        // REPORT-38762 加一个展开监听事件，下拉框展开时刷新一下数据集
+        treeTableDataComboBox.addPopupMenuListener(new PopupMenuListener() {
+            @Override
+            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+                treeTableDataComboBox.refresh(DesignTableDataManager.getEditingTableDataSource());
+            }
+
+            @Override
+            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+
+            }
+
+            @Override
+            public void popupMenuCanceled(PopupMenuEvent e) {
+
+            }
+        });
         selectTreeDataPanel.add(treeTableDataComboBox);
         treeTableDataComboBox.setPreferredSize(new Dimension(200, 25));
         treeTableDataComboBox.setSelectedIndex(-1);

designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java

@@ -2,7 +2,6 @@ package com.fr.design.gui.itree.filetree;
 
 import com.fr.base.FRContext;
 import com.fr.design.constants.UIConstants;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.gui.itree.refreshabletree.RefreshableJTree;
 import com.fr.design.i18n.Toolkit;
@@ -14,13 +13,13 @@ import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
 import com.fr.workspace.WorkContext;
 
+import javax.swing.BorderFactory;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -79,14 +78,7 @@ public class EnvFileTree extends RefreshableJTree {
                     this.setIcon(null);
                     this.setText(PENDING.toString());
                 }
-                // 这里新建一个Label作为render是因为JTree在动态刷新的时候，节点上render画布的的宽度不会变，会使得一部分比较长的数据显示为"..."
+                this.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0));
-                UILabel label = new UILabel();
-                label.setText(getText());
-                label.setIcon(getIcon());
-                this.setSize(label.getPreferredSize());
-                Dimension dim = label.getPreferredSize();
-                dim.height += 2;
-                this.setPreferredSize(dim);
                 this.setBackgroundNonSelectionColor(UIConstants.TREE_BACKGROUND);
                 this.setTextSelectionColor(Color.WHITE);
                 this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE);

designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java

@@ -20,14 +20,18 @@ import com.fr.design.editor.editor.TextEditor;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
-
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
@@ -37,6 +41,7 @@ import java.util.Map.Entry;
 
 /**
  * The dialog used to input parameter.
+ *
  * @editor zhou
  * @since 2012-3-26上午11:09:45
  */
@@ -51,6 +56,8 @@ public class ParameterInputPane extends BasicPane {
 
     private boolean allowBlank = true;
 
+    private FlowTableLayoutHelper flowTableLayoutHelper;
+
     /**
      * Constructor.
      */
@@ -71,7 +78,7 @@ public class ParameterInputPane extends BasicPane {
         this.add(new JScrollPane(contentPane), BorderLayout.CENTER);
         contentPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameters") + ":"));
 
-        FlowTableLayoutHelper flowTableLayoutHelper = new FlowTableLayoutHelper();
+        flowTableLayoutHelper = new FlowTableLayoutHelper();
 
         editorNameMap = new java.util.HashMap<ValueEditorPane, String>();
 
@@ -112,7 +119,12 @@ public class ParameterInputPane extends BasicPane {
                 nameAddedList.add(parameter.getName());
             }
         }
+    }
 
+    @Override
+    public void addNotify() {
+        super.addNotify();
+        // windows 高DPI下，使用getPreferredSize必须在添加到容器之后，否则得到的数值不准确，因此先放到这调整大小
         flowTableLayoutHelper.adjustLabelWidth();
     }
 

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

@@ -0,0 +1,17 @@
+package com.fr.van.chart.column;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.plugin.chart.column.VanChartColumnPlot;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+import com.fr.van.chart.designer.style.label.VanChartPlotLabelDetailPane;
+
+public class VanChartColumnPlotLabelDetailPane extends VanChartPlotLabelDetailPane {
+
+    public VanChartColumnPlotLabelDetailPane(Plot plot, VanChartStylePane parent) {
+        super(plot, parent);
+    }
+
+    protected boolean hasLabelOrientationPane() {
+        return !((VanChartColumnPlot) this.getPlot()).isBar();
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.fr.van.chart.column;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane;
+
+import java.awt.BorderLayout;
+
+public class VanChartColumnPlotLabelPane extends VanChartPlotLabelPane {
+
+    public VanChartColumnPlotLabelPane(Plot plot, VanChartStylePane parent) {
+        super(plot, parent);
+    }
+
+    protected void createLabelPane() {
+        VanChartColumnPlotLabelDetailPane labelDetailPane = new VanChartColumnPlotLabelDetailPane(getPlot(), getParentPane());
+        setLabelDetailPane(labelDetailPane);
+        getLabelPane().add(labelDetailPane, BorderLayout.CENTER);
+    }
+}

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

@@ -7,6 +7,7 @@ import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.design.gui.style.FormatPane;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
+import com.fr.plugin.chart.PiePlot4VanChart;
 import com.fr.plugin.chart.area.VanChartAreaPlot;
 import com.fr.plugin.chart.bubble.VanChartBubblePlot;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
@@ -23,6 +24,7 @@ import com.fr.plugin.chart.structure.VanChartStructurePlot;
 import com.fr.plugin.chart.treemap.VanChartTreeMapPlot;
 import com.fr.plugin.chart.wordcloud.VanChartWordCloudPlot;
 import com.fr.van.chart.bubble.force.VanChartBubbleRefreshTooltipPane;
+import com.fr.van.chart.column.VanChartColumnPlotLabelPane;
 import com.fr.van.chart.designer.component.VanChartLabelContentPane;
 import com.fr.van.chart.designer.component.VanChartRefreshTooltipContentPane;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
@@ -76,7 +78,7 @@ import java.util.Set;
  */
 public class PlotFactory {
 
-    private static Set<Class<? extends Plot>> autoAdjustLabelPlots = new HashSet<Class<? extends Plot>>();
+    private static Set<Class<? extends Plot>> autoAdjustLabelPlots = new HashSet<>();
 
     static {
         autoAdjustLabelPlots.add(VanChartColumnPlot.class);
@@ -89,12 +91,26 @@ public class PlotFactory {
         return autoAdjustLabelPlots.contains(plot.getClass());
     }
 
+    private static Set<Class<? extends Plot>> borderAndBackgroundLabelPlots = new HashSet<>();
+
+    static {
+        borderAndBackgroundLabelPlots.add(PiePlot4VanChart.class);
+        borderAndBackgroundLabelPlots.add(VanChartColumnPlot.class);
+        borderAndBackgroundLabelPlots.add(VanChartLinePlot.class);
+        borderAndBackgroundLabelPlots.add(VanChartAreaPlot.class);
+    }
+
+    public static boolean hasBorderAndBackgroundPlotLabel(Plot plot) {
+        return borderAndBackgroundLabelPlots.contains(plot.getClass());
+    }
+
     /**
      * 标签Map
      */
-    private static Map<Class<? extends Plot>, Class<? extends VanChartPlotLabelPane>> labelMap = new HashMap<Class<? extends Plot>, Class<? extends VanChartPlotLabelPane>>();
+    private static Map<Class<? extends Plot>, Class<? extends VanChartPlotLabelPane>> labelMap = new HashMap<>();
 
     static {
+        labelMap.put(VanChartColumnPlot.class, VanChartColumnPlotLabelPane.class);
         labelMap.put(VanChartGaugePlot.class, VanChartGaugePlotLabelPane.class);
         labelMap.put(VanChartScatterPlot.class, VanChartScatterPlotLabelPane.class);
         labelMap.put(VanChartBubblePlot.class, VanChartScatterPlotLabelPane.class);

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

@@ -6,6 +6,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
@@ -36,9 +37,11 @@ public class VanChartLabelContentPaneWithoutRichText extends BasicBeanPane<AttrT
     //监控刷新时，自动数据点提示使用
     private ChangedValueFormatPaneWithCheckBox changedValueFormatPane;
     private ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane;
-
+    private UIButtonGroup<Integer> styleButton;
+    private ChartTextAttrPane textAttrPane;
     private JPanel centerPane;
     private JPanel commonPanel;
+    private JPanel stylePanel;
     private VanChartHtmlLabelPane htmlLabelPane;
 
     private VanChartStylePane parent;
@@ -85,7 +88,7 @@ public class VanChartLabelContentPaneWithoutRichText extends BasicBeanPane<AttrT
     }
 
     private JPanel createLabelContentPane() {
-        content = new UIButtonGroup<Integer>(new String[]{
+        content = new UIButtonGroup<>(new String[]{
                 Toolkit.i18nText("Fine-Design_Chart_Common"),
                 Toolkit.i18nText("Fine-Design_Chart_Custom")
         });
@@ -99,7 +102,7 @@ public class VanChartLabelContentPaneWithoutRichText extends BasicBeanPane<AttrT
         commonPanel = createCommonPanel();
         htmlLabelPane = createHtmlLabelPane();
         htmlLabelPane.setParent(parent);
-
+        stylePanel = createTextStylePane();
         centerPane = new JPanel(new CardLayout()) {
             @Override
             public Dimension getPreferredSize() {
@@ -121,10 +124,63 @@ public class VanChartLabelContentPaneWithoutRichText extends BasicBeanPane<AttrT
                 new Component[]{null, centerPane},
         };
         initContentListener();
-        JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, column);
+        JPanel paramsPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, column);
+
+        JPanel contentPane = new JPanel(new BorderLayout());
+        contentPane.add(paramsPanel, BorderLayout.CENTER);
+        contentPane.add(stylePanel, BorderLayout.SOUTH);
+
         return getLabelContentPane(contentPane);
     }
 
+    protected boolean hasTextStylePane() {
+        return true;
+    }
+
+    private JPanel createTextStylePane() {
+        styleButton = new UIButtonGroup<>(new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Automatic"),
+                Toolkit.i18nText("Fine-Design_Chart_Custom")
+        });
+
+        textAttrPane = new ChartTextAttrPane() {
+            protected Component[][] getComponents(JPanel buttonPane) {
+                return new Component[][]{
+                        new Component[]{null, null},
+                        new Component[]{null, getFontNameComboBox()},
+                        new Component[]{null, buttonPane}
+                };
+            }
+        };
+
+        JPanel buttonPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), styleButton);
+
+        JPanel stylePanel = new JPanel(new BorderLayout());
+        stylePanel.add(buttonPane, BorderLayout.CENTER);
+        stylePanel.add(textAttrPane, BorderLayout.SOUTH);
+
+        initStyleButtonListener();
+
+        return stylePanel;
+    }
+
+    private void initStyleButtonListener() {
+        styleButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                checkStylePane();
+            }
+        });
+    }
+
+    private void checkStylePane() {
+        if (hasTextStylePane()) {
+            stylePanel.setVisible(true);
+            textAttrPane.setVisible(styleButton.getSelectedIndex() == 1);
+        } else {
+            stylePanel.setVisible(false);
+        }
+    }
+
     protected String getLabelContentTitle() {
         return Toolkit.i18nText("Fine-Design_Report_Text");
     }
@@ -237,7 +293,12 @@ public class VanChartLabelContentPaneWithoutRichText extends BasicBeanPane<AttrT
         if (!attrTooltipContent.isCommon()) {
             setDirty(false);
         }
+        if (hasTextStylePane()) {
+            this.styleButton.setSelectedIndex(attrTooltipContent.isCustom() ? 1 : 0);
+            this.textAttrPane.populate(attrTooltipContent.getTextAttr());
+        }
         checkCardPane();
+        checkStylePane();
     }
 
     protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
@@ -265,6 +326,11 @@ public class VanChartLabelContentPaneWithoutRichText extends BasicBeanPane<AttrT
 
         htmlLabelPane.update(attrTooltipContent.getHtmlLabel());
 
+        if (hasTextStylePane()) {
+            attrTooltipContent.setCustom(styleButton.getSelectedIndex() == 1);
+            attrTooltipContent.setTextAttr(this.textAttrPane.update());
+        }
+
         return attrTooltipContent;
     }
 

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

@@ -73,6 +73,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     private JPanel commonPanel;
     private JPanel editorPanel;
     private JPanel htmlPanel;
+    private JPanel stylePanel;
     private UIButtonGroup<Integer> styleButton;
     private ChartTextAttrPane textAttrPane;
     private VanChartHtmlLabelPane htmlLabelPane;
@@ -202,6 +203,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
         content.add(createButtonPane(), BorderLayout.NORTH);
         content.add(centerPanel, BorderLayout.CENTER);
+        content.add(stylePanel, BorderLayout.SOUTH);
 
         initContentListener();
 
@@ -209,9 +211,10 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     }
 
     private void initDetailPane() {
-        commonPanel = createCommonPanel();
+        commonPanel = createCommonFormatPanel();
         editorPanel = createRichEditorPanel();
         htmlPanel = createHtmlPane();
+        stylePanel = createCommonStylePane();
     }
 
     private void initCenterPane() {
@@ -261,15 +264,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         return TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, column);
     }
 
-    private JPanel createCommonPanel() {
-        JPanel common = new JPanel(new BorderLayout());
-
-        common.add(createCommonFormatPanel(), BorderLayout.CENTER);
-        common.add(createCommonStylePane(), BorderLayout.SOUTH);
-
-        return common;
-    }
-
     protected JPanel createCommonFormatPanel() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
@@ -469,6 +463,8 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         } else {
             cardLayout.show(centerPanel, Toolkit.i18nText("Fine-Design_Chart_Common"));
         }
+
+        stylePanel.setVisible(content.getSelectedIndex() != 1);
     }
 
     protected void setCustomFormatterText() {
@@ -608,7 +604,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     protected void populateRichText(AttrTooltipRichText tooltipRichText) {
         if (tooltipRichText != null) {
             updateLocalRichText(tooltipRichText.getContent(), tooltipRichText.isAuto());
-            setDirty(false);
         }
     }
 

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

@@ -6,6 +6,7 @@ import com.fr.chart.chartglyph.GeneralInfo;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.icombobox.LineComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.style.color.ColorSelectBox;
 import com.fr.design.utils.gui.UIComponentUtils;
@@ -30,20 +31,18 @@ public class VanChartBorderPane extends BasicPane {
     protected void initComponents() {
         currentLineCombo = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART);
         currentLineColorPane = new ColorSelectBox(100);
-        double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
         double[] columnSize = {f, e};
-        double[] rowSize = {p, p, p, p};
         Component[][] components = getUseComponent();
-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
+        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, getRowSize(), columnSize);
         this.setLayout(new BorderLayout());
         this.add(panel,BorderLayout.CENTER);
     }
 
     protected Component[][] getUseComponent() {
-        UILabel lineStyleLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style"));
+        UILabel lineStyleLabel = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Line_Style"));
-        UILabel colorLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color"));
+        UILabel colorLabel = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Color"));
 
         return new Component[][]{
                 new Component[]{null,null},
@@ -52,6 +51,11 @@ public class VanChartBorderPane extends BasicPane {
         };
     }
 
+    protected double[] getRowSize() {
+        double p = TableLayout.PREFERRED;
+        return new double[]{p, p, p, p};
+    }
+
     /**
      * 标题
      * @return 标题

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

@@ -4,10 +4,10 @@ import com.fr.chart.base.AttrBorder;
 import com.fr.chart.chartglyph.GeneralInfo;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.design.widget.FRWidgetFactory;
 
-
 import javax.swing.JSeparator;
 import java.awt.BorderLayout;
 import java.awt.Component;
@@ -19,6 +19,10 @@ public class VanChartBorderWithRadiusPane extends VanChartBorderPane {
     private static final long serialVersionUID = -3937853702118283803L;
     private UISpinner radius;
 
+    public UISpinner getRadius() {
+        return radius;
+    }
+
     @Override
     protected void initComponents() {
         radius = new UISpinner(0,1000,1,0);
@@ -31,11 +35,11 @@ public class VanChartBorderWithRadiusPane extends VanChartBorderPane {
         return new Component[][]{
                 new Component[]{null,null},
                 new Component[]{
-                        FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),
+                        FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Line_Style")),
                         UIComponentUtils.wrapWithBorderLayoutPane(currentLineCombo)
                 },
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")),currentLineColorPane},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color")),currentLineColorPane},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")),radius}
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Radius")),radius}
         } ;
     }
 

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

@@ -0,0 +1,58 @@
+package com.fr.van.chart.designer.component.border;
+
+import com.fr.chart.base.AttrBorder;
+import com.fr.chart.chartglyph.Marker;
+import com.fr.chart.chartglyph.MarkerFactory;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.xcombox.MarkerComboBox;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.utils.gui.UIComponentUtils;
+import com.fr.design.widget.FRWidgetFactory;
+import com.fr.plugin.chart.base.AttrBorderWithShape;
+import com.fr.plugin.chart.marker.type.MarkerType;
+
+import java.awt.Component;
+
+public class VanChartBorderWithShapePane extends VanChartBorderWithRadiusPane {
+
+    private MarkerComboBox shapePane;
+
+    protected void initComponents() {
+        shapePane = new MarkerComboBox(MarkerFactory.getLabelShapeMarkers());
+        super.initComponents();
+    }
+
+    protected Component[][] getUseComponent() {
+        return new Component[][]{
+                new Component[]{null, null},
+                new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Line_Style")),
+                        UIComponentUtils.wrapWithBorderLayoutPane(currentLineCombo)},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color")), currentLineColorPane},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Shape")),
+                        UIComponentUtils.wrapWithBorderLayoutPane(shapePane)},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Radius")), getRadius()}
+        };
+    }
+
+    protected double[] getRowSize() {
+        double p = TableLayout.PREFERRED;
+        return new double[]{p, p, p, p, p};
+    }
+
+    public void populate(AttrBorder border) {
+        super.populate(border);
+
+        if (border instanceof AttrBorderWithShape) {
+            shapePane.setSelectedMarker((Marker.createMarker(((AttrBorderWithShape) border).getShape())));
+        }
+    }
+
+    public void update(AttrBorder border) {
+        super.update(border);
+
+        if (border instanceof AttrBorderWithShape) {
+            ((AttrBorderWithShape) border).setShape(MarkerType.parse(shapePane.getSelectedMarkder().getMarkerType()));
+        }
+    }
+}

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

@@ -24,4 +24,7 @@ public class GaugeLabelContentPane extends VanChartLabelContentPaneWithoutRichTe
         return contentPane;
     }
 
+    protected boolean hasTextStylePane() {
+        return false;
+    }
 }

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

@@ -114,8 +114,9 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
         };
     }
 
-    protected JPanel getLabelPositionPane(Component[][] comps, double[] row, double[] col) {
+    // 仪表盘标签内无布局tab
-        return TableLayoutHelper.createTableLayoutPane(comps, row, col);
+    protected JPanel getLabelLayoutPane(JPanel panel, String title) {
+        return panel;
     }
 
     protected JPanel createTableLayoutPaneWithTitle(String title, JPanel panel) {

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

@@ -1,13 +1,15 @@
 package com.fr.van.chart.designer.style.label;
 
 import com.fr.chart.chartattr.Plot;
-
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.i18n.Toolkit;
+import com.fr.plugin.chart.attr.GaugeDetailStyle;
 import com.fr.plugin.chart.base.AttrLabel;
+import com.fr.plugin.chart.base.AttrLabelDetail;
 import com.fr.plugin.chart.gauge.VanChartGaugePlot;
 import com.fr.plugin.chart.type.GaugeStyle;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.style.VanChartStylePane;
-import com.fr.design.i18n.Toolkit;
 
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
@@ -18,6 +20,9 @@ import java.awt.BorderLayout;
 public class VanChartGaugePlotLabelPane extends VanChartPlotLabelPane {
     private static final long serialVersionUID = -322148616244458359L;
 
+    private UIButtonGroup<Integer> orientation;
+    private JPanel layoutPane;
+
     private VanChartPlotLabelDetailPane gaugeValueLabelPane;
 
     public VanChartGaugePlotLabelPane(Plot plot, VanChartStylePane parent) {
@@ -41,23 +46,65 @@ public class VanChartGaugePlotLabelPane extends VanChartPlotLabelPane {
         }
         JPanel cateOrPercentPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(cateTitle, getLabelDetailPane());
         JPanel valuePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(valueTitle, gaugeValueLabelPane);
+
+        layoutPane = createGaugeLabelLayoutPane();
+
         getLabelPane().add(cateOrPercentPane, BorderLayout.NORTH);
-        getLabelPane().add(valuePane, BorderLayout.SOUTH);
+        getLabelPane().add(valuePane, BorderLayout.CENTER);
+        getLabelPane().add(layoutPane, BorderLayout.SOUTH);
+
+        checkLayoutPaneVisible();
+    }
+
+    private void checkLayoutPaneVisible() {
+        layoutPane.setVisible(showLayoutPane());
+    }
+
+    private boolean showLayoutPane() {
+        VanChartGaugePlot plot = (VanChartGaugePlot) this.getPlot();
+        GaugeDetailStyle gaugeDetailStyle = plot.getGaugeDetailStyle();
+
+        return plot.getGaugeStyle() == GaugeStyle.THERMOMETER && gaugeDetailStyle != null && gaugeDetailStyle.isHorizontalLayout();
+    }
+
+    // 试管仪表盘横行布局时，正常标签外增加布局tab，同时控制百分比和值标签的文本方向
+    private JPanel createGaugeLabelLayoutPane() {
+        orientation = new UIButtonGroup<>(new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal"),
+                Toolkit.i18nText("Fine-Design_Chart_Direction_Vertical"),
+        });
+
+        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Text_Orientation"), orientation);
+
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Form_Attr_Layout"), panel);
     }
 
     public void populate(AttrLabel attr) {
         super.populate(attr);
 
         if(gaugeValueLabelPane != null && attr != null){
-            gaugeValueLabelPane.populate(attr.getGaugeValueLabelDetail());
+            AttrLabelDetail labelDetail = attr.getGaugeValueLabelDetail();
+            gaugeValueLabelPane.populate(labelDetail);
+            orientation.setSelectedIndex(labelDetail.isHorizontal() ? 0 : 1);
+
+            checkLayoutPaneVisible();
         }
     }
 
     public AttrLabel update() {
         AttrLabel attrLabel = super.update();
+
         if(gaugeValueLabelPane != null && attrLabel != null){
-            gaugeValueLabelPane.update(attrLabel.getGaugeValueLabelDetail());
+            AttrLabelDetail defaultLabelDetail = attrLabel.getAttrLabelDetail();
+            AttrLabelDetail valueLabelDetail = attrLabel.getGaugeValueLabelDetail();
+
+            gaugeValueLabelPane.update(valueLabelDetail);
+
+            boolean horizontal = orientation.getSelectedIndex() == 0;
+            defaultLabelDetail.setHorizontal(horizontal);
+            valueLabelDetail.setHorizontal(horizontal);
         }
+
         return attrLabel;
     }
 }

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

@@ -7,12 +7,11 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.design.style.color.ColorSelectBox;
-import com.fr.design.i18n.Toolkit;
-
 import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.attr.plot.VanChartLabelPositionPlot;
 import com.fr.plugin.chart.base.AttrLabelDetail;
@@ -20,6 +19,8 @@ import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.stable.Constants;
 import com.fr.van.chart.designer.PlotFactory;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+import com.fr.van.chart.designer.component.background.VanChartBackgroundWithOutImagePane;
+import com.fr.van.chart.designer.component.border.VanChartBorderWithShapePane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -28,9 +29,6 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 /**
  * Created by Mitisky on 15/12/7.
@@ -42,9 +40,12 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
 
     private UIButtonGroup<Integer> position;
     private UIButtonGroup<Boolean> autoAdjust;
+    private UIButtonGroup<Integer> orientation;
     private UIToggleButton tractionLine;
 
     private ColorSelectBox backgroundColor;
+    private VanChartBorderWithShapePane borderPane;
+    private VanChartBackgroundWithOutImagePane backgroundPane;
 
     private JPanel tractionLinePane;
     private JPanel positionPane;
@@ -100,15 +101,48 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
 
     protected Component[][] getLabelPaneComponents(Plot plot, double p, double[] columnSize) {
         if(hasLabelPosition(plot)){
+
+            // 仅饼图、柱形图、条形图、折线图、面积图含有边框和背景
+            if (hasBorderAndBackground(plot)) {
+                return new Component[][]{
+                        new Component[]{dataLabelContentPane,null},
+                        new Component[]{createLabelPositionPane(Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), plot), null},
+                        new Component[]{createLabelBorderPane(), null},
+                        new Component[]{createLabelBackgroundPane(), null}
+                };
+            }
+
             return new Component[][]{
                     new Component[]{dataLabelContentPane,null},
                     new Component[]{createLabelPositionPane(Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), plot), null}
             };
-        } else {
+        }
+
         return  new Component[][]{
                 new Component[]{dataLabelContentPane,null}
         };
     }
+
+    private JPanel createLabelBorderPane() {
+        borderPane  = new VanChartBorderWithShapePane();
+
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Border"), borderPane);
+    }
+
+    private JPanel createLabelBackgroundPane() {
+        backgroundPane = new VanChartBackgroundWithOutImagePane(){
+
+            protected Component[][] getPaneComponents() {
+                return new Component[][]{
+                        new Component[]{null, null},
+                        new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Fill")), typeComboBox},
+                        new Component[]{null, centerPane},
+                        new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent},
+                };
+            }
+        };
+
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane);
     }
 
     protected double[] getLabelStyleRowSize(double p) {
@@ -123,6 +157,10 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         return plot instanceof VanChartLabelPositionPlot;
     }
 
+    private boolean hasBorderAndBackground(Plot plot) {
+        return PlotFactory.hasBorderAndBackgroundPlotLabel(plot);
+    }
+
     protected JPanel createTableLayoutPaneWithTitle(String title, JPanel panel) {
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(title, panel);
     }
@@ -157,8 +195,11 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
 
         positionPane = new JPanel();
         checkPositionPane(title);
-        panel.add(positionPane, BorderLayout.CENTER);
+        panel.add(positionPane, BorderLayout.NORTH);
 
+        if (hasLabelOrientationPane()) {
+            panel.add(createLabelOrientationPane(), BorderLayout.CENTER);
+        }
 
         if (plot.isSupportLeadLine()) {
             tractionLine = new UIToggleButton(Toolkit.i18nText("Fine-Design_Chart_Show_Guideline"));
@@ -168,7 +209,25 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         } else if (PlotFactory.plotAutoAdjustLabelPosition(plot)) {
             panel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Auto_Adjust"), autoAdjust), BorderLayout.SOUTH);
         }
-        return panel;
+
+        return getLabelLayoutPane(panel, Toolkit.i18nText("Fine-Design_Form_Attr_Layout"));
+    }
+
+    protected JPanel getLabelLayoutPane(JPanel panel, String title) {
+        return createTableLayoutPaneWithTitle(title, panel);
+    }
+
+    protected boolean hasLabelOrientationPane() {
+        return false;
+    }
+
+    private JPanel createLabelOrientationPane() {
+        orientation = new UIButtonGroup<>(new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal"),
+                Toolkit.i18nText("Fine-Design_Chart_Direction_Vertical"),
+        });
+
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Text_Orientation"), orientation);
     }
 
     protected void checkPositionPane(String title) {
@@ -205,13 +264,10 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         }
     }
 
-
     protected JPanel getLabelPositionPane (Component[][] comps, double[] row, double[] col){
-        JPanel panel = TableLayoutHelper.createTableLayoutPane(comps,row,col);
+        return TableLayoutHelper.createTableLayoutPane(comps, row, col);
-        return createTableLayoutPaneWithTitle(Toolkit.i18nText("Fine-Design_Form_Attr_Layout"), panel);
     }
 
-
     protected void initPositionListener() {
         position.addChangeListener(new ChangeListener() {
             @Override
@@ -267,16 +323,25 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         if(position != null){
             position.setSelectedItem(detail.getPosition());
         }
+        if(orientation != null){
+            orientation.setSelectedIndex(detail.isHorizontal() ? 0 : 1);
+        }
         if(tractionLine != null){
             tractionLine.setSelected(detail.isShowGuidLine());
         }
         if(autoAdjust != null){
-            autoAdjust.setSelectedIndex(detail.isAutoAdjust() == true ? 0 : 1);
+            autoAdjust.setSelectedIndex(detail.isAutoAdjust() ? 0 : 1);
         }
 
         if(backgroundColor != null){
             backgroundColor.setSelectObject(detail.getBackgroundColor());
         }
+        if(borderPane != null){
+            borderPane.populate(detail.getBorder());
+        }
+        if(backgroundPane != null){
+            backgroundPane.populate(detail.getBackground());
+        }
 
         checkAllUse();
     }
@@ -294,12 +359,21 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
 
         detail.setAutoAdjust(autoAdjust != null && autoAdjust.getSelectedItem());
 
+        if(orientation != null){
+            detail.setHorizontal(orientation.getSelectedIndex() == 0);
+        }
         if(tractionLine != null){
             detail.setShowGuidLine(tractionLine.isSelected() && detail.getPosition() == Constants.OUTSIDE);
         }
         if(backgroundColor != null){
             detail.setBackgroundColor(backgroundColor.getSelectObject());
         }
+        if(borderPane != null){
+            borderPane.update(detail.getBorder());
+        }
+        if(backgroundPane != null){
+            backgroundPane.update(detail.getBackground());
+        }
     }
 
 }

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

@@ -1,13 +1,13 @@
 package com.fr.van.chart.drillmap.designer.data.comp;
 
 import com.fr.design.constants.UIConstants;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.map.designer.type.GEOJSONTreeHelper;
 import com.fr.plugin.chart.map.server.ChartGEOJSONHelper;
 import com.fr.plugin.chart.map.server.CompatibleGEOJSONHelper;
 import com.fr.stable.StringUtils;
 
+import javax.swing.BorderFactory;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
@@ -15,7 +15,6 @@ import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.util.Enumeration;
 
 /**
@@ -49,7 +48,7 @@ public class MapDataTree extends JTree {
         if (children.hasMoreElements()) {
             DefaultMutableTreeNode child = (DefaultMutableTreeNode) children.nextElement();
 
-            if(GEOJSONTreeHelper.getInstance().isSelectableTreeNode(child)){
+            if (GEOJSONTreeHelper.isSelectableTreeNode(child)) {
                 selectTreeNode(child, m_model);
             } else {
                 setFirstChildTreeNode(child, m_model);
@@ -115,14 +114,7 @@ public class MapDataTree extends JTree {
             DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) value;
             String name = getPresentName(treeNode);
             this.setText(name);
-
+            this.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0));
-            UILabel label = new UILabel();
-            label.setText(getText());
-            label.setIcon(getIcon());
-            this.setSize(label.getPreferredSize());
-            Dimension dim = label.getPreferredSize();
-            dim.height += 2;
-            this.setPreferredSize(dim);
             this.setBackgroundNonSelectionColor(UIConstants.NORMAL_BACKGROUND);
             this.setForeground(UIConstants.FONT_COLOR);
             this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE);

designer-chart/src/main/resources/com/fr/design/editor/rich_editor.css

@@ -0,0 +1,22 @@
+.editor-insert-param-inactivated-font .b-font {
+    *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.editor-insert-param-inactivated-font .b-font:before {
+    content: "\e6ea";
+    color: inherit;
+}
+.editor-insert-param-inactivated-font.disabled .b-font:before {
+    content: "\e6ea";
+    color: inherit;
+}
+.editor-insert-param-active-font .b-font {
+    *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.editor-insert-param-active-font .b-font:before {
+    content: "\e6ea";
+    color: #23beef;
+}
+.editor-insert-param-active-font.disabled .b-font:before {
+    content: "\e6ea";
+    color: #23beef;
+}

designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html

@@ -4,6 +4,7 @@
     <meta charset="utf-8"/>
     <title></title>
     <link rel="stylesheet" type="text/css" href="http://fanruan.design/fineui/2.0/fineui.min.css"/>
+    <link rel="stylesheet" type="text/css" href="./rich_editor.css"/>
     <script src="http://fanruan.design/fineui/2.0/fineui.js"></script>
     <script src="https://fanruan.design/fineui/materials.bundle.min.js"></script>
 </head>

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

@@ -3,14 +3,13 @@ package com.fr.design.designer.treeview;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XCreatorUtils;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.log.FineLoggerFactory;
 
+import javax.swing.BorderFactory;
 import javax.swing.Icon;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import java.awt.Component;
-import java.awt.Dimension;
 
 public class ComponentTreeCellRenderer extends DefaultTreeCellRenderer {
 
@@ -34,13 +33,7 @@ public class ComponentTreeCellRenderer extends DefaultTreeCellRenderer {
                 setIcon(icon);
             }
         }
-		UILabel label = new UILabel();
+        this.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0));
-		label.setText(getText());
-		label.setIcon(getIcon());
-		Dimension dim = label.getPreferredSize();
-		dim.height += 2;
-		this.setSize(dim);
-		this.setPreferredSize(dim);
         this.setBackgroundNonSelectionColor(UIConstants.TREE_BACKGROUND);
         return this;
     }

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

@@ -177,8 +177,8 @@ public class EditingMouseListener extends MouseInputAdapter {
                 if (designer.isDrawLineMode()) {
                     designer.updateDrawLineMode(e);
                 } else {
-                    int relativeX = Math.max(0, designer.getRelativeX(e.getX()));
+                    int relativeX = Math.max(0, e.getX());
-                    int relativeY = Math.max(0, designer.getRelativeY(e.getY()));
+                    int relativeY = Math.max(0, e.getY());
 
                     if (selectionModel.hasSelectionComponent()
                             && selectionModel.getSelection().getRelativeBounds().contains(