CHART-14730 && CHART-14731 && CHART-14912 && CHART-14897 bugfix

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java

@@ -100,24 +100,30 @@ public class SeriesTypeUseComboxPane extends BasicBeanPane<ChartCollection> {
     protected void initLayout() {
         this.setLayout(new BorderLayout(4, LayoutConstants.VGAP_MEDIUM));
         JPanel northPane = new JPanel(new BorderLayout(4, 0));
-        UILabel label1 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name_From"));
+
-        label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
+        //使用系列名/系列值选项面板
-        JPanel borderLayoutPane = GUICoreUtils.createBorderLayoutPane(new Component[]{content, null, null, label1, null});
+        UILabel seriesLabel = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name_From"));
+        seriesLabel.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
+        JPanel borderLayoutPane = GUICoreUtils.createBorderLayoutPane(new Component[]{content, null, null, seriesLabel, null});
         northPane.add(borderLayoutPane);
-        northPane.setBorder(BorderFactory.createEmptyBorder(10, 24, 0, 15));
+        northPane.setBorder(BorderFactory.createEmptyBorder(10, 24, 0, 16));
-        cardPane.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15));
         this.add(northPane, BorderLayout.NORTH);
+
+        //系列名/系列值配置面板
+        cardPane.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15));
         this.add(cardPane, BorderLayout.CENTER);
+
+        //数据筛选
         dataScreeningPane = new ChartDataFilterPane(this.initplot, parent);
         JPanel panel = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), 250, 24, dataScreeningPane);
-        panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 15));
+        panel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 15));
         dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         this.add(panel, BorderLayout.SOUTH);
     }
 
     public Dimension getPreferredSize() {
         Dimension preferredSize = super.getPreferredSize();
-        return new Dimension(260, (int) preferredSize.getHeight());
+        return new Dimension(246, (int) preferredSize.getHeight());
     }
 
     /**

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

@@ -22,6 +22,7 @@ import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot;
 import com.fr.plugin.chart.axis.type.AxisPlotType;
 import com.fr.plugin.chart.base.AttrEffect;
+import com.fr.plugin.chart.base.AttrFloatColor;
 import com.fr.plugin.chart.base.AttrLabel;
 import com.fr.plugin.chart.base.RefreshMoreLabel;
 import com.fr.plugin.chart.base.VanChartAttrMarker;
@@ -434,6 +435,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
             conditionAttr.remove(ScatterAttrLabel.class);
             conditionAttr.remove(AttrEffect.class);
             conditionAttr.remove(AttrLineEffect.class);
+            conditionAttr.remove(AttrFloatColor.class);
 
             VanChartAttrMarker attrMarker = conditionAttr.getExisted(VanChartAttrMarker.class);
             if (attrMarker != null && !attrMarker.isCommon()) {

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

@@ -38,6 +38,7 @@ import com.fr.van.chart.map.line.VanChartCurvePane;
 import com.fr.van.chart.map.line.VanChartLineMapEffectPane;
 
 import javax.swing.BorderFactory;
+import javax.swing.DefaultComboBoxModel;
 import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -60,6 +61,9 @@ public class VanChartMapSeriesPane extends VanChartColorValueSeriesPane {
     private static final String[] MARKER_TYPES = new String[]{MapMarkerType.DEFAULT.toLocalString(),
             MapMarkerType.COMMON.toLocalString(), MapMarkerType.BUBBLE.toLocalString(), MapMarkerType.IMAGE.toLocalString()};
 
+    private static final String[] LARGE_MARKER_TYPES = new String[]{MapMarkerType.DEFAULT.toLocalString(),
+            MapMarkerType.COMMON.toLocalString(), MapMarkerType.BUBBLE.toLocalString()};
+
     //custom
     private UIButtonGroup<Integer> areaPointAndLineGroup;
 
@@ -145,8 +149,18 @@ public class VanChartMapSeriesPane extends VanChartColorValueSeriesPane {
     }
 
     private void checkPointCompsEnabledWithLarge(Plot plot) {
+        boolean largeModel = largeModel(plot);
         if (pointEffectPane != null) {
-            GUICoreUtils.setEnabled(pointEffectPane, !largeModel(plot));
+            GUICoreUtils.setEnabled(pointEffectPane, !largeModel);
+        }
+        if (markerTypeCom != null) {
+            Object selectedItem = markerTypeCom.getSelectedItem();
+            markerTypeCom.setModel(new DefaultComboBoxModel(largeModel ? LARGE_MARKER_TYPES : MARKER_TYPES));
+            if (ComparatorUtils.equals(MapMarkerType.IMAGE.toLocalString(), selectedItem) && largeModel) {
+                markerTypeCom.setSelectedItem(MapMarkerType.COMMON.toLocalString());
+            }else{
+                markerTypeCom.setSelectedItem(selectedItem);
+            }
         }
     }
 

designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/pane/VanChartBubblePointMapConditionPane.java

@@ -3,8 +3,10 @@ package com.fr.van.chart.map.designer.other.condition.pane;
 import com.fr.chart.chartattr.Plot;
 import com.fr.plugin.chart.attr.EffectHelper;
 import com.fr.plugin.chart.base.AttrEffect;
+import com.fr.plugin.chart.base.AttrFloatColor;
 import com.fr.plugin.chart.bubble.attr.VanChartAttrBubble;
 import com.fr.van.chart.designer.other.condition.item.VanChartEffectConditionPane;
+import com.fr.van.chart.designer.other.condition.item.VanChartFloatColorConditionPane;
 import com.fr.van.chart.map.designer.other.condition.item.VanChartBubbleMarkerConditionPane;
 
 /**
@@ -21,6 +23,7 @@ public class VanChartBubblePointMapConditionPane extends VanChartMapConditionPan
         classPaneMap.put(VanChartAttrBubble.class, new VanChartBubbleMarkerConditionPane(this));
         if (addLabelOrEffectAction()) {
             addLabelAction();
+            classPaneMap.put(AttrFloatColor.class, new VanChartFloatColorConditionPane(this));
             classPaneMap.put(AttrEffect.class, new VanChartEffectConditionPane(this, EffectHelper.getBubblePlotDefaultEffect()));
         }
     }

designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/pane/VanChartCommonPointMapConditionPane.java

@@ -3,8 +3,10 @@ package com.fr.van.chart.map.designer.other.condition.pane;
 import com.fr.chart.chartattr.Plot;
 import com.fr.plugin.chart.attr.EffectHelper;
 import com.fr.plugin.chart.base.AttrEffect;
+import com.fr.plugin.chart.base.AttrFloatColor;
 import com.fr.plugin.chart.base.VanChartAttrMarker;
 import com.fr.van.chart.designer.other.condition.item.VanChartEffectConditionPane;
+import com.fr.van.chart.designer.other.condition.item.VanChartFloatColorConditionPane;
 import com.fr.van.chart.map.designer.other.condition.item.VanChartCommonMarkerConditionPane;
 
 /**
@@ -21,6 +23,7 @@ public class VanChartCommonPointMapConditionPane extends VanChartMapConditionPan
         classPaneMap.put(VanChartAttrMarker.class, new VanChartCommonMarkerConditionPane(this));
         if(addLabelOrEffectAction()) {
             addLabelAction();
+            classPaneMap.put(AttrFloatColor.class, new VanChartFloatColorConditionPane(this));
             classPaneMap.put(AttrEffect.class, new VanChartEffectConditionPane(this, EffectHelper.getScatterPlotDefaultEffect()));
         }
     }

designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/pane/VanChartDefaultPointMapConditionPane.java

@@ -3,7 +3,9 @@ package com.fr.van.chart.map.designer.other.condition.pane;
 import com.fr.chart.chartattr.Plot;
 import com.fr.plugin.chart.attr.EffectHelper;
 import com.fr.plugin.chart.base.AttrEffect;
+import com.fr.plugin.chart.base.AttrFloatColor;
 import com.fr.van.chart.designer.other.condition.item.VanChartEffectConditionPane;
+import com.fr.van.chart.designer.other.condition.item.VanChartFloatColorConditionPane;
 
 /**
  * Created by Mitisky on 16/5/23.
@@ -17,6 +19,7 @@ public class VanChartDefaultPointMapConditionPane extends VanChartMapConditionPa
     protected void addDiffAction() {
         if(addLabelOrEffectAction()) {
             addLabelAction();
+            classPaneMap.put(AttrFloatColor.class, new VanChartFloatColorConditionPane(this));
             classPaneMap.put(AttrEffect.class, new VanChartEffectConditionPane(this, EffectHelper.getPointMapPlotDefaultEffect()));
         }
     }

designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/pane/VanChartImagePointMapConditionPane.java

@@ -1,7 +1,9 @@
 package com.fr.van.chart.map.designer.other.condition.pane;
 
 import com.fr.chart.chartattr.Plot;
+import com.fr.plugin.chart.base.AttrFloatColor;
 import com.fr.plugin.chart.base.VanChartAttrMarker;
+import com.fr.van.chart.designer.other.condition.item.VanChartFloatColorConditionPane;
 import com.fr.van.chart.map.designer.other.condition.item.VanChartImageMarkerConditionPane;
 
 /**
@@ -18,6 +20,7 @@ public class VanChartImagePointMapConditionPane extends VanChartMapConditionPane
         classPaneMap.put(VanChartAttrMarker.class, new VanChartImageMarkerConditionPane(this));
         if (addLabelOrEffectAction()) {
             addLabelAction();
+            classPaneMap.put(AttrFloatColor.class, new VanChartFloatColorConditionPane(this));
         }
     }
 }

designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/pane/VanChartLineMapConditionPane.java

@@ -43,13 +43,13 @@ public class VanChartLineMapConditionPane extends DataSeriesConditionPane {
     @Override
     protected void addBasicAction() {
         classPaneMap.put(AttrBackground.class, new VanChartSeriesColorConditionPane(this));
-        classPaneMap.put(AttrFloatColor.class, new VanChartFloatColorConditionPane(this));
         classPaneMap.put(AttrCurve.class, new VanChartCurveConditionPane(this));
         classPaneMap.put(AttrTooltip.class, new VanChartLineMapTooltipConditionPane(this, plot));
         //大数据模式 恢复用注释。下面1行删除。
         if (!PlotFactory.lineMapLargeModel(plot)) {
             //大数据模式 恢复用注释。取消注释。
             //if (!PlotFactory.largeDataModel(plot)) {
+            classPaneMap.put(AttrFloatColor.class, new VanChartFloatColorConditionPane(this));
             classPaneMap.put(AttrLineEffect.class, new VanChartLineEffectConditionPane(this, EffectHelper.getLineMapDefaultLineEffect()));
         }
     }

designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/pane/VanChartMapConditionPane.java

@@ -49,11 +49,11 @@ public class VanChartMapConditionPane extends DataSeriesConditionPane {
         classPaneMap.put(AttrBackground.class, new VanChartSeriesColorConditionPane(this));
         classPaneMap.put(AttrAlpha.class, new LabelAlphaPane(this));
         classPaneMap.put(AttrTooltip.class, new VanChartTooltipConditionPane(this, plot));
-        classPaneMap.put(AttrFloatColor.class, new VanChartFloatColorConditionPane(this));
         addDiffAction();
     }
 
     protected void addDiffAction() {
+        classPaneMap.put(AttrFloatColor.class, new VanChartFloatColorConditionPane(this));
         classPaneMap.put(AttrBorderWithAlpha.class, new VanChartBorderWithAlphaConditionPane(this));
         classPaneMap.put(AttrEffect.class, new VanChartEffectConditionPane(this, EffectHelper.getMapPlotDefaultEffect()));
         addLabelAction();

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotReportDataContentPane.java

@@ -5,10 +5,10 @@ import com.fr.chart.chartattr.ChartCollection;
 import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
+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.data.report.AbstractReportDataContentPane;
-
 import com.fr.plugin.chart.structure.data.StructureReportDefinition;
 
 import javax.swing.BorderFactory;
@@ -40,11 +40,11 @@ public class StructurePlotReportDataContentPane extends AbstractReportDataConten
         nodeValue = new TinyFormulaPane();
 
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Node_Name")), nodeName},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Node_Name")), nodeName},
-                new Component[]{new UILabel("id"), nodeID},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Node_Id")), nodeID},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parent_ID")), parentID},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Parent_Node_Id")), parentID},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name")), seriesName},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name")), seriesName},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Value")), nodeValue},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Value")), nodeValue},
         };
 
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,24,6);

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotTableDataContentPane.java

@@ -6,19 +6,19 @@ import com.fr.data.util.function.AbstractDataFunction;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
+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.data.CalculateComboBox;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
-
 import com.fr.plugin.chart.structure.data.StructureTableDefinition;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
-import java.util.List;
 
 /**
  * Created by shine on 2017/2/15.
@@ -45,12 +45,12 @@ public class StructurePlotTableDataContentPane extends AbstractTableDataContentP
         calculateCombox = new CalculateComboBox();
 
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Node_Name")), nodeName},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Node_Name")), nodeName},
-                new Component[]{new UILabel("id"), nodeId},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Node_Id")), nodeId},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parent_ID")), parenrId},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Parent_Node_Id")), parenrId},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name")), seriesName},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name")), seriesName},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Value")), nodeValue},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Value")), nodeValue},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Summary_Method")), calculateCombox}
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Summary_Method")), calculateCombox}
         };
 
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,24,6);