Pull request #3112: REPORT-45441 聚合报表-设计-图表块-名称功能描述优化

Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0

* commit 'ad8b0577f478b100d55323723ed7fbe4af98176e':
  REPORT-45441 聚合报表-设计-图表块-名称功能描述优化
  REPORT-45441 聚合报表-设计-图表块-名称功能描述优化
  REPORT-45441 聚合报表-设计-图表块-名称功能描述优化

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

@@ -105,7 +105,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         FORM_REPORT,  // 表单报表块
         POLY,  // 聚合报表
         POLY_REPORT,  // 聚合报表-报表块
-        POLY_CHART,  // 聚合报表-图表块
+        POLY_CHART(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings")),  // 聚合报表-图表块
         AUTHORITY_EDITION,  // 权限编辑
         AUTHORITY_EDITION_DISABLED; // 权限编辑
 

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

@@ -19,6 +19,30 @@ import java.awt.Component;
  * Created by plough on 2017/8/7.
  */
 public class WidgetBoundsPaneFactory {
+
+    public enum NameAttribute {
+        //默认的名称
+        DEFAULT(Toolkit.i18nText("Fine-Design_Basic_Component_Position"), Toolkit.i18nText("Fine-Design_Basic_Component_Size")),
+        //控件对应的名称
+        WIDGET(Toolkit.i18nText("Fine-Design_Basic_Widget_Position"), Toolkit.i18nText("Fine-Design_Basic_Widget_Size"));
+
+        private String positionName;
+        private String sizeName;
+        
+        NameAttribute(String positionName, String sizeName) {
+            this.positionName = positionName;
+            this.sizeName = sizeName;
+        }
+
+        public String getPositionName() {
+            return positionName;
+        }
+
+        public String getSizeName() {
+            return sizeName;
+        }
+    }
+
     private static final int RIGHT_PANE_WIDTH = 145;
 
     public static UIExpandablePane createBoundsPane(UISpinner width, UISpinner height) {
@@ -37,6 +61,7 @@ public class WidgetBoundsPaneFactory {
         boundsPane.add(panel);
         return new UIExpandablePane(Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"), 280, 24, boundsPane);
     }
+
     public static JPanel createRightPane(Component com1, Component com2) {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
@@ -49,16 +74,16 @@ 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) {
+    public static UIExpandablePane createAbsoluteBoundsPane(UISpinner x, UISpinner y, UISpinner width, UISpinner height, NameAttribute nameAttribute) {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
 
         Component[][] northComponents = new Component[][]{
-                new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Basic_Widget_Position")), createRightPane(x, y)},
+                new Component[]{FRWidgetFactory.createLineWrapLabel(nameAttribute.getPositionName()), 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))},
         };
         Component[][] centerComponents = new Component[][]{
-                new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Basic_Widget_Size")), createRightPane(width, height)},
+                new Component[]{FRWidgetFactory.createLineWrapLabel(nameAttribute.getSizeName()), 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};
@@ -74,6 +99,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) {
+        return createAbsoluteBoundsPane(x, y, width, height, NameAttribute.DEFAULT);
+    }
+
 
     public static UIExpandablePane createCardTagBoundPane(UISpinner width) {
         JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();

designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java

@@ -34,7 +34,7 @@ public class WidgetAbsoluteBoundPane extends WidgetBoundPane {
         y.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"));
         width.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"));
         height.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"));
-        this.add(WidgetBoundsPaneFactory.createAbsoluteBoundsPane(x, y, width, height));
+        this.add(WidgetBoundsPaneFactory.createAbsoluteBoundsPane(x, y, width, height, WidgetBoundsPaneFactory.NameAttribute.WIDGET));
     }
 
     @Override