Merge pull request #259 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0

* commit 'a9c1173b76872a8f48fecb1165336e39a53e6a08':
  CHART-2499 910
  CHART-2562 空数据提示

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/BubblePlotChartConditionPane.java

@@ -4,7 +4,7 @@
 
 package com.fr.design.chart.series.SeriesCondition;
 
-import com.fr.chart.base.ChartConstants;
+import com.fr.plugin.chart.type.ConditionKeyType;
 
 /**
  * 气泡图 条件显示  参数 控制界面.
@@ -13,15 +13,8 @@ import com.fr.chart.base.ChartConstants;
  */
 public class BubblePlotChartConditionPane extends ChartConditionPane{
 
-    /**
+    @Override
-     * 界面条件序号 列表
+    protected ConditionKeyType[] conditionKeyTypes() {
-     * @return 返回条件列表.
+        return ConditionKeyType.NORMAL2_CONDITION_KEY_TYPES;
-     */
-    public String[] columns2Populate() {
-        return new String[]{
-                ChartConstants.SERIES_INDEX,
-                ChartConstants.SERIES_NAME,
-                ChartConstants.VALUE
-        };
     }
 }

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ChartConditionPane.java

@@ -1,25 +1,150 @@
 package com.fr.design.chart.series.SeriesCondition;
 
-import com.fr.chart.base.ChartConstants;
+import com.fr.chart.chartattr.ChartCommonCondition;
-import com.fr.design.condition.DSColumnLiteConditionPane;
+import com.fr.data.condition.CommonCondition;
+import com.fr.data.core.Compare;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.condition.LiteConditionPane;
+import com.fr.design.editor.ValueEditorPane;
+import com.fr.design.editor.ValueEditorPaneFactory;
+import com.fr.design.formula.CustomVariableResolver;
+import com.fr.design.formula.VariableResolver;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.icombobox.UIComboBoxRenderer;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.Inter;
+import com.fr.plugin.chart.type.ConditionKeyType;
+import com.fr.stable.StringUtils;
 
-public class ChartConditionPane extends DSColumnLiteConditionPane {
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+
+public class ChartConditionPane extends LiteConditionPane<CommonCondition> {
 
     public ChartConditionPane() {
         super();
         conditonTypePane.setVisible(false);
+    }
+
+    @Override
+    protected VariableResolver variableResolver4FormulaPane() {
+        return new CustomVariableResolver(new String[]{}, false);
+    }
 
-        populateColumns(columns2Populate());
+    protected ConditionKeyType[] conditionKeyTypes() {
+        return ConditionKeyType.NORMAL_CONDITION_KEY_TYPES;
     }
 
-    public String[] columns2Populate() {
+    @Override
-        return new String[]{
+    protected BasicBeanPane<CommonCondition> createUnFormulaConditionPane() {
-                ChartConstants.CATEGORY_INDEX,
+        return new CommonConditionPane();
-                ChartConstants.CATEGORY_NAME,
+    }
-                ChartConstants.SERIES_INDEX,
+
-                ChartConstants.SERIES_NAME,
+
-                ChartConstants.VALUE
+    private class CommonConditionPane extends BasicBeanPane<CommonCondition> {
-        };
+
+        private UIComboBox conditionKeyComboBox;
+        private UIComboBox conditionOPComboBox;
+        private ValueEditorPane conditionValuePane;
+
+        public CommonConditionPane() {
+            initComponents();
+        }
+
+        private void initComponents() {
+            this.setLayout(FRGUIPaneFactory.createBorderLayout());
+            conditionKeyComboBox = new UIComboBox(conditionKeyTypes());
+            conditionOPComboBox = new UIComboBox(new DefaultComboBoxModel());
+            DefaultComboBoxModel opComboBoxModel = (DefaultComboBoxModel) conditionOPComboBox.getModel();
+            int[] allOperators = Compare.getAllOperators();
+            for (int i = 0; i < allOperators.length; i++) {
+                opComboBoxModel.addElement(new Integer(allOperators[i]));
+            }
+            this.conditionOPComboBox.setRenderer(new UIComboBoxRenderer() {
+
+                @Override
+                public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+                    super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+                    if (value instanceof Integer) {
+                        this.setText(Compare.operator2String(((Integer) value).intValue()));
+                    }
+
+                    return this;
+                }
+            });
+            conditionValuePane = ValueEditorPaneFactory.createAllValueEditorPane();
+            conditionKeyComboBox.setPreferredSize(new Dimension(175, conditionKeyComboBox.getPreferredSize().height));
+            conditionOPComboBox.setPreferredSize(new Dimension(80, 20));
+            Component[][] components = {
+                    {new UILabel(Inter.getLocText("Utils-Available_Columns") + ":"), new UILabel(Inter.getLocText("FR-ConditionB_Operator") + ":"),
+                            new UILabel()}, {conditionKeyComboBox, conditionOPComboBox, conditionValuePane}};
+
+            double p = TableLayout.PREFERRED;
+            double rowSize[] = {p, p};
+            double columnSize[] = {p, p, TableLayout.FILL};
+
+            JPanel leftPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+            this.add(leftPanel, BorderLayout.CENTER);
+
+        }
+
+        @Override
+        public void populateBean(CommonCondition condition) {
+            String selectionColumn = condition.getColumnName();
+            ConditionKeyType type = ConditionKeyType.find(selectionColumn);
+            if (type != null) {
+                conditionKeyComboBox.setSelectedItem(type);
+            } else {//兼容
+                for (ConditionKeyType temp : conditionKeyTypes()) {
+                    if (ComparatorUtils.equals(selectionColumn, temp.toString())) {
+                        conditionKeyComboBox.setSelectedItem(temp);
+                    }
+                }
+            }
+
+            Compare compare = condition.getCompare();
+
+            if (compare == null) {
+                return;
+            }
+            conditionOPComboBox.setSelectedItem(new Integer(compare.getOp()));
+
+            Object value = compare.getValue();
+
+            conditionValuePane.populate(value);
+
+        }
+
+        @Override
+        public CommonCondition updateBean() {
+            Object value = conditionValuePane.update();
+
+            int index = conditionKeyComboBox.getSelectedIndex();
+            ConditionKeyType conditionKeyType = conditionKeyTypes()[index];
+            String name = conditionKeyType.getStringType();
+
+            return new ChartCommonCondition(name, index, new Compare(
+                    ((Integer) conditionOPComboBox.getSelectedItem()).intValue(), value));
+        }
+
+        @Override
+        protected String title4PopupWindow() {
+            return StringUtils.EMPTY;
+        }
+
+        @Override
+        public void checkValid() throws Exception {
+            conditionOPComboBox.setSelectedIndex(0);
+            conditionValuePane.populate(StringUtils.EMPTY);
+        }
     }
 
 }

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/GanttPlotChartConditionPane.java

@@ -1,6 +1,6 @@
 package com.fr.design.chart.series.SeriesCondition;
 
-import com.fr.chart.base.ChartConstants;
+import com.fr.plugin.chart.type.ConditionKeyType;
 
 /**
  * Created by IntelliJ IDEA.
@@ -11,11 +11,8 @@ import com.fr.chart.base.ChartConstants;
  */
 public class GanttPlotChartConditionPane extends ChartConditionPane {
 
-    public String[] columns2Populate() {
+    @Override
-        return new String[]{
+    protected ConditionKeyType[] conditionKeyTypes() {
-                ChartConstants.PROJECT_ID,
+        return ConditionKeyType.OLD_GANTT_CONDITION_KEY_TYPES;
-                ChartConstants.STEP_INDEX,
-                ChartConstants.STEP_NAME
-        };
     }
 }

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/MapPlotChartConditionPane.java

@@ -1,6 +1,6 @@
 package com.fr.design.chart.series.SeriesCondition;
 
-import com.fr.chart.base.ChartConstants;
+import com.fr.plugin.chart.type.ConditionKeyType;
 
 /**
  * 地图的条件 参数下拉.
@@ -9,10 +9,8 @@ import com.fr.chart.base.ChartConstants;
  */
 public class MapPlotChartConditionPane extends ChartConditionPane {
 
-	  public String[] columns2Populate() {
+	@Override
-	        return new String[]{
+	protected ConditionKeyType[] conditionKeyTypes() {
-	                ChartConstants.AREA_NAME,
+		return ConditionKeyType.OLD_MAP_CONDITION_KEY_TYPES;
-	                ChartConstants.AREA_VALUE
+	}
-	        };
-	    }
 }

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/PiePlotChartConditionPane.java

@@ -1,6 +1,6 @@
 package com.fr.design.chart.series.SeriesCondition;
 
-import com.fr.chart.base.ChartConstants;
+import com.fr.plugin.chart.type.ConditionKeyType;
 
 
 /**
@@ -10,11 +10,8 @@ import com.fr.chart.base.ChartConstants;
  */
 public class PiePlotChartConditionPane extends ChartConditionPane {
 
-	  public String[] columns2Populate() {
+	@Override
-	        return new String[]{
+	protected ConditionKeyType[] conditionKeyTypes() {
-	                ChartConstants.SERIES_INDEX,
+		return ConditionKeyType.NORMAL2_CONDITION_KEY_TYPES;
-	                ChartConstants.SERIES_NAME,
+	}
-	                ChartConstants.VALUE
-	        };
-	    }
 }

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/XYPlotChartConditionPane.java

@@ -4,7 +4,7 @@
 
 package com.fr.design.chart.series.SeriesCondition;
 
-import com.fr.chart.base.ChartConstants;
+import com.fr.plugin.chart.type.ConditionKeyType;
 
 /**
  * 散点图 条件属性 显示参数 界面.
@@ -13,15 +13,8 @@ import com.fr.chart.base.ChartConstants;
  */
 public class XYPlotChartConditionPane extends ChartConditionPane {
 
-    /**
+    @Override
-     * 界面条件序号 列表
+    protected ConditionKeyType[] conditionKeyTypes() {
-     * @return 返回条件列表.
+        return ConditionKeyType.NORMAL2_CONDITION_KEY_TYPES;
-     */
-    public String[] columns2Populate() {
-        return new String[]{
-                ChartConstants.SERIES_INDEX,
-                ChartConstants.SERIES_NAME,
-                ChartConstants.VALUE
-        };
     }
 }

designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStyleAction.java

@@ -1,12 +1,15 @@
 package com.fr.design.module;
 
+import com.fr.base.ChartEmptyDataStyleConf;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.general.IOUtils;
-
+import com.fr.transaction.CallBackAdaptor;
+import com.fr.transaction.Configurations;
+import com.fr.transaction.WorkerFacade;
 
 import java.awt.event.ActionEvent;
 
@@ -29,8 +32,21 @@ public class ChartEmptyDataStyleAction extends UpdateAction {
         dialog.addDialogActionListener(new DialogActionAdapter() {
             @Override
             public void doOk() {
-                pane.updateBean();
+                Configurations.modify(new WorkerFacade(ChartEmptyDataStyleConf.class) {
-
+                    @Override
+                    public void run() {
+                        pane.updateBean();
+                    }
+
+                }.addCallBack(new CallBackAdaptor() {
+                    @Override
+                    public void afterCommit() {
+                        DesignerFrame frame = DesignerContext.getDesignerFrame();
+                        if (frame != null) {
+                            frame.repaint();
+                        }
+                    }
+                }));
             }
 
             @Override

designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java

@@ -8,8 +8,6 @@ import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.style.background.image.ImageFileChooser;
 import com.fr.design.style.background.image.ImagePreviewPane;
 import com.fr.design.utils.ImageUtils;
@@ -232,11 +230,5 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane {
         manager.setOpenEmptyDataStyle(emptyData.getSelectedIndex() == 0);
         manager.setCustomEmptyDataStyle(customRadioButton.isSelected());
         manager.setEmptyDataImage(emptyDataImage);
-
-        // 通知报表整个刷新.
-        DesignerFrame frame = DesignerContext.getDesignerFrame();
-        if (frame != null) {
-            frame.repaint();
-        }
     }
 }

designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java

@@ -1,5 +1,6 @@
 package com.fr.design.module;
 
+import com.fr.base.ChartPreStyleConfig;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -7,7 +8,9 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.general.IOUtils;
-
+import com.fr.transaction.CallBackAdaptor;
+import com.fr.transaction.Configurations;
+import com.fr.transaction.WorkerFacade;
 
 import javax.swing.KeyStroke;
 import java.awt.event.ActionEvent;
@@ -38,11 +41,21 @@ public class ChartPreStyleAction extends UpdateAction {
 		dialog.addDialogActionListener(new DialogActionAdapter() {
 			@Override
 			public void doOk() {
-				pane.updateBean();
+				Configurations.modify(new WorkerFacade(ChartPreStyleConfig.class) {
-			}                
+					@Override
-			
+					public void run() {
-			@Override
+						pane.updateBean();
-			public void doCancel() {
+					}
+
+				}.addCallBack(new CallBackAdaptor() {
+					@Override
+					public void afterCommit() {
+						DesignerFrame frame = DesignerContext.getDesignerFrame();
+						if (frame != null) {
+							frame.repaint();
+						}
+					}
+				}));
 			}
         });
 

designer-chart/src/main/java/com/fr/design/module/ChartPreStyleManagerPane.java

@@ -3,17 +3,11 @@ package com.fr.design.module;
 import com.fr.base.ChartColorMatching;
 import com.fr.base.ChartPreStyleConfig;
 import com.fr.base.Utils;
-import com.fr.config.Configuration;
 import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.NameableCreator;
-import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.mainframe.DesignerFrame;
-
 import com.fr.general.NameObject;
 import com.fr.stable.Nameable;
-import com.fr.transaction.Configurations;
-import com.fr.transaction.Worker;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -64,33 +58,16 @@ public class ChartPreStyleManagerPane extends JListControlPane {
 	}
 	
 	public void updateBean() {
-		Configurations.update(new Worker() {
+		ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
-			@Override
-			public void run() {
-				ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
-
-				config.setCurrentStyle(getSelectedName());
-
-				Nameable[] values = update();
-				config.clearAllPreStyle();
 
-				for(Nameable value : values) {
+		config.setCurrentStyle(getSelectedName());
-					config.putPreStyle(value.getName(), ((NameObject) value).getObject());
-				}
 
-				// 通知报表整个刷新.
+		Nameable[] values = update();
-				DesignerFrame frame = DesignerContext.getDesignerFrame();
+		config.clearAllPreStyle();
-				if(frame != null) {
-					frame.repaint();
-				}
-			}
-
-			@Override
-			public Class<? extends Configuration>[] targets() {
-				return new Class[]{ChartPreStyleConfig.class};
-			}
-		});
 
+		for (Nameable value : values) {
+			config.putPreStyle(value.getName(), ((NameObject) value).getObject());
+		}
 	}
 
 }

designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaConditionPane.java

@@ -1,7 +1,6 @@
 package com.fr.van.chart.area;
 
 import com.fr.chart.base.AttrBackground;
-import com.fr.chart.base.ChartConstants;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.chart.series.SeriesCondition.ChartConditionPane;
 import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane;
@@ -15,7 +14,7 @@ import com.fr.plugin.chart.base.AttrTooltip;
 import com.fr.plugin.chart.base.VanChartAttrLine;
 import com.fr.plugin.chart.base.VanChartAttrMarker;
 import com.fr.plugin.chart.base.VanChartAttrTrendLine;
-import com.fr.plugin.chart.glyph.VanChartMultiCategoryDataPoint;
+import com.fr.plugin.chart.type.ConditionKeyType;
 import com.fr.van.chart.designer.PlotFactory;
 import com.fr.van.chart.designer.other.condition.item.VanChartAreaFillColorConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartDataSheetContentPane;
@@ -74,15 +73,8 @@ public class VanChartAreaConditionPane extends DataSeriesConditionPane {
     protected ChartConditionPane createListConditionPane() {
         return new ChartConditionPane(){
             @Override
-            public String[] columns2Populate() {
+            protected ConditionKeyType[] conditionKeyTypes() {
-                return new String[]{
+                return ConditionKeyType.CATEGORY_ARRAY_CONDITION_KEY_TYPES;
-                        ChartConstants.CATEGORY_INDEX,
-                        ChartConstants.CATEGORY_NAME,
-                        ChartConstants.SERIES_INDEX,
-                        ChartConstants.SERIES_NAME,
-                        ChartConstants.VALUE,
-                        VanChartMultiCategoryDataPoint.CATEGORY_ARRAY,
-                };
             }
         };
     }

designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleConditionSelectionPane.java

@@ -1,22 +1,15 @@
 package com.fr.van.chart.bubble;
 
-import com.fr.chart.base.ChartConstants;
 import com.fr.design.chart.series.SeriesCondition.ChartConditionPane;
-import com.fr.plugin.chart.scatter.VanChartScatterDataPoint;
+import com.fr.plugin.chart.type.ConditionKeyType;
 
 /**
  * Created by Mitisky on 16/3/31.
  */
 public class VanChartBubbleConditionSelectionPane extends ChartConditionPane {
 
-
+    @Override
-    public String[] columns2Populate() {
+    protected ConditionKeyType[] conditionKeyTypes() {
-        return new String[]{
+        return ConditionKeyType.BUBBLE_CONDITION_KEY_TYPES;
-                ChartConstants.SERIES_INDEX,
-                ChartConstants.SERIES_NAME,
-                VanChartScatterDataPoint.X,
-                VanChartScatterDataPoint.Y,
-                ChartConstants.VALUE
-        };
     }
 }

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

@@ -3,7 +3,6 @@ package com.fr.van.chart.column;
 import com.fr.chart.base.AttrAlpha;
 import com.fr.chart.base.AttrBackground;
 import com.fr.chart.base.AttrBorder;
-import com.fr.chart.base.ChartConstants;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.chart.series.SeriesCondition.ChartConditionPane;
 import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane;
@@ -17,7 +16,7 @@ import com.fr.plugin.chart.base.AttrSeriesImageBackground;
 import com.fr.plugin.chart.base.AttrTooltip;
 import com.fr.plugin.chart.base.VanChartAttrTrendLine;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
-import com.fr.plugin.chart.glyph.VanChartMultiCategoryDataPoint;
+import com.fr.plugin.chart.type.ConditionKeyType;
 import com.fr.van.chart.designer.other.condition.item.VanChartDataSheetContentPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartEffectConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartFloatColorConditionPane;
@@ -71,15 +70,8 @@ public class VanChartColumnConditionPane extends DataSeriesConditionPane{
     protected ChartConditionPane createListConditionPane() {
         return new ChartConditionPane(){
             @Override
-            public String[] columns2Populate() {
+            protected ConditionKeyType[] conditionKeyTypes() {
-                return new String[]{
+                return ConditionKeyType.CATEGORY_ARRAY_CONDITION_KEY_TYPES;
-                        ChartConstants.CATEGORY_INDEX,
-                        ChartConstants.CATEGORY_NAME,
-                        ChartConstants.SERIES_INDEX,
-                        ChartConstants.SERIES_NAME,
-                        ChartConstants.VALUE,
-                        VanChartMultiCategoryDataPoint.CATEGORY_ARRAY,
-                };
             }
         };
     }

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

@@ -1,21 +1,15 @@
 package com.fr.van.chart.designer.style.series;
 
-import com.fr.chart.base.ChartConstants;
 import com.fr.design.chart.series.SeriesCondition.ChartConditionPane;
+import com.fr.plugin.chart.type.ConditionKeyType;
 
 /**
  * 只对系列进行设置
  */
 public class VanChartSeriesConditionPane extends ChartConditionPane {
 
-    /**
+    @Override
-     * 只对系列进行设置
+    protected ConditionKeyType[] conditionKeyTypes() {
-     * @return 系列值，系列名
+        return ConditionKeyType.SERIES_CONDITION_KEY_TYPES;
-     */
-    public String[] columns2Populate() {
-        return new String[]{
-                ChartConstants.SERIES_INDEX,
-                ChartConstants.SERIES_NAME
-        };
     }
 }

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

@@ -3,7 +3,6 @@ package com.fr.van.chart.funnel.designer.other;
 import com.fr.chart.base.AttrAlpha;
 import com.fr.chart.base.AttrBackground;
 import com.fr.chart.base.AttrBorder;
-import com.fr.chart.base.ChartConstants;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.chart.series.SeriesCondition.ChartConditionPane;
 import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane;
@@ -15,6 +14,7 @@ import com.fr.plugin.chart.base.AttrFloatColor;
 import com.fr.plugin.chart.base.AttrLabel;
 import com.fr.plugin.chart.base.AttrTooltip;
 import com.fr.plugin.chart.funnel.VanChartFunnelPlot;
+import com.fr.plugin.chart.type.ConditionKeyType;
 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.designer.other.condition.item.VanChartLabelConditionPane;
@@ -42,12 +42,8 @@ public class VanChartFunnelConditionPane extends DataSeriesConditionPane {
     protected ChartConditionPane createListConditionPane() {
         return new ChartConditionPane(){
             @Override
-            public String[] columns2Populate() {
+            protected ConditionKeyType[] conditionKeyTypes() {
-                return new String[]{
+                return ConditionKeyType.NORMAL2_CONDITION_KEY_TYPES;
-                        ChartConstants.SERIES_INDEX,
-                        ChartConstants.SERIES_NAME,
-                        ChartConstants.VALUE
-                };
             }
         };
     }

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

@@ -2,17 +2,16 @@ package com.fr.van.chart.gantt.designer.other;
 
 import com.fr.chart.base.AttrAlpha;
 import com.fr.chart.base.AttrBackground;
-import com.fr.chart.base.ChartConstants;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.chart.series.SeriesCondition.ChartConditionPane;
 import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane;
 import com.fr.design.chart.series.SeriesCondition.LabelAlphaPane;
 import com.fr.plugin.chart.base.AttrTooltip;
-import com.fr.plugin.chart.gantt.VanChartGanttDataPoint;
 import com.fr.plugin.chart.gantt.VanChartGanttPlot;
 import com.fr.plugin.chart.gantt.attr.AttrGanttLabel;
 import com.fr.plugin.chart.gantt.attr.AttrGanttTooltip;
 import com.fr.plugin.chart.gantt.attr.AttrGanttTooltipContent;
+import com.fr.plugin.chart.type.ConditionKeyType;
 import com.fr.van.chart.designer.other.condition.item.VanChartLabelConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartSeriesColorConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartTooltipConditionPane;
@@ -68,17 +67,8 @@ public class VanChartGanttConditionPane extends DataSeriesConditionPane {
     protected ChartConditionPane createListConditionPane() {
         return new ChartConditionPane(){
             @Override
-            public String[] columns2Populate() {
+            protected ConditionKeyType[] conditionKeyTypes() {
-                return new String[]{
+                return ConditionKeyType.Gantt_CONDITION_KEY_TYPES;
-                        VanChartGanttDataPoint.PROJECT_NAME,
-                        VanChartGanttDataPoint.PROJECT_INDEX,
-                        ChartConstants.SERIES_NAME,
-                        ChartConstants.SERIES_INDEX,
-                        VanChartGanttDataPoint.START_TIME,
-                        VanChartGanttDataPoint.END_TIME,
-                        VanChartGanttDataPoint.PROGRESS,
-                        VanChartGanttDataPoint.LINK_ID
-                };
             }
         };
     }

designer-chart/src/main/java/com/fr/van/chart/line/VanChartLineConditionPane.java

@@ -1,7 +1,6 @@
 package com.fr.van.chart.line;
 
 import com.fr.chart.base.AttrBackground;
-import com.fr.chart.base.ChartConstants;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.chart.series.SeriesCondition.ChartConditionPane;
 import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane;
@@ -13,8 +12,8 @@ import com.fr.plugin.chart.base.AttrTooltip;
 import com.fr.plugin.chart.base.VanChartAttrLine;
 import com.fr.plugin.chart.base.VanChartAttrMarker;
 import com.fr.plugin.chart.base.VanChartAttrTrendLine;
-import com.fr.plugin.chart.glyph.VanChartMultiCategoryDataPoint;
 import com.fr.plugin.chart.line.VanChartLinePlot;
+import com.fr.plugin.chart.type.ConditionKeyType;
 import com.fr.van.chart.designer.PlotFactory;
 import com.fr.van.chart.designer.other.condition.item.VanChartDataSheetContentPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartEffectConditionPane;
@@ -72,15 +71,8 @@ public class VanChartLineConditionPane extends DataSeriesConditionPane {
     protected ChartConditionPane createListConditionPane() {
         return new ChartConditionPane(){
             @Override
-            public String[] columns2Populate() {
+            protected ConditionKeyType[] conditionKeyTypes() {
-                return new String[]{
+                return ConditionKeyType.CATEGORY_ARRAY_CONDITION_KEY_TYPES;
-                        ChartConstants.CATEGORY_INDEX,
-                        ChartConstants.CATEGORY_NAME,
-                        ChartConstants.SERIES_INDEX,
-                        ChartConstants.SERIES_NAME,
-                        ChartConstants.VALUE,
-                        VanChartMultiCategoryDataPoint.CATEGORY_ARRAY,
-                };
             }
         };
     }

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

@@ -1,21 +1,15 @@
 package com.fr.van.chart.map.designer.other.condition;
 
-import com.fr.chart.base.ChartConstants;
 import com.fr.design.chart.series.SeriesCondition.ChartConditionPane;
-import com.fr.plugin.chart.map.VanChartMapDataPoint;
+import com.fr.plugin.chart.type.ConditionKeyType;
 
 /**
  * Created by hufan on 2016/12/26.
  */
 public class VanChartLineMapConditionSelectionPane extends ChartConditionPane {
 
-    public String[] columns2Populate() {
+    @Override
-        return new String[]{
+    protected ConditionKeyType[] conditionKeyTypes() {
-                ChartConstants.SERIES_NAME,
+        return ConditionKeyType.LINE_MAP_CONDITION_KEY_TYPES;
-                ChartConstants.SERIES_INDEX,
-                VanChartMapDataPoint.START_AREA_NAME,
-                VanChartMapDataPoint.END_AREA_NAME,
-                ChartConstants.VALUE
-        };
     }
 }

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

@@ -1,19 +1,15 @@
 package com.fr.van.chart.map.designer.other.condition;
 
-import com.fr.chart.base.ChartConstants;
 import com.fr.design.chart.series.SeriesCondition.ChartConditionPane;
-import com.fr.plugin.chart.map.VanChartMapDataPoint;
+import com.fr.plugin.chart.type.ConditionKeyType;
 
 /**
  * Created by Mitisky on 16/6/1.
  */
 public class VanChartMapConditionSelectionPane extends ChartConditionPane {
 
-    public String[] columns2Populate() {
+    @Override
-        return new String[]{
+    protected ConditionKeyType[] conditionKeyTypes() {
-                ChartConstants.SERIES_NAME,
+        return ConditionKeyType.MAP_CONDITION_KEY_TYPES;
-                VanChartMapDataPoint.AREA_NAME,
-                ChartConstants.VALUE
-        };
     }
 }

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

@@ -1,23 +1,15 @@
 package com.fr.van.chart.multilayer.other;
 
-import com.fr.chart.base.ChartConstants;
 import com.fr.design.chart.series.SeriesCondition.ChartConditionPane;
-
+import com.fr.plugin.chart.type.ConditionKeyType;
-import com.fr.plugin.chart.multilayer.VanChartMultiPieDataPoint;
 
 /**
  * Created by Fangjie on 2016/6/16.
  */
 public class VanChartMultiPieConditionSelectionPane extends ChartConditionPane {
-    public static final String LEVEL_NAME = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Level_Name");
-    public static final String LEVEL_ORDER = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Level_Order");
-
 
-    public String[] columns2Populate() {
+    @Override
-        return new String[]{
+    protected ConditionKeyType[] conditionKeyTypes() {
-                VanChartMultiPieDataPoint.LEVEL_ORDER,
+        return ConditionKeyType.MULTI_PIE_CONDITION_KEY_TYPES;
-                VanChartMultiPieDataPoint.LEVEL_NAME,
-                ChartConstants.VALUE
-        };
     }
 }

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/other/VanChartStructureConditionPane.java

@@ -1,7 +1,6 @@
 package com.fr.van.chart.structure.desinger.other;
 
 import com.fr.chart.base.AttrBackground;
-import com.fr.chart.base.ChartConstants;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.chart.series.SeriesCondition.ChartConditionPane;
 import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane;
@@ -9,8 +8,8 @@ import com.fr.plugin.chart.base.AttrFloatColor;
 import com.fr.plugin.chart.base.AttrLabel;
 import com.fr.plugin.chart.base.AttrNode;
 import com.fr.plugin.chart.base.AttrTooltip;
-import com.fr.plugin.chart.structure.VanChartStructureDataPoint;
 import com.fr.plugin.chart.structure.VanChartStructurePlot;
+import com.fr.plugin.chart.type.ConditionKeyType;
 import com.fr.van.chart.designer.other.condition.item.VanChartFloatColorConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartLabelConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartSeriesColorConditionPane;
@@ -38,14 +37,8 @@ public class VanChartStructureConditionPane extends DataSeriesConditionPane {
     protected ChartConditionPane createListConditionPane() {
         return new ChartConditionPane(){
             @Override
-            public String[] columns2Populate() {
+            protected ConditionKeyType[] conditionKeyTypes() {
-                return new String[]{
+                return ConditionKeyType.STRUCTURE_CONDITION_KEY_TYPES;
-                        VanChartStructureDataPoint.NODEID,
-                        VanChartStructureDataPoint.PARENTID,
-                        VanChartStructureDataPoint.SERIESNAME,
-                        VanChartStructureDataPoint.NODENAME,
-                        ChartConstants.VALUE
-                };
             }
         };
     }

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

@@ -7,8 +7,8 @@ import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane;
 import com.fr.plugin.chart.attr.EffectHelper;
 import com.fr.plugin.chart.base.AttrEffect;
 import com.fr.plugin.chart.base.AttrTooltip;
+import com.fr.plugin.chart.type.ConditionKeyType;
 import com.fr.plugin.chart.wordcloud.VanChartWordCloudPlot;
-import com.fr.plugin.chart.wordcloud.WordCloudDataPoint;
 import com.fr.van.chart.designer.other.condition.item.VanChartEffectConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartSeriesColorConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartTooltipConditionPane;
@@ -34,12 +34,8 @@ public class VanChartWordCloudConditionPane  extends DataSeriesConditionPane {
     protected ChartConditionPane createListConditionPane() {
         return new ChartConditionPane(){
             @Override
-            public String[] columns2Populate() {
+            protected ConditionKeyType[] conditionKeyTypes() {
-                return new String[]{
+                return ConditionKeyType.WORD_CLOUD_CONDITION_KEY_TYPES;
-                        WordCloudDataPoint.WORDNAME,
-                        WordCloudDataPoint.WORDNAMEINDEX,
-                        WordCloudDataPoint.WORDVALUE
-                };
             }
         };
     }