REPORT-45441 聚合报表-设计-图表块-名称功能描述优化

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

@@ -22,19 +22,14 @@ public class WidgetBoundsPaneFactory {
 
     public enum NameAttribute {
         //默认的名称
-        DEFAULT(),
+        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"));
+        WIDGET(Toolkit.i18nText("Fine-Design_Basic_Widget_Position"), Toolkit.i18nText("Fine-Design_Basic_Widget_Size"));
 
         private String positionName;
         private String sizeName;
-
+        
-        NameAttribute() {
+        NameAttribute(String positionName, String sizeName) {
-            this.positionName = Toolkit.i18nText("Fine-Design_Basic_Component_Position");
-            this.sizeName = Toolkit.i18nText("Fine-Design_Basic_Component_Size");
-        }
-
-        NameAttribute(String positionName,String sizeName) {
             this.positionName = positionName;
             this.sizeName = sizeName;
         }
@@ -66,7 +61,8 @@ 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){
+
+    public static JPanel createRightPane(Component com1, Component com2) {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         double[] rowSize = {p};
@@ -78,7 +74,7 @@ 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,NameAttribute nameAttribute) {
+    public static UIExpandablePane createAbsoluteBoundsPane(UISpinner x, UISpinner y, UISpinner width, UISpinner height, NameAttribute nameAttribute) {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
 
@@ -104,7 +100,7 @@ public class WidgetBoundsPaneFactory {
     }
 
     public static UIExpandablePane createAbsoluteBoundsPane(UISpinner x, UISpinner y, UISpinner width, UISpinner height) {
-        return createAbsoluteBoundsPane( x,  y,  width,  height,NameAttribute.DEFAULT);
+        return createAbsoluteBoundsPane(x, y, width, height, NameAttribute.DEFAULT);
     }