Merge pull request #88 in BA/design from ~SHINE/design:dev to dev

* commit 'f5e26549e5ba933e817ddbb9281d8ac47f56c0dc':
  地图配置

designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java

@@ -89,15 +89,25 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
         double f = TableLayout.FILL;
         double[] columnSize = {f};
         double[] rowSize = {p, p};
-        Component[][] components = new Component[][]{
+        Component[][] components = getUseComponent();
-                new Component[]{seriesDataPane},
-                new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Data_Filter"))},
-        };
         centerPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
         this.setLayout(new BorderLayout());
         this.add(centerPane, BorderLayout.CENTER);
     }
 
+    protected Component[][] getUseComponent() {
+        return new Component[][]{
+                new Component[]{seriesDataPane},
+                new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Data_Filter"))},
+        };
+    }
+
+    protected Component[][] getUseComponentWithOutFilter() {
+        return new Component[][]{
+                new Component[]{seriesDataPane}
+        };
+    }
+
     /**
      * 判断是都接受
      * @param ob 传过来得

designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java

@@ -82,13 +82,7 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
         Label2.setPreferredSize(new Dimension(75, 20));
         UILabel Label3 = new UILabel(Inter.getLocText("Chart-Summary_Method") + ":", SwingConstants.RIGHT);
         Label3.setPreferredSize(new Dimension(75, 20));
-        Component[][] components = new Component[][]{
+        Component[][] components = getUseComponent(Label1, Label2, Label3);
-                new Component[]{GUICoreUtils.createBorderLayoutPane(new Component[]{seriesName, null, null, Label1, null})},
-                new Component[]{GUICoreUtils.createBorderLayoutPane(new Component[]{seriesValue, null, null, Label2, null})},
-                new Component[]{GUICoreUtils.createBorderLayoutPane(new Component[]{calculateCombox, null, null, Label3, null})},
-                new Component[]{new JSeparator()},
-                new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart-Data_Filter"))},
-        };
 
         centerPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 4, 6);
         centerPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 1));
@@ -107,17 +101,46 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
         Label2.setPreferredSize(new Dimension(75, 20));
         UILabel Label3 = new UILabel(Inter.getLocText("Chart-Summary_Method") + ":", SwingConstants.RIGHT);
         Label3.setPreferredSize(new Dimension(75, 20));
-        Component[][] components = new Component[][]{
+        Component[][] components = getUseComponentWithOutSummary(Label1, Label2, Label3);
+
+        centerPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 4, 6);
+        centerPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 1));
+        this.setLayout(new BorderLayout());
+        this.add(centerPane, BorderLayout.CENTER);
+    }
+
+    protected Component[][] getUseComponent(UILabel Label1, UILabel Label2, UILabel Label3) {
+        return new Component[][]{
                 new Component[]{GUICoreUtils.createBorderLayoutPane(new Component[]{seriesName, null, null, Label1, null})},
                 new Component[]{GUICoreUtils.createBorderLayoutPane(new Component[]{seriesValue, null, null, Label2, null})},
+                new Component[]{GUICoreUtils.createBorderLayoutPane(new Component[]{calculateCombox, null, null, Label3, null})},
                 new Component[]{new JSeparator()},
                 new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart-Data_Filter"))},
         };
+    }
 
-        centerPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 4, 6);
+    protected Component[][] getUseComponentWithOutFilter(UILabel Label1, UILabel Label2, UILabel Label3) {
-        centerPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 1));
+        return new Component[][]{
-        this.setLayout(new BorderLayout());
+                new Component[]{GUICoreUtils.createBorderLayoutPane(new Component[]{seriesName, null, null, Label1, null})},
-        this.add(centerPane, BorderLayout.CENTER);
+                new Component[]{GUICoreUtils.createBorderLayoutPane(new Component[]{seriesValue, null, null, Label2, null})},
+                new Component[]{GUICoreUtils.createBorderLayoutPane(new Component[]{calculateCombox, null, null, Label3, null})}
+        };
+    }
+
+    protected Component[][] getUseComponentWithOutSummary(UILabel Label1, UILabel Label2, UILabel Label3) {
+        return new Component[][]{
+                new Component[]{GUICoreUtils.createBorderLayoutPane(new Component[]{seriesName, null, null, Label1, null})},
+                new Component[]{GUICoreUtils.createBorderLayoutPane(new Component[]{seriesValue, null, null, Label2, null})},
+                new Component[]{new JSeparator()},
+                new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart-Data_Filter"))},
+        };
+    }
+
+    protected Component[][] getUseComponentWithOutFilterAndSummary(UILabel Label1, UILabel Label2, UILabel Label3) {
+        return new Component[][]{
+                new Component[]{GUICoreUtils.createBorderLayoutPane(new Component[]{seriesName, null, null, Label1, null})},
+                new Component[]{GUICoreUtils.createBorderLayoutPane(new Component[]{seriesValue, null, null, Label2, null})}
+        };
     }
 
     /**

designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java

@@ -93,14 +93,22 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
 
     @Override
     protected List<FurtherBasicBeanPane<? extends ChartCollection>> initPaneList() {
-        nameFieldValuePane = new SeriesNameUseFieldValuePane();
+        nameFieldValuePane = createValuePane();
-        nameFieldNamePane = new SeriesNameUseFieldNamePane();
+        nameFieldNamePane = createNamePane();
         List<FurtherBasicBeanPane<? extends ChartCollection>> paneList = new ArrayList<FurtherBasicBeanPane<? extends ChartCollection>>();
         paneList.add(nameFieldValuePane);
         paneList.add(nameFieldNamePane);
         return paneList;
     }
 
+    protected SeriesNameUseFieldValuePane createValuePane() {
+        return new SeriesNameUseFieldValuePane();
+    }
+
+    protected SeriesNameUseFieldNamePane createNamePane() {
+        return new SeriesNameUseFieldNamePane();
+    }
+
     public void populateBean(ChartCollection ob, boolean isNeedSummary) {
         this.isNeedSummary = isNeedSummary;
         TopDefinitionProvider definition = ob.getSelectedChart().getFilterDefinition();