diff --git a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java index b5f8976abf..d7246c7552 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java @@ -225,7 +225,9 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { if (standardColors == null || standardColors.size() < 8) { return; } - for (int i = 0; i < standardColors.size(); i++) { + // range取最小值,避免数据越界 + int range = Math.min(standardColors.size(), this.themeColorCellGrid.length); + for (int i = 0; i < range; i++) { Color standardColor = standardColors.get(i); ColorConfig colorConfig = getColorConfig(colorSelector, i); Color[] deriveColorArr = colorConfig.getDeriveColorArr(standardColor, DEFAULT_DERIVE_COUNT);