Pull request #2839: CHART-16721 预定义样式功能回退

Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0

* commit '70a489ac1ce9c644d1a130ab102fbff25bd75aed':
  CHART-16721 预定义样式代码回退

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java

@@ -69,7 +69,9 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane {
 
     //边框（有圆角）
     protected VanChartBorderPane createDiffBorderPane() {
-        return new VanChartBorderWithRadiusPane(true);
+        return new VanChartBorderWithRadiusPane();
+        //TODO Bjorn 边框自动回退
+        //return new VanChartBorderWithRadiusPane(true);
     }
 
     private JPanel createSeriesStylePane(double[] row, double[] col) {

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

@@ -27,12 +27,15 @@ public class VanChartFillStylePane extends ColorFillStylePane implements Designe
     }
 
     protected void styleSelectBoxChange() {
-        getCustomPane().setVisible(getStyleSelectBox().getSelectedIndex() != 0);
+        //TODO Bjorn 配色预定义回退
+        //getCustomPane().setVisible(getStyleSelectBox().getSelectedIndex() != 0);
         super.styleSelectBoxChange();
     }
 
     protected ColorSchemeComboBox createColorSchemeComboBox() {
-        return new ColorSchemeComboBox(null, true);
+        return new ColorSchemeComboBox();
+        //TODO Bjorn 配色预定义回退
+        //return new ColorSchemeComboBox(null, true);
     }
 
     protected void initLayout() {
@@ -60,19 +63,21 @@ public class VanChartFillStylePane extends ColorFillStylePane implements Designe
     }
 
     public void populateBean(AttrFillStyle condition) {
-        if (condition.isPredefinedStyle()) {
+       /* if (condition.isPredefinedStyle()) {
             getStyleSelectBox().setSelectType(ColorSchemeComboBox.SelectType.DEFAULT);
             return;
-        }
+        }*/
+        //TODO Bjorn 配色预定义回退
         populateBean(condition.getColorFillStyle());
     }
 
     public void updateBean(AttrFillStyle attrFillStyle) {
-        if (getStyleSelectBox().getSelectedIndex() == 0) {
+       /* if (getStyleSelectBox().getSelectedIndex() == 0) {
             attrFillStyle.setPredefinedStyle(true);
             return;
         }
-        attrFillStyle.setPredefinedStyle(false);
+        attrFillStyle.setPredefinedStyle(false);*/
+        //TODO Bjorn 配色预定义回退
         attrFillStyle.setColorFillStyle(updateBean());
     }
 

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

@@ -1,12 +1,10 @@
 package com.fr.van.chart.designer.component;
 
-import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithPreStyle;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.type.TextAlign;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
-import java.awt.BorderLayout;
 
 public class VanChartLabelContentPane extends VanChartTooltipContentPane {
 
@@ -24,7 +22,8 @@ public class VanChartLabelContentPane extends VanChartTooltipContentPane {
         return new AttrTooltipContent(TextAlign.CENTER);
     }
 
-    public JPanel createCommonStylePane() {
+    //TODO Bjorn 标签面板回退
+   /* public JPanel createCommonStylePane() {
         if (isInCondition()) {
             return super.createCommonStylePane();
         }
@@ -47,5 +46,5 @@ public class VanChartLabelContentPane extends VanChartTooltipContentPane {
                 attrTooltipContent.setCustom(true);
             }
         }
-    }
+    }*/
 }

designer-chart/src/main/java/com/fr/van/chart/designer/style/MapRangeLegendPane.java

@@ -20,6 +20,8 @@ public class MapRangeLegendPane extends VanChartRangeLegendPane {
 
     @Override
     protected VanChartBackgroundPane creatBackgroundPane() {
-        return new VanChartBackgroundWithOutImagePane(true);
+        //TODO Bjorn 地图图例背景自动逻辑
+        return new VanChartBackgroundWithOutImagePane();
+        //return new VanChartBackgroundWithOutImagePane(true);
     }
 }

designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java

@@ -14,7 +14,6 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
-import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithPreStyle;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.plugin.chart.attr.VanChartLegend;
 import com.fr.plugin.chart.type.LayoutType;
@@ -287,7 +286,9 @@ public class VanChartPlotLegendPane extends BasicPane {
     }
 
     private JPanel createTitleStylePane() {
-        textAttrPane = new ChartTextAttrPaneWithPreStyle();
+        //TODO Bjorn 图例预定义逻辑
+        //textAttrPane = new ChartTextAttrPaneWithPreStyle();
+        textAttrPane = new ChartTextAttrPane();
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), textAttrPane);
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java

@@ -15,7 +15,7 @@ import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
-import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithPreStyle;
+import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.design.mainframe.chart.info.ChartInfoCollector;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.plugin.chart.attr.VanChartTitle;
@@ -54,7 +54,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
     private JPanel titlePane;
 
     private TinyFormulaPane titleContent;
-    private ChartTextAttrPaneWithPreStyle textAttrPane;
+    private ChartTextAttrPane textAttrPane;
     private UIButtonGroup<Integer> alignmentPane;
     private VanChartBackgroundWithOutShadowWithRadiusPane backgroundPane;
     private UIToggleButton useHtml;
@@ -175,7 +175,9 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
     }
 
     private JPanel createTitleStylePane() {
-        textAttrPane = new ChartTextAttrPaneWithPreStyle();
+        //TODO Bjorn 标题预定义逻辑
+        //textAttrPane = new ChartTextAttrPaneWithPreStyle();
+        textAttrPane = new ChartTextAttrPane();
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), textAttrPane);
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitleWithAutoBackground.java

@@ -14,6 +14,8 @@ public class VanChartTitleWithAutoBackground extends VanChartTitlePane {
     }
 
     protected VanChartBackgroundWithOutShadowWithRadiusPane createBackgroundPane() {
-        return new VanChartBackgroundWithOutShadowWithRadiusPane(true);
+        //TODO Bjorn 地图标题背景自动逻辑
+        //return new VanChartBackgroundWithOutShadowWithRadiusPane(true);
+        return new VanChartBackgroundWithOutShadowWithRadiusPane();
     }
 }

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java

@@ -20,8 +20,7 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
-import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithPreStyle;
+import com.fr.design.style.color.ColorSelectBox;
-import com.fr.design.mainframe.chart.gui.style.ColorSelectBoxWithPreStyle;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.plugin.chart.attr.axis.VanChartAxis;
@@ -85,7 +84,11 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     private JPanel labelDisplayPane;
 
     protected LineComboBox axisLineStyle;
-    protected ColorSelectBoxWithPreStyle axisLineColor;
+
+    //TODO Bjorn 坐标轴面板回退
+    protected ColorSelectBox axisLineColor;
+    //protected ColorSelectBoxWithPreStyle axisLineColor;
+
     protected UIButtonGroup<AxisTickLineType> mainTick;
     protected UIButtonGroup<AxisTickLineType> secondTick;
 
@@ -378,16 +381,31 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     }
 
     protected ChartTextAttrPane getChartTextAttrPane() {
-        return new ChartTextAttrPaneWithPreStyle() {
+        //TODO Bjorn 坐标轴面板回退
+       /* return new ChartTextAttrPaneWithPreStyle() {
             protected double getEdithAreaWidth() {
                 return TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH;
             }
+        };*/
+        return new ChartTextAttrPane() {
+            @Override
+            protected JPanel getContentPane(JPanel buttonPane) {
+                double p = TableLayout.PREFERRED;
+                double f = TableLayout.FILL;
+                double e = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH;
+                double[] columnSize = {f, e};
+                double[] rowSize = {p, p, p};
+
+                return TableLayout4VanChartHelper.createGapTableLayoutPane(getComponents(buttonPane), rowSize, columnSize);
+            }
         };
     }
 
     protected JPanel createLineStylePane(double[] row, double[] col) {
         axisLineStyle = createLineComboBox();
-        axisLineColor = new ColorSelectBoxWithPreStyle(100);
+        //TODO Bjorn 坐标轴面板回退
+        //axisLineColor = new ColorSelectBoxWithPreStyle(100);
+        axisLineColor = new ColorSelectBox(100);
         String[] strings = new String[]{Toolkit.i18nText("Fine-Design_Chart_Open"), Toolkit.i18nText("Fine-Design_Chart_Close")};
         AxisTickLineType[] values = new AxisTickLineType[]{AxisTickLineType.TICK_LINE_OUTSIDE, AxisTickLineType.TICK_LINE_NONE};
         mainTick = new UIButtonGroup<AxisTickLineType>(strings, values);
@@ -405,7 +423,9 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         return new Component[][]{
                 new Component[]{null, null},
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Type")), axisLineStyle},
-                new Component[]{axisLineColor, null},
+                //TODO Bjorn 坐标轴面板回退
+                //new Component[]{axisLineColor, null},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color")), axisLineColor},
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")), mainTick},
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Second_Graduation_Line")), secondTick},
         };
@@ -715,7 +735,9 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
             axisLineStyle.setSelectedLineStyle(axis.getAxisStyle());
         }
         if (axisLineColor != null) {
-            axisLineColor.populate(axis.getLineColorWithPreStyle());
+            axisLineColor.setSelectObject(axis.getAxisColor());
+            //TODO Bjorn 坐标轴面板回退
+            //axisLineColor.populate(axis.getLineColorWithPreStyle());
         }
         if (mainTick != null) {
             mainTick.setSelectedItem(axis.getMainTickLine());
@@ -858,7 +880,9 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
             axis.setAxisStyle(axisLineStyle.getSelectedLineStyle());
         }
         if (axisLineColor != null) {
-            axis.setLineColorWithPreStyle(axisLineColor.update());
+            axis.setAxisColor(axisLineColor.getSelectObject());
+            //TODO Bjorn 坐标轴面板回退
+            //axis.setLineColorWithPreStyle(axisLineColor.update());
         }
         if (mainTick != null) {
             axis.setMainTickLine(mainTick.getSelectedItem());

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java

@@ -8,7 +8,6 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithAuto;
-import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithPreStyle;
 import com.fr.design.style.color.ColorSelectBox;
 import com.fr.plugin.chart.attr.axis.VanChartAxis;
 import com.fr.plugin.chart.attr.axis.VanChartGaugeAxis;
@@ -103,7 +102,9 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane {
         if (isMulti(gaugeStyle)) {
             return new ChartTextAttrPaneWithAuto(FontAutoType.SIZE_AND_COLOR);
         } else {
-            return new ChartTextAttrPaneWithPreStyle();
+            return new ChartTextAttrPane();
+            //TODO Bjorn 坐标轴面板回退
+            //return new ChartTextAttrPaneWithPreStyle();
         }
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java

@@ -46,7 +46,9 @@ public class VanChartRadarXAxisPane extends VanChartBaseAxisPane {
         return new Component[][]{
                 new Component[]{null,null} ,
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Type")), axisLineStyle},
-                new Component[]{axisLineColor, null},
+                //TODO Bjorn 坐标轴面板回退
+                //new Component[]{axisLineColor, null},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color")), axisLineColor},
         };
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java

@@ -90,7 +90,9 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane {
         return new Component[][]{
                 new Component[]{null, null},
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Type")), axisLineStyle},
-                new Component[]{axisLineColor, null},
+                //TODO Bjorn 坐标轴面板回退
+                //new Component[]{axisLineColor, null},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color")), axisLineColor},
         };
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAreaBackgroundPane.java

@@ -6,11 +6,9 @@ import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
-
 import com.fr.van.chart.designer.AbstractVanChartScrollPane;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.background.VanChartBackgroundPane;
-import com.fr.van.chart.designer.component.background.VanChartBackgroundPaneWithPreStyle;
 import com.fr.van.chart.designer.component.border.VanChartBorderWithRadiusPane;
 import com.fr.van.chart.designer.style.background.radar.VanChartRadarAxisAreaPane;
 
@@ -42,11 +40,13 @@ public class VanChartAreaBackgroundPane extends AbstractVanChartScrollPane<Chart
     protected JPanel createContentPane() {
         contentPane = new JPanel(new BorderLayout());
         chartBorderPane = new VanChartBorderWithRadiusPane();
-        if(isPlot) {
+        chartBackgroundPane = new VanChartBackgroundPane();
+        //TODO Bjorn 背景面板回退
+       /* if(isPlot) {
             chartBackgroundPane = new VanChartBackgroundPane();
         } else {
             chartBackgroundPane = new VanChartBackgroundPaneWithPreStyle();
-        }
+        }*/
 
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;

designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAxisAreaPane.java

@@ -7,7 +7,6 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.chart.gui.style.ColorSelectBoxWithPreStyle;
 import com.fr.design.style.color.ColorSelectBox;
 import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.VanChartAttrHelper;
@@ -44,8 +43,11 @@ public class VanChartAxisAreaPane extends BasicBeanPane<Plot> {
 
     private LineTypeComboBox horizonLineType;
     private LineTypeComboBox verticalLineType;
-    private ColorSelectBoxWithPreStyle horizontalColorBox;
+    private ColorSelectBox horizontalColorBox;
-    private ColorSelectBoxWithPreStyle verticalColorBox;
+    private ColorSelectBox verticalColorBox;
+    //TODO Bjorn 背景坐标轴面板回退
+   /* private ColorSelectBoxWithPreStyle horizontalColorBox;
+    private ColorSelectBoxWithPreStyle verticalColorBox;*/
     private JPanel horizontalColorPane;
     private JPanel verticalColorPane;
 
@@ -54,8 +56,11 @@ public class VanChartAxisAreaPane extends BasicBeanPane<Plot> {
     }
 
     private void initComponents() {
-        horizontalColorBox = new ColorSelectBoxWithPreStyle(PREFERRED_WIDTH);
+        horizontalColorBox = new ColorSelectBox(PREFERRED_WIDTH);
-        verticalColorBox = new ColorSelectBoxWithPreStyle(PREFERRED_WIDTH);
+        verticalColorBox = new ColorSelectBox(PREFERRED_WIDTH);
+        //TODO Bjorn 背景坐标轴面板回退
+       /* horizontalColorBox = new ColorSelectBoxWithPreStyle(PREFERRED_WIDTH);
+        verticalColorBox = new ColorSelectBoxWithPreStyle(PREFERRED_WIDTH);*/
         horizonLineType = new LineTypeComboBox(new LineType[]{LineType.NONE, LineType.SOLID, LineType.DASHED});
         verticalLineType = new LineTypeComboBox(new LineType[]{LineType.NONE, LineType.SOLID, LineType.DASHED});
 
@@ -88,15 +93,18 @@ public class VanChartAxisAreaPane extends BasicBeanPane<Plot> {
     }
 
     protected void initGridLineComponents() {
+        //TODO Bjorn 背景坐标轴面板回退
         Component[][] upComponent = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{horizontalColorBox, null}
+                new Component[]{null, horizontalColorBox}
+                //new Component[]{horizontalColorBox, null}
         };
         horizontalColorPane = TableLayout4VanChartHelper.createGapTableLayoutPane(upComponent);
 
         Component[][] downComponent = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{verticalColorBox, null}
+                new Component[]{null, verticalColorBox}
+                //new Component[]{verticalColorBox, null}
         };
         verticalColorPane = TableLayout4VanChartHelper.createGapTableLayoutPane(downComponent);
 
@@ -220,13 +228,16 @@ public class VanChartAxisAreaPane extends BasicBeanPane<Plot> {
         VanChartAxis defaultXAxis = rectanglePlot.getDefaultXAxis();
         VanChartAxis defaultYAxis = rectanglePlot.getDefaultYAxis();
 
+        //TODO Bjorn 背景坐标轴面板回退
         if (defaultXAxis != null) {
-            verticalColorBox.populate(defaultXAxis.getMainGridColorWithPreStyle());
+            //verticalColorBox.populate(defaultXAxis.getMainGridColorWithPreStyle());
+            verticalColorBox.setSelectObject(defaultXAxis.getMainGridColor());
             verticalLineType.setSelectedItem(defaultXAxis.getGridLineType());
         }
 
         if (defaultYAxis != null) {
-            horizontalColorBox.populate(defaultYAxis.getMainGridColorWithPreStyle());
+            //horizontalColorBox.populate(defaultYAxis.getMainGridColorWithPreStyle());
+            horizontalColorBox.setSelectObject(defaultYAxis.getMainGridColor());
             horizonLineType.setSelectedItem(defaultYAxis.getGridLineType());
         }
     }
@@ -253,13 +264,16 @@ public class VanChartAxisAreaPane extends BasicBeanPane<Plot> {
         VanChartAxis defaultXAxis = rectanglePlot.getDefaultXAxis();
         VanChartAxis defaultYAxis = rectanglePlot.getDefaultYAxis();
 
+        //TODO Bjorn 背景坐标轴面板回退
         if (defaultXAxis != null) {
-            defaultXAxis.setMainGridColorWithPreStyle(verticalColorBox.update());
+            //defaultXAxis.setMainGridColorWithPreStyle(verticalColorBox.update());
+            defaultXAxis.setMainGridColor(verticalColorBox.getSelectObject());
             defaultXAxis.setGridLineType((LineType) verticalLineType.getSelectedItem());
         }
 
         if (defaultYAxis != null) {
-            defaultYAxis.setMainGridColorWithPreStyle(horizontalColorBox.update());
+            //defaultYAxis.setMainGridColorWithPreStyle(horizontalColorBox.update());
+            defaultYAxis.setMainGridColor(horizontalColorBox.getSelectObject());
             defaultYAxis.setGridLineType((LineType) horizonLineType.getSelectedItem());
         }
     }

designer-chart/src/main/java/com/fr/van/chart/designer/style/datasheet/VanChartDataSheetPane.java

@@ -10,7 +10,6 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
-import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithPreStyle;
 import com.fr.design.mainframe.chart.info.ChartInfoCollector;
 import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.VanChartAttrHelper;
@@ -20,7 +19,6 @@ import com.fr.plugin.chart.type.AxisType;
 import com.fr.van.chart.designer.AbstractVanChartScrollPane;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.border.VanChartBorderPane;
-import com.fr.van.chart.designer.component.border.VanChartBorderPaneWithPreStyle;
 import com.fr.van.chart.designer.component.format.FormatPaneWithNormalType;
 
 import javax.swing.JPanel;
@@ -105,12 +103,15 @@ public class VanChartDataSheetPane extends AbstractVanChartScrollPane<Chart> {
         return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
     }
 
+    //TODO Bjorn 数据表面板回退
     protected VanChartBorderPane createBorderPanePane() {
-        return new VanChartBorderPaneWithPreStyle();
+        return new VanChartBorderPane();
+        //return new VanChartBorderPaneWithPreStyle();
     }
 
     protected ChartTextAttrPane createChartTextAttrPane() {
-        return new ChartTextAttrPaneWithPreStyle();
+        return new ChartTextAttrPane();
+        //return new ChartTextAttrPaneWithPreStyle();
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeCateOrPercentLabelDetailPane.java

@@ -49,6 +49,11 @@ public class VanChartGaugeCateOrPercentLabelDetailPane extends VanChartGaugeLabe
         return getGaugeStyle() == GaugeStyle.RING || getGaugeStyle() == GaugeStyle.SLOT;
     }
 
+    //TODO Bjorn 仪表盘自动逻辑
+    protected boolean isFontColorAuto() {
+        return getGaugeStyle() == GaugeStyle.RING || getGaugeStyle() == GaugeStyle.SLOT;
+    }
+
     protected boolean hasLabelPosition(Plot plot) {
         switch (getGaugeStyle()) {
             case RING:

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java

@@ -80,8 +80,10 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
         return false;
     }
 
+    //TODO Bjorn 仪表盘自动逻辑
     protected boolean isFontColorAuto() {
-        return true;
+        return false;
+        //return true;
     }
 
     private FontAutoType getFontAutoType() {

designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java

@@ -270,7 +270,9 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
     }
 
     protected VanChartBorderPane createDiffBorderPane() {
-        return new VanChartBorderPane(true);
+        return new VanChartBorderPane();
+        //TODO Bjorn 边框自动回退
+        //return new VanChartBorderPane(true);
     }
 
 

designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java

@@ -6,7 +6,6 @@ import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.backgroundpane.ColorBackgroundQuickPane;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.drillmap.VanChartDrillMapPlot;
@@ -76,13 +75,15 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
             }
         };
 
-        backgroundPane = new VanChartBackgroundPaneWithOutImageAndShadow(true) {
+        //TODO Bjorn 钻取地图钻取目录背景自动逻辑
+        /*backgroundPane = new VanChartBackgroundPaneWithOutImageAndShadow(true) {
             @Override
             protected void initList() {
                 paneList.add(new ColorBackgroundQuickPane());
             }
-        };
+        };*/
 
+        backgroundPane = new VanChartBackgroundPaneWithOutImageAndShadow();
         selectBackgroundPane = new VanChartBackgroundPaneWithOutImageAndShadow();
         catalogSuperLink = new VanChartCatalogHyperLinkPane();
 

designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java

@@ -68,7 +68,8 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
         double f = TableLayout.FILL;
         double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
         double[] columnSize = {f};
-        double[] rowSize = {p,p,p,p,p,p,p,p,p,p};
+        //TODO Bjorn
+        double[] rowSize = {p,p,p,p,p,p,p};
         Component[][] components = new Component[][]{
                 new Component[]{createGaugeLayoutPane()},
                 new Component[]{createGaugeStylePane(rowSize, new double[]{f,e})},
@@ -140,12 +141,14 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
     private Component[][] getDiffComponentsWithGaugeStyle() {
         GaugeStyle style = plot == null ? GaugeStyle.POINTER : ((VanChartGaugePlot)plot).getGaugeStyle();
         switch (style) {
+            //TODO Bjorn 仪表盘样式自动逻辑
             case RING:
                 initRotate();
                 return new Component[][]{
                         new Component[]{null, null},
-                        getPaneBackgroundColorAuto(),
+                        getPaneBackgroundColor(),
-                        new Component[]{null, paneBackgroundColor},
+                       /* getPaneBackgroundColorAuto(),
+                        new Component[]{null, paneBackgroundColor},*/
                         getInnerPaneBackgroundColor(),
                         new Component[]{createRadiusPane(Toolkit.i18nText("Fine-Design_Chart_Radius_Set")), null},
                         getChutePercent()
@@ -154,8 +157,9 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
                 return new Component[][]{
                         new Component[]{null, null},
                         getNeedleColor(),
-                        getSlotBackgroundColorAuto(),
+                        getSlotBackgroundColor(),
-                        new Component[]{null, slotBackgroundColor},
+                       /* getSlotBackgroundColorAuto(),
+                        new Component[]{null, slotBackgroundColor},*/
                         new Component[]{createRadiusPane(Toolkit.i18nText("Fine-Design_Chart_Radius_Set")), null},
                         getChutePercent()
                 };
@@ -163,25 +167,33 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
                 return new Component[][]{
                         new Component[]{null, null},
                         getNeedleColor(),
-                        getSlotBackgroundColorAuto(),
+                        getSlotBackgroundColor(),
-                        new Component[]{null, slotBackgroundColor},
+                        /*getSlotBackgroundColorAuto(),
+                        new Component[]{null, slotBackgroundColor},*/
                         new Component[]{createRadiusPane(Toolkit.i18nText("Fine-Design_Chart_Length_Set")), null},
                         getThermometerWidth()
                 };
             default:
                 return new Component[][]{
                         new Component[]{null, null},
-                        getHingeColorAuto(),
+                        getHingeColor(),
-                        new Component[]{null, hingeColor},
+                       /* getHingeColorAuto(),
+                        new Component[]{null, hingeColor},*/
                         getHingeBackgroundColor(),
                         getNeedleColor(),
-                        getPaneBackgroundColorAuto(),
+                        getPaneBackgroundColor(),
-                        new Component[]{null, paneBackgroundColor},
+                       /* getPaneBackgroundColorAuto(),
+                        new Component[]{null, paneBackgroundColor},*/
                         new Component[]{createRadiusPane(Toolkit.i18nText("Fine-Design_Chart_Radius_Set")), null}
                 };
         }
     }
 
+    private Component[] getHingeColor() {
+        hingeColor = new ColorSelectBox(120);
+        return new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Hinge")), hingeColor};
+    }
+
     private Component[] getHingeColorAuto() {
         hingeColor = new ColorSelectBox(120);
         hingeColorAuto = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Auto"),

designer-chart/src/main/java/com/fr/van/chart/map/VanChartMapSeriesPane.java

@@ -261,7 +261,9 @@ public class VanChartMapSeriesPane extends VanChartColorValueSeriesPane {
     }
 
     protected JPanel createAreaPane() {
-        borderWithAlphaPane = new VanChartBorderWithAlphaPane(true);
+        //TODO Bjorn 地图背景自动
+        //borderWithAlphaPane = new VanChartBorderWithAlphaPane(true);
+        borderWithAlphaPane = new VanChartBorderWithAlphaPane();
 
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
@@ -277,10 +279,11 @@ public class VanChartMapSeriesPane extends VanChartColorValueSeriesPane {
     }
 
     protected JPanel createNullValueColorPane() {
-        nullValueAuto = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Auto"),
+        //TODO Bjorn 地图空值背景自动
+       /* nullValueAuto = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Auto"),
                 Toolkit.i18nText("Fine-Design_Chart_Custom")});
-        nullValueColorBox = new ColorSelectBox(80);
         initNullValueListener();
+        nullValueColorBox = new ColorSelectBox(80);
 
         double f = TableLayout.FILL;
         double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
@@ -294,7 +297,10 @@ public class VanChartMapSeriesPane extends VanChartColorValueSeriesPane {
                 new Component[]{text, nullValueAuto},
                 new Component[]{null, nullValueColorBox},
         };
-        return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);*/
+
+        nullValueColorBox = new ColorSelectBox(80);
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_NULL_Value_Color"), nullValueColorBox);
     }
 
 
@@ -499,13 +505,15 @@ public class VanChartMapSeriesPane extends VanChartColorValueSeriesPane {
                 markerTypeCom.setSelectedItem(((VanChartMapPlot) plot).getMapMarkerType().toLocalString());
             }
             if (nullValueColorBox != null) {
-                if (((VanChartMapPlot) plot).isAutoNullValue()) {
+                //TODO Bjorn 地图空值背景自动
+               /* if (((VanChartMapPlot) plot).isAutoNullValue()) {
                     nullValueAuto.setSelectedIndex(0);
                 } else {
                     nullValueAuto.setSelectedIndex(1);
                 }
                 nullValueColorBox.setSelectObject(((VanChartMapPlot) plot).getNullValueColor());
-                checkNullValueButton();
+                checkNullValueButton();*/
+                nullValueColorBox.setSelectObject(((VanChartMapPlot) plot).getNullValueColor());
             }
             //大数据模式 恢复用注释。下面3行删除。
             if (lineMapLargeDataModelGroup != null) {
@@ -521,7 +529,8 @@ public class VanChartMapSeriesPane extends VanChartColorValueSeriesPane {
                 ((VanChartMapPlot) plot).setMapMarkerType(MapMarkerType.parseInt(markerTypeCom.getSelectedIndex()));
             }
             if (nullValueColorBox != null) {
-                ((VanChartMapPlot) plot).setAutoNullValue(nullValueAuto.getSelectedIndex() == 0);
+                //TODO Bjorn 地图空值背景自动
+                //((VanChartMapPlot) plot).setAutoNullValue(nullValueAuto.getSelectedIndex() == 0);
                 ((VanChartMapPlot) plot).setNullValueColor(nullValueColorBox.getSelectObject());
             }
             //大数据模式 恢复用注释。下面3行删除。

designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java

@@ -645,9 +645,14 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
     }
 
     private void resetGisLayer(VanChartMapPlot mapPlot) {
+        //TODO Bjorn 地图gis图层自动逻辑
+       /* mapPlot.getGisLayer().setGisLayerType(GISLayerType.AUTO);
+        mapPlot.getGisLayer().setLayerName(GISLayerType.getLocString(GISLayerType.AUTO));*/
 
-        mapPlot.getGisLayer().setGisLayerType(GISLayerType.AUTO);
+        String layerName = mapPlot.getDefaultGisLayerName();
-        mapPlot.getGisLayer().setLayerName(GISLayerType.getLocString(GISLayerType.AUTO));
+
+        mapPlot.getGisLayer().setGisLayerType(GISLayerType.PREDEFINED_LAYER);
+        mapPlot.getGisLayer().setLayerName(layerName);
         gisLayer.setSelectedItem(mapPlot.getGisLayer().getShowItemName());
     }
 

designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterLabelContentPane.java

@@ -1,13 +1,10 @@
 package com.fr.van.chart.scatter;
 
-import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithPreStyle;
-import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.van.chart.designer.component.VanChartHtmlLabelPane;
 import com.fr.van.chart.designer.component.VanChartHtmlLabelPaneWithBackGroundLabel;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
-import java.awt.BorderLayout;
 
 /**
  * 散点图标签界面
@@ -24,7 +21,8 @@ public class  VanChartScatterLabelContentPane extends VanChartScatterTooltipCont
         return new VanChartHtmlLabelPaneWithBackGroundLabel();
     }
 
-    public JPanel createCommonStylePane() {
+    //TODO Bjorn 散点图标签预定义样式
+   /* public JPanel createCommonStylePane() {
         if (isInCondition()) {
             return super.createCommonStylePane();
         }
@@ -47,5 +45,5 @@ public class  VanChartScatterLabelContentPane extends VanChartScatterTooltipCont
                 attrTooltipContent.setCustom(true);
             }
         }
-    }
+    }*/
 }