Merge pull request #11251 in DESIGN/design from final/11.0 to persist/11.0

* commit 'd70c1f417921579dc0caf81c9172c14ad065f5d5':
  REPORT-88365 决策报表，单元格插入数据列，单元格元素页面有异常 【问题原因】单选时默认将cellDSColumnAdvancedPane的visible设为true，导致显示异常 【改动思路】结合cellDSColumnAdvancedPane的原始visible状态及单元格的单选多选状态再进行设置
  REPORT-87781 图表渐变支持到30阶
  REPORT-88359 设计器Key缺失

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java

@@ -21,6 +21,7 @@ import com.fr.design.style.color.ColorSelectBox;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.StringUtils;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+import com.fr.van.chart.range.component.LegendGradientBar;
 
 import javax.swing.JComponent;
 import javax.swing.JFrame;
@@ -102,7 +103,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
 			}
 		});
 
-		regionNumPane = new UINumberDragPane(1, 6) {
+		regionNumPane = new UINumberDragPane(1, LegendGradientBar.COLOR_GRADUAL_NUM_MAX) {
 			@Override
 			public void userEvent(double value) {
                 if(!UIColorPickerPane.this.moveOnColorOrTextPane){
@@ -191,7 +192,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
 			}
 		});
 
-		regionNumPane = new UINumberDragPane(1, 6) {
+		regionNumPane = new UINumberDragPane(1, LegendGradientBar.COLOR_GRADUAL_NUM_MAX) {
 			@Override
 			public void userEvent(double value) {
                 if(!UIColorPickerPane.this.moveOnColorOrTextPane){

designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java

@@ -14,7 +14,7 @@ import javax.swing.event.ChangeListener;
 import java.awt.BorderLayout;
 import java.awt.Component;
 
-public class GradualIntervalConfigPane extends JPanel{
+public class GradualIntervalConfigPane extends JPanel {
     private static final long serialVersionUID = 1614283200308877353L;
 
     //最大最小值面板
@@ -26,7 +26,7 @@ public class GradualIntervalConfigPane extends JPanel{
     //渐变色编辑器
     private LegendGradientBar legendGradientBar;
 
-    public GradualIntervalConfigPane(){
+    public GradualIntervalConfigPane() {
         initComponents();
     }
 
@@ -42,10 +42,10 @@ public class GradualIntervalConfigPane extends JPanel{
             }
         });
 
-        numberDragPane = new UINumberDragPane(1,6) {
+        numberDragPane = new UINumberDragPane(1, LegendGradientBar.COLOR_GRADUAL_NUM_MAX) {
             @Override
             public void userEvent(double value) {
-                legendGradientBar.refreshColorSelectionBtnNum((int)value);
+                legendGradientBar.refreshColorSelectionBtnNum((int) value);
             }
         };
 
@@ -60,9 +60,9 @@ public class GradualIntervalConfigPane extends JPanel{
         Component[][] components = getPaneComponents(minMaxValuePane, colorSelectBox, numberDragPane, legendGradientBar);
 
         //控件承载面板
-        JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col);
+        JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
         this.setLayout(new BorderLayout());
-        this.add(contentPane,BorderLayout.CENTER);
+        this.add(contentPane, BorderLayout.CENTER);
     }
 
     protected LegendGradientBar createLegendGradientBar() {
@@ -81,7 +81,7 @@ public class GradualIntervalConfigPane extends JPanel{
         };
     }
 
-    public void populate(GradualIntervalConfig intervalConfig){
+    public void populate(GradualIntervalConfig intervalConfig) {
         minMaxValuePane.populate(intervalConfig.getMinAndMaxValue());
 
         colorSelectBox.setSelectObject(intervalConfig.getSubColor());
@@ -92,7 +92,7 @@ public class GradualIntervalConfigPane extends JPanel{
         legendGradientBar.populate(intervalConfig);
     }
 
-    public void update(GradualIntervalConfig intervalConfig){
+    public void update(GradualIntervalConfig intervalConfig) {
         minMaxValuePane.update(intervalConfig.getMinAndMaxValue());
 
         intervalConfig.setSubColor(colorSelectBox.getSelectObject());

designer-chart/src/main/java/com/fr/van/chart/range/component/LegendGradientBar.java

@@ -44,14 +44,16 @@ public class LegendGradientBar extends JComponent implements ColorSelectable, UI
     private static final int REC_HEIGHT = 30;
     private static final int MAX_VERTICAL = 45;
 
+
     //颜色选择器个数
     private int colorSelectionBtnNum;
 
     //主题色
     private Color subColor;
 
-    private int max = 150;
+    private static int max = 150;
     private int min = 4;
+    public static final int COLOR_GRADUAL_NUM_MAX = max / 5;
 
     //选中的颜色
     private Color color;

designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@@ -162,6 +162,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
 
                 // 由于多选的时候修改了 cellDSColumnBasicPane 中组件的visiable属性，切换时需要将其设置为false
                 cellDSColumnBasicPane.setVisible(false);
+                cellDSColumnAdvancedPane.setVisible(false);
 
                 card.show(cardContainer, paneList.get(index).title4PopupWindow());
                 paneList.get(index).populate();
@@ -1064,7 +1065,10 @@ public class CellDSColumnEditor extends CellQuickEditor {
     @Override
     public void refreshMultipleDetails() {
         tabsHeaderIconPane.setVisible(tc.isSelectedOneCell());
-        cellDSColumnAdvancedPane.setVisible(tc.isSelectedOneCell());
+
+        // 需要结合AdvancedPane的原始visible状态设置单选多选visible
+        boolean advancedPaneVisible = cellDSColumnAdvancedPane.isVisible();
+        cellDSColumnAdvancedPane.setVisible(advancedPaneVisible && tc.isSelectedOneCell());
 
         cellDSColumnBasicPane.setMultipleVisible(tc.isSelectedOneCell());
     }