Merge pull request #996 in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0

* commit '20d6a888fb653052140b208a64da86522b0d1e23':
  REPORT-19565 设计器英文版-控件的数据字典部分显示问题

designer-realize/src/main/java/com/fr/design/widget/ui/ButtonGroupDictPane.java

@@ -18,6 +18,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.widget.accessibles.AccessibleDictionaryEditor;
+import com.fr.design.widget.FRWidgetFactory;
 import com.fr.form.ui.ButtonGroup;
 
 
@@ -42,23 +43,28 @@ public class ButtonGroupDictPane extends JPanel {
 		adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive"), true);
 		adaptiveCheckbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		adaptiveCheckbox.addActionListener(new ActionListener() {
+			@Override
 			public void actionPerformed(ActionEvent e) {
 				columnSpinner.setVisible(!adaptiveCheckbox.isSelected());
 				columnLabel.setVisible(!adaptiveCheckbox.isSelected());
 			}
 		});
-		this.columnLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns") + ":");
+		UILabel dictLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary"));
+		this.columnLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns") + ":", dictLabel.getPreferredSize().width);
 		columnSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1));
 
 		double f = TableLayout.FILL;
 		double p = TableLayout.PREFERRED;
-		double rowSize[] = {p, p};
+		double[] rowSize = {p, p, p};
-		double columnSize[] = {p, p, f};
+		double[] columnSize = {p, f};
-		Component[][] n_components = {
+		int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
-				{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")), dictPane, null},
+		Component[][] components = {
-				{adaptiveCheckbox, columnLabel, columnSpinner}
+				new Component[] {dictLabel, dictPane},
+				new Component[] {adaptiveCheckbox, null},
+				new Component[] {columnLabel, columnSpinner}
 		};
-		JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+		JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+		panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
 		this.add(panel);