From ca1e585940bcaae3858d4ff7f551cdb0438e1fa2 Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 23 Dec 2024 16:18:18 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=8E=BB=E9=99=A43.2.0=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E5=AF=B9feature=E4=B8=BBjar=E7=9A=84=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=20REPORT-144988?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fun/DefaultValueAdjustProvider.java | 8 ++-- .../style/color/ColorSelectorStyle.java | 10 ----- .../style/color/FRColorSelectorStyle.java | 38 +++++++------------ .../style/color/NewColorSelectPane.java | 7 ++-- 4 files changed, 20 insertions(+), 43 deletions(-) delete mode 100644 designer-base/src/main/java/com/fr/design/style/color/ColorSelectorStyle.java diff --git a/designer-base/src/main/java/com/fr/design/fun/DefaultValueAdjustProvider.java b/designer-base/src/main/java/com/fr/design/fun/DefaultValueAdjustProvider.java index db39cce3a7..28a2d6c939 100644 --- a/designer-base/src/main/java/com/fr/design/fun/DefaultValueAdjustProvider.java +++ b/designer-base/src/main/java/com/fr/design/fun/DefaultValueAdjustProvider.java @@ -3,7 +3,6 @@ package com.fr.design.fun; import com.fr.base.Utils; import com.fr.base.chart.BaseChartCollection; import com.fr.chartx.attr.ChartProvider; -import com.fr.design.style.color.ColorSelectorStyle; import com.fr.design.style.color.FRColorSelectorStyle; import com.fr.general.FRFont; import com.fr.report.cell.CellElement; @@ -12,6 +11,7 @@ import com.fr.stable.fun.mark.Selectable; import java.awt.Color; import java.awt.Font; +import java.util.List; /** * 主要用于fvs报表块内元素默认值的调整，以达到所见所得效果，后续fvs内置后删除 @@ -78,9 +78,9 @@ public interface DefaultValueAdjustProvider extends Selectable { /** * 支持插件自定义主题色选择器风格 - * @return ColorSelectorStyle + * @return 颜色配置list */ - default ColorSelectorStyle getColorSelector(){ - return FRColorSelectorStyle.getInstance(); + default List getColorSelector(){ + return FRColorSelectorStyle.COLOR_CONFIG; } } diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectorStyle.java b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectorStyle.java deleted file mode 100644 index 78f3fabe7c..0000000000 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectorStyle.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.fr.design.style.color; - -import java.util.List; - -/** - * 颜色选择器风格 - */ -public interface ColorSelectorStyle { - List getColorConfigs(); -} diff --git a/designer-base/src/main/java/com/fr/design/style/color/FRColorSelectorStyle.java b/designer-base/src/main/java/com/fr/design/style/color/FRColorSelectorStyle.java index d9d3144761..e05825f966 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/FRColorSelectorStyle.java +++ b/designer-base/src/main/java/com/fr/design/style/color/FRColorSelectorStyle.java @@ -3,32 +3,20 @@ package com.fr.design.style.color; import java.util.ArrayList; import java.util.List; -public class FRColorSelectorStyle implements ColorSelectorStyle { - private static class Holder { - private static final FRColorSelectorStyle INSTANCE = new FRColorSelectorStyle(); - } - - public static FRColorSelectorStyle getInstance() { - return FRColorSelectorStyle.Holder.INSTANCE; - } - - private FRColorSelectorStyle() { - } - - public List getColorConfigs() { - ArrayList colorConfigs = new ArrayList<>(); +public class FRColorSelectorStyle { + public static final List COLOR_CONFIG = new ArrayList<>(); + static { // 8列主题色 - colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM)); - colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM)); - colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM)); - colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM)); - colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM)); - colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM)); - colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM)); - colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM)); + COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM)); + COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM)); + COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM)); + COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM)); + COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM)); + COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM)); + COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM)); + COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM)); // 2列灰度色 - colorConfigs.add(ColorConfig.createThemeColorConfig(false, DeriveAlgorithm.DEFAULT_DERIVE_ALGORITHM)); - colorConfigs.add(ColorConfig.createThemeColorConfig(false, DeriveAlgorithm.DEFAULT_DERIVE_ALGORITHM)); - return colorConfigs; + COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(false, DeriveAlgorithm.DEFAULT_DERIVE_ALGORITHM)); + COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(false, DeriveAlgorithm.DEFAULT_DERIVE_ALGORITHM)); } } \ No newline at end of file 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 a855162848..b5f8976abf 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 @@ -61,7 +61,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { private final JPanel menuColorPane; private ColorCell[][] themeColorCellGrid; - private ColorSelectorStyle colorSelector ; + private List colorSelector ; public static NewColorSelectPane createColorSelectPaneWithTheme(boolean supportTheme) { return new NewColorSelectPane(true, supportTheme); @@ -159,7 +159,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { JPanel centerPane = new JPanel(new GridLayout(1, 8, DEFAULT_COLOR_HOR_INTERVAL, 0)); menuColorPane.add(northPane, BorderLayout.NORTH); menuColorPane.add(centerPane, BorderLayout.CENTER); - this.colorSelector = FRColorSelectorStyle.getInstance(); + this.colorSelector = FRColorSelectorStyle.COLOR_CONFIG; DefaultValueAdjustProvider valueAdjust = DesignUtils.getValueAdjust(); if (valueAdjust != null) { this.colorSelector = valueAdjust.getColorSelector(); @@ -455,8 +455,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { } - public ColorConfig getColorConfig(ColorSelectorStyle colorSelector, int i) { - List colorConfigs = colorSelector.getColorConfigs(); + public ColorConfig getColorConfig(List colorConfigs, int i) { if (i < 0 || i >= colorConfigs.size()) { return colorConfigs.get(0); }