Browse Source

Merge pull request #16621 in DESIGN/design from release/11.0 to bugfix/11.0

* commit 'd130ee113d462426531dc0adfbe4e1acb1eebc19':
  fix: pr问题处理 #REPORT-147689
  fix: 颜色选择面板数组越界 #REPORT-147689
bugfix/11.0
superman 1 week ago
parent
commit
90c70d9354
  1. 4
      designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java

4
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);

Loading…
Cancel
Save