Merge pull request #1964 in DESIGN/design from final/10.0 to persist/10.0

* commit '0d38184173442ac749b3153f795551fadac00e12':
  REPORT-36310【冒烟】决策报表新建模板，模板像素的位置不在正中间
  无jira任务 单元测试依赖
  CHART-14801 面板样式修改

build.gradle

@@ -58,7 +58,6 @@ allprojects {
 
     dependencies {
         implementation 'com.fr.third:jxbrowser:6.23'
-        implementation 'com.fr.third:jxbrowser-swing:6.23'
         implementation 'com.fr.third:jxbrowser-mac:6.23'
         implementation 'com.fr.third:jxbrowser-win64:6.23'
         implementation 'com.fr.third.server:servlet-api:3.0'

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

@@ -13,21 +13,20 @@ import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane;
-
 import com.fr.stable.StringUtils;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
 
 
 /**
@@ -72,14 +71,14 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor
 
 		catePane.add(boxPane, BorderLayout.SOUTH);
 
-		catePane.setBorder(BorderFactory.createEmptyBorder(0,24,10,6));
+		catePane.setBorder(BorderFactory.createEmptyBorder(0,24,10,20));
 
 		this.add(catePane, "0,0,2,0");
 		filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent);
 		JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane);
 		panel.setBorder(getSidesBorder());
 		filterPane.setBorder(getFilterPaneBorder());
-		this.add(panel, "0,6,2,4");
+		this.add(panel, "0,6,1,4");
 
 		addButton.addActionListener(new ActionListener() {
 			@Override

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

@@ -10,7 +10,6 @@ import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane;
-
 import com.fr.stable.StringUtils;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
@@ -18,9 +17,9 @@ import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.util.List;
 
 public class CategoryPlotReportDataContentPane extends AbstractReportDataContentPane {
 	protected static final int PRE_WIDTH = 210;
@@ -35,14 +34,14 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent
     public CategoryPlotReportDataContentPane(ChartDataPane parent) {
         initEveryPane();
         categoryName = initCategoryBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name"));
-        categoryName.setPreferredSize(new Dimension(246,30));
-        categoryName.setBorder(BorderFactory.createEmptyBorder(0,24,0,7));
-        this.add(categoryName, "0,0,2,0");
+        categoryName.setPreferredSize(new Dimension(236,30));
+        categoryName.setBorder(BorderFactory.createEmptyBorder(0,24,0,20));
+        this.add(categoryName, "0,0,1,0");
         filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent);
         JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane);
         panel.setBorder(getSidesBorder());
         filterPane.setBorder(getFilterPaneBorder());
-        this.add(panel, "0,6,2,4");    }
+        this.add(panel, "0,6,1,4");    }
     
 	protected TinyFormulaPane initCategoryBox(final String leftLabel) {
 		TinyFormulaPane categoryName = new TinyFormulaPane() {

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

@@ -151,9 +151,9 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         double[] rowSize = {f};
-        double[] columnSize = {p, f, p, p, p, p, p, p};
+        double[] columnSize = {p, f, p, p, p, p, p, f, p};
         UILabel tipsPane = new UILabel("form");
-        tipsPane.setPreferredSize(new Dimension(200, 0));
+        tipsPane.setPreferredSize(new Dimension(375, 0));
         widthPane = new UINumberField();
         widthPane.setPreferredSize(new Dimension(60, 0));
         heightPane = new UINumberField();
@@ -167,6 +167,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
                         new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel")),
                         new UILabel("x"), heightPane,
                         new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel")),
+                        new UILabel(),
                         slidePane}}, rowSize, columnSize, RESIZE_PANE_GAP);
         this.add(FormRulerLayout.BOTTOM, resizePane);
         setWidgetsConfig();