From f1fdae12f117dca5fbac0c516a4ffaa1ca33ac0c Mon Sep 17 00:00:00 2001 From: Zhanying <2446962908@qq.com> Date: Mon, 10 Feb 2025 16:43:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E9=A2=9C=E8=89=B2=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E6=95=B0=E7=BB=84=E8=B6=8A=E7=95=8C=20#REPOR?= =?UTF-8?q?T-147689?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/style/color/NewColorSelectPane.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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..6299f5ffff 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++) { + // 如果颜色数量超过了主题色数量，只取主题色数量 + int range = Math.min(standardColors.size(), this.themeColorCellGrid.length - 2); + 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); From 2a8478d4382b3e771e82d306082b2236ec2e180c Mon Sep 17 00:00:00 2001 From: Zhanying <2446962908@qq.com> Date: Tue, 11 Feb 2025 11:24:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20pr=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86=20#REPORT-147689?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/style/color/NewColorSelectPane.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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);