Merge pull request #6655 in DESIGN/design from feature/10.0 to research/10.0

* commit '709a3e2d3fbf6aa6557839b96dbd97e5e3fedcf4':
  CHART-21665 design fix:仪表盘刻度配色保存异常处理

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java

@@ -29,8 +29,6 @@ import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.util.ArrayList;
-import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -42,6 +40,8 @@ import java.awt.LayoutManager;
 import java.awt.Point;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.List;
 
 public class UIColorPickerPane extends BasicPane implements UIObserver {
 	private static final int MARGIN_TOP = 7;
@@ -691,14 +691,18 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
 		fillStyleCombox.setSelectObject(mainColor);
 		designTypeButtonGroup.setSelectedIndex(hotAreaColor.getUseType());
 
-		double value = (double) hotAreaColor.getAreaNumber();
+        int value = hotAreaColor.getAreaNumber();
 		UIColorPickerPane.this.add(textGroup);
 		UIColorPickerPane.this.add(colorGroup);
 		Color[] colors = hotAreaColor.initColor();
 		BaseFormula[] values = hotAreaColor.initValues();
+        if (value != colors.length && hotAreaColor.getUseType() == MapHotAreaColor.CUSTOM) {
+            colors = getColorArray(mainColor, value);
+            values = getValueArray(value);
+        }
 		refreshGroupPane(colors, values);
 		this.initContainerLister();
-		regionNumPane.populateBean(value);
+        regionNumPane.populateBean((double) value);
 		refreshPane();
 	}