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

@@ -32,16 +32,16 @@ import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;
 import java.util.Set;
 
-public class XElementCase extends XBorderStyleWidgetCreator implements FormElementCaseContainerProvider{
+public class XElementCase extends XBorderStyleWidgetCreator implements FormElementCaseContainerProvider {
     private UILabel imageLable;
     private FormDesigner designer;
     private static BufferedImage DEFAULT_BACKGROUND;
     private boolean isHovering = false;
 
-	static{
-		try{
+    static {
+        try {
             DEFAULT_BACKGROUND = BaseUtils.readImageWithCache("com/fr/base/images/report/elementcase.png");
-		}catch (Throwable e) {
+        } catch (Throwable e) {
             //IBM jdk 1.5.0_22 并发下读取图片有时会异常(EOFException), 这个图片反正只有设计器用到, 捕获住
             DEFAULT_BACKGROUND = CoreGraphHelper.createBufferedImage(0, 0);
         }
@@ -110,7 +110,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
     }
 
 
-	public CRPropertyDescriptor[] getExtraTableEditor(){
+    public CRPropertyDescriptor[] getExtraTableEditor() {
         CRPropertyDescriptor[] extraTableEditor = resolveCompatible();
         CRPropertyDescriptor reportFitEditor = getReportFitEditor();
         if (reportFitEditor == null) {
@@ -134,7 +134,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
             editor.setReportFitAttr(null);
         }
         ReportFitAttr reportFit = editor.getReportFitAttr();
-		if(fitAttr != null){
+        if (fitAttr != null) {
             reportFit = fitAttr.fitInBrowser() ? editor.getReportFitAttr() : fitAttr;
         }
         ReportFitAttr reportFitAttr = editor.getReportFitAttr() == null ? fitAttr : reportFit;
@@ -200,7 +200,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
     /**
      * 从data中获取到图片背景, 并设置到Label上
      */
-	private UILabel initImageBackground(){
+    private UILabel initImageBackground() {
         UILabel imageLable = new UILabel();
         BufferedImage image = toData().getECImage();
         if (image == null) {
@@ -214,7 +214,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
     /**
      * 设置指定Label的背景
      */
-	private void setLabelBackground(Image image, UILabel imageLable){
+    private void setLabelBackground(Image image, UILabel imageLable) {
         ImageIcon icon = new ImageIcon(image);
         imageLable.setIcon(icon);
         imageLable.setOpaque(true);
@@ -223,7 +223,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
     }
 
     @Override
-	public void paintBorder(Graphics g, Rectangle bounds){
+    public void paintBorder(Graphics g, Rectangle bounds) {
         if (!isHovering) {
             super.paintBorder(g, bounds);
         }
@@ -250,7 +250,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
      * 该组件是否可以拖入参数面板
      * @return 是则返回true
      */
-	public boolean canEnterIntoParaPane(){
+    public boolean canEnterIntoParaPane() {
         return false;
     }
 
@@ -274,16 +274,27 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
         toData().setElementCase(el);
     }
 
-	public void setBackground(BufferedImage image){
-		toData().setECImage(image);
-		setEditorIcon(image);
+    public void setBackground(BufferedImage image) {
+        toData().getElementCaseImage().adjustImageBytes(image);
+        setEditorIcon(toData().getECImage() == null ? DEFAULT_BACKGROUND : toData().getECImage());
     }
 
-	private void setEditorIcon(BufferedImage image){
+    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);
     }
 
-	public Dimension getSize(){
+    public Dimension getSize() {
         return new Dimension(this.getWidth(), this.getHeight());
     }
 
@@ -292,21 +303,21 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
      * @param editingMouseListener 事件处理器
      * @param e 点击事件
      */
-	public void respondClick(EditingMouseListener editingMouseListener,MouseEvent e){
+    public void respondClick(EditingMouseListener editingMouseListener, MouseEvent e) {
         super.respondClick(editingMouseListener, e);
         editingMouseListener.refreshTopXCreator();
         if (this.isShareConfigButtonFocus()) {
-			CoverReportPane.showShareConfig(((XCreator)this.getParent()).toData());
+            CoverReportPane.showShareConfig(((XCreator) this.getParent()).toData());
         } else {
             switchTab(e, editingMouseListener);
         }
     }
 
 
-	private void switchTab(MouseEvent e,EditingMouseListener editingMouseListener){
+    private void switchTab(MouseEvent e, EditingMouseListener editingMouseListener) {
         FormDesigner designer = editingMouseListener.getDesigner();
         if (e.getButton() == MouseEvent.BUTTON1 &&
-				(e.getClickCount() == 2 || designer.getCursor().getType() == Cursor.HAND_CURSOR)){
+                (e.getClickCount() == 2 || designer.getCursor().getType() == Cursor.HAND_CURSOR)) {
             FormElementCaseContainerProvider component = (FormElementCaseContainerProvider) designer.getComponentAt(e);
             //切换设计器
             designer.switchTab(component);
@@ -315,14 +326,14 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 
     @Override
     public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
-		return new WidgetPropertyUIProvider[]{ new ElementCasePropertyUI(this)};
+        return new WidgetPropertyUIProvider[]{new ElementCasePropertyUI(this)};
     }
 
     /**
      * data属性改变触发其他操作
      *
      */
-	public void firePropertyChange(){
+    public void firePropertyChange() {
         initStyle();
     }
 
@@ -330,7 +341,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
      * 是否支持设置可用
      * return boolean
      */
-	public boolean supportSetEnable(){
+    public boolean supportSetEnable() {
         return false;
     }
 

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