feature/10.0 -> feature/x 冲突解决

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

@@ -126,6 +126,11 @@ public class ColorButton extends AbstractSelectBox<Color> {
             public void setVisible(boolean b) {
                 super.setVisible(b);
             }
+
+            @Override
+            protected boolean selectRealTime() {
+                return false;
+            }
         };
         colorPane.addChangeListener(new ChangeListener() {
             public void stateChanged(ChangeEvent e) {

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

@@ -93,9 +93,9 @@ public class ColorPickerPaneWithMaxMin extends ColorPickerPaneWithFormula {
     private void setTextState(TinyFormulaPane tinyFormulaPane, int index, int maxIndex, String value) {
         boolean enable = false;
         if (index == 0) {
-            value = "∞";
+            value = "=∞";
         } else if (index == maxIndex) {
-            value = "-∞";
+            value = "=-∞";
         } else {
             enable = true;
         }

designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeBeautyPane.java

@@ -1,5 +1,6 @@
 package com.fr.van.chart.gauge;
 
+import com.fr.chart.base.ChartConstants;
 import com.fr.chart.base.GradientStyle;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
@@ -46,6 +47,7 @@ public class VanChartGaugeBeautyPane extends VanChartBeautyPane {
         };
 
         gradientBarPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
+        colorGradient.updateColor(ChartConstants.GRADIENT_END, ChartConstants.GRADIENT_START);
         return gradientBarPane;
     }
 

designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java

@@ -275,10 +275,21 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
     }
 
     public void setBackground(BufferedImage image) {
-		toData().setECImage(image);
-		setEditorIcon(image);
+        toData().getElementCaseImage().adjustImageBytes(image);
+        setEditorIcon(toData().getECImage() == null ? DEFAULT_BACKGROUND : toData().getECImage());
     }
 
+    public void updateECImage() {
+        XElementCase self = this;
+        self.toData().getElementCaseImage().updateImage(() -> {
+            self.setEditorIcon(self.toData().getECImage() == null ? DEFAULT_BACKGROUND : self.toData().getECImage());
+            if (self.designer != null) {
+                self.designer.repaint();
+            }
+        });
+    }
+
+
     private void setEditorIcon(BufferedImage image) {
         setLabelBackground(image, imageLable);
     }

designer-form/src/main/java/com/fr/design/gui/controlpane/EventPropertyPane.java

@@ -166,7 +166,9 @@ public class EventPropertyPane extends UIControlPane implements ListControlPaneP
             }
             eventListWrapperPane.setVisible(listSize > 0);
         }
+        if (this.selectNameEdList != null) {
             this.selectNameEdList.setSelectedIndex(0);
+        }
         this.repaint();
     }
 

designer-form/src/main/java/com/fr/design/mainframe/FormSelection.java

@@ -6,10 +6,12 @@ import com.fr.design.designer.beans.location.Direction;
 import com.fr.design.designer.creator.XComponent;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XCreatorUtils;
+import com.fr.design.designer.creator.XElementCase;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWAbsoluteLayout;
 import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.designer.creator.XWParameterLayout;
+import com.fr.design.designer.creator.XWTitleLayout;
 import com.fr.design.designer.creator.cardlayout.XWCardTagLayout;
 import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
 import com.fr.design.file.HistoryTemplateListCache;
@@ -18,6 +20,7 @@ import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.ui.Widget;
 import com.fr.log.FineLoggerFactory;
 
+import java.awt.Component;
 import java.awt.LayoutManager;
 import java.awt.Rectangle;
 import java.util.ArrayList;
@@ -278,11 +281,32 @@ public class FormSelection {
                     creator.setBackupBound(backupBounds);
                 }
                 layoutAdapter.fix(creator);
+                resetElementCaseImage(creator);
             }
             i++;
         }
     }
 
+    /**
+     * @Description 重置报表块缩略图
+     * @param: creator
+     * @return void
+     * @Author Henry.Wang
+     * @Date 2021/5/21 14:59
+     **/
+    public void resetElementCaseImage(XCreator creator) {
+        if (creator instanceof XWTitleLayout) {
+            XWTitleLayout xwTitleLayout = (XWTitleLayout) creator;
+            for (int i = 0; i < xwTitleLayout.getComponentCount(); i++) {
+                Component component = xwTitleLayout.getComponent(i);
+                if (component instanceof XElementCase) {
+                    XElementCase xElementCase = (XElementCase) component;
+                    xElementCase.updateECImage();
+                }
+            }
+        }
+    }
+
     /**
      * 检查下有没有参数面板，如果存在，处理下参数面板造成的偏移量
      * @param rectangle