Merge pull request #15 in BA/design from ~XIAOHU/design:master to dev

* commit 'fd35f75ccbaa0db99463bddde2d39906d3c56f74':
  update
  更改地图自定义颜色计算方法
  update
  update
  为大数据提供创建条件属性面板的接口

designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java

@@ -54,6 +54,7 @@ public class DataSeriesConditionPane extends ConditionAttributesPane<ConditionAt
         // kunsnat_size  加载属性之后 被遮挡, 最少的高度为300, 5个按钮
         liteConditionPane.setPreferredSize(new Dimension(300, 300));
     }
+
     protected ChartConditionPane createListConditionPane() {
         return ChartConditionPaneFactory.createChartConditionPane(getClass());
     }

designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java

@@ -724,7 +724,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
 	}
 
 	private Color[] getColorArray(Color color, int sum) {
-		return ChartBaseUtils.createColorsWithAlpha(color, sum);
+		return ChartBaseUtils.createColorsWithHSB(color, sum);
 	}
 
 	private Formula[] getValueArray(int count) {