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 6299f5ffff..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,8 +225,8 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
         if (standardColors == null || standardColors.size() < 8) {
             return;
         }
-        // 如果颜色数量超过了主题色数量，只取主题色数量
-        int range = Math.min(standardColors.size(), this.themeColorCellGrid.length - 2);
+        // 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);