REPORT-14057 10.0日文国际化问题处理=>调整代码

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

@@ -8,6 +8,7 @@ import com.fr.design.gui.icombobox.LineComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.style.color.ColorSelectBox;
+import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.stable.CoreConstants;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
@@ -46,7 +47,7 @@ public class VanChartBorderPane extends BasicPane {
 
         return new Component[][]{
                 new Component[]{null,null},
-                new Component[]{lineStyleLabel, currentLineCombo},
+                new Component[]{lineStyleLabel, UIComponentUtils.wrapWithBorderLayoutPane(currentLineCombo)},
                 new Component[]{colorLabel, currentLineColorPane},
         };
     }

designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupDockingPane.java

@@ -38,6 +38,7 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane {
     private static final int BIND_GROUP = 0;
     private static final int BIND_SELECTED = 1;
     private static final int BIND_SUMMARY = 2;
+    private static final int DATA_SET_LABEL_WIDTH = 60;
 
     private UIButton advancedButton;
     private FunctionComboBox functionComboBox;
@@ -65,7 +66,6 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         UILabel dataSetLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Setting"));
-        dataSetLabel.setPreferredSize(new Dimension(60, 20));
         Component[][] components = new Component[][]
                 {
                         new Component[]{dataSetLabel, UIComponentUtils.wrapWithBorderLayoutPane(goBox)},
@@ -93,7 +93,7 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane {
             }
         });
 
-        double[] columnSize = {60, f};
+        double[] columnSize = {DATA_SET_LABEL_WIDTH, f};
         double[] rowSize = {p, p};
         return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 8, 10);
     }

designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java

@@ -49,6 +49,7 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
 
     protected static final Dimension LABEL_DIMENSION = new Dimension(60, 20);
     protected static final int VGAP = 10, HGAP = 8, VGAP_INNER = 3;
+    private static final int INSERT_CONTENT_LABEL_WIDTH = 60;
 
     /**
      * 滚动条相关配置
@@ -206,7 +207,7 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
     private JPanel initTopContent() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
-        double[] columnSize = {60, f};
+        double[] columnSize = {INSERT_CONTENT_LABEL_WIDTH, f};
         double[] rowSize = {p, p};
         UILabel cellLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell"));
         UILabel insertContentLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert_Cell_Element"));