Pull request #15938: fix：去除3.2.0插件对feature主jar的依赖 REPORT-144988

Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x

* commit 'ca1e585940bcaae3858d4ff7f551cdb0438e1fa2':
  fix：去除3.2.0插件对feature主jar的依赖 REPORT-144988

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(){
+    default List getColorSelector(){
-        return FRColorSelectorStyle.getInstance();
+        return FRColorSelectorStyle.COLOR_CONFIG;
     }
 }

designer-base/src/main/java/com/fr/design/style/color/ColorSelectorStyle.java

@@ -1,10 +0,0 @@
-package com.fr.design.style.color;
-
-import java.util.List;
-
-/**
- * 颜色选择器风格
- */
-public interface ColorSelectorStyle {
-    List<ColorConfig> getColorConfigs();
-}

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 {
+public class FRColorSelectorStyle {
-    private static class Holder {
+    public static final List<ColorConfig> COLOR_CONFIG = new ArrayList<>();
-        private static final FRColorSelectorStyle INSTANCE = new FRColorSelectorStyle();
+    static {
-    }
-
-    public static FRColorSelectorStyle getInstance() {
-        return FRColorSelectorStyle.Holder.INSTANCE;
-    }
-
-    private FRColorSelectorStyle() {
-    }
-
-    public List<ColorConfig> getColorConfigs() {
-        ArrayList<ColorConfig> colorConfigs = new ArrayList<>();
         // 8列主题色
-        colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));
+        COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));
-        colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));
+        COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));
-        colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));
+        COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));
-        colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));
+        COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));
-        colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));
+        COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));
-        colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));
+        COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));
-        colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));
+        COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));
-        colorConfigs.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));
+        COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(DeriveAlgorithm.PLAIN_ALGORITHM));
         // 2列灰度色
-        colorConfigs.add(ColorConfig.createThemeColorConfig(false, DeriveAlgorithm.DEFAULT_DERIVE_ALGORITHM));
+        COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(false, DeriveAlgorithm.DEFAULT_DERIVE_ALGORITHM));
-        colorConfigs.add(ColorConfig.createThemeColorConfig(false, DeriveAlgorithm.DEFAULT_DERIVE_ALGORITHM));
+        COLOR_CONFIG.add(ColorConfig.createThemeColorConfig(false, DeriveAlgorithm.DEFAULT_DERIVE_ALGORITHM));
-        return colorConfigs;
     }
 }

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<ColorConfig> 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) {
+    public ColorConfig getColorConfig(List<ColorConfig> colorConfigs, int i) {
-        List<ColorConfig> colorConfigs = colorSelector.getColorConfigs();
         if (i < 0 || i >= colorConfigs.size()) {
             return colorConfigs.get(0);
         }