Pull request #5838: REPORT-59440 & REPORT-57551

Merge in DESIGN/design from ~STARRYI/design:final/11.0 to final/11.0

* commit 'e5b4bea87fae8f4fb145bb9a221ab03bfd86d989':
  REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景
  REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景
  REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景
  REPORT-59440 【主题切换】合并单元格以后，单元格样式都变成了自定义

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

@@ -21,6 +21,8 @@ import com.fr.stable.StringUtils;
 import javax.swing.*;
 import javax.swing.border.Border;
 import javax.swing.border.LineBorder;
+import javax.swing.plaf.PanelUI;
+import javax.swing.plaf.basic.BasicPanelUI;
 import java.awt.*;
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.RoundRectangle2D;
@@ -42,6 +44,7 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
     public XBorderStyleWidgetCreator(Widget widget, Dimension initSize) {
         super(widget, initSize);
 
+		setUI(new NoBackgroundPaneUI());
         setOpaque(false);
         setBackupBound(null);
 
@@ -51,6 +54,13 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 		}
     }
 
+	@Override
+	public void setUI(PanelUI ui) {
+		if (ui instanceof NoBackgroundPaneUI) {
+			super.setUI(ui);
+		}
+	}
+
 	public Background getBackground4Painting() {
 		return this.background4Painting;
 	}
@@ -91,12 +101,12 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 		super.addToWrapper(parentPanel, width, minHeight);
 		// REPORT-53175: 新创建的图表组件默认显示标题 since 10.0.18
 		// 将当前对象添加到父容器后，初始化默认样式的效果
-		initStyle();
+		refreshStylePreviewEffect();
 	}
 
-	protected void initStyle() {
+	public void refreshStylePreviewEffect() {
     	BorderPacker style = toData().getBorderStyle();
-     	initBorderAndBackgroundStyle();
+     	refreshBorderAndBackgroundStylePreviewEffect();
         if (ComparatorUtils.equals(style.getType(), LayoutBorderStyle.TITLE)) {
           	initTitleStyle(style);
         } else {
@@ -107,7 +117,7 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 		reshuffleBorderAndBackgroundPaintingEffectIfTitleExists();
      }
 
-    protected void initBorderAndBackgroundStyle() {
+    public void refreshBorderAndBackgroundStylePreviewEffect() {
     	BorderPacker style = toData().getBorderStyle();
 		LineBorder DEFAULT_LINE_BORDER = (LineBorder) DEFALUTBORDER;
 
@@ -288,6 +298,11 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 
 	// 设计器预览界面中绘制组件背景效果
 	public void paintBackground(Graphics2D g2d) {
+		if (isOpaque()) {
+			g2d.setColor(getBackground());
+			g2d.fillRect(0, 0,  getWidth(), getHeight());
+		}
+
     	Background background4Painting = getBackground4Painting();
 		if (background4Painting != null) {
 			Composite oldComposite = g2d.getComposite();
@@ -311,12 +326,12 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 	}
 
 	public void paintForeground(Graphics2D g2d) {
-		super.paint(g2d);
+		super.paintComponent(g2d);
 		super.paintBorder(g2d);
 	}
 
 	@Override
-	public void paint(Graphics g) {
+	public void paintComponent(Graphics g) {
     	this.clipByRoundedBorder((Graphics2D) g);
 		this.paintBackground((Graphics2D) g);
 		this.paintBorderImage((Graphics2D) g);
@@ -378,4 +393,11 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
 		}
 	}
+
+	public static class NoBackgroundPaneUI extends BasicPanelUI {
+		@Override
+		public void update(Graphics g, JComponent c) {
+			paint(g, c);
+		}
+	}
 }

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

@@ -122,7 +122,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
 
                     @Override
                     public void propertyChange() {
-                        initStyle();
+                        refreshStylePreviewEffect();
                     }
                 }),
         };
@@ -165,7 +165,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
     @Override
     protected void initXCreatorProperties() {
         super.initXCreatorProperties();
-        initBorderAndBackgroundStyle();
+        refreshBorderAndBackgroundStylePreviewEffect();
         BaseChartCollection collection = ((BaseChartEditor) data).getChartCollection();
         isRefreshing = true;
         ((MiddleChartComponent) designerEditor.getEditorTarget()).populate(collection);
@@ -344,7 +344,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
      * data属性改变触发其他操作
      */
     public void firePropertyChange() {
-        initStyle();
+        refreshStylePreviewEffect();
     }
 
     @Override

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

@@ -58,7 +58,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
         super.initXCreatorProperties();
 
         // 报表块初始化时要加载对应的borderStyle
-        initBorderAndBackgroundStyle();
+        refreshBorderAndBackgroundStylePreviewEffect();
     }
 
     /**
@@ -94,7 +94,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 
                     @Override
                     public void propertyChange() {
-                        initStyle();
+                        refreshStylePreviewEffect();
                     }
                 }),
                 new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
@@ -336,7 +336,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
      *
      */
     public void firePropertyChange() {
-        initStyle();
+        refreshStylePreviewEffect();
     }
 
     /**

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

@@ -75,7 +75,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
 
                     @Override
                     public void propertyChange() {
-                        initStyle();
+                        refreshStylePreviewEffect();
                     }
                 }),
                 new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
@@ -118,7 +118,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
     @Override
     protected void initXCreatorProperties() {
         super.initXCreatorProperties();
-        initBorderAndBackgroundStyle();
+        refreshBorderAndBackgroundStylePreviewEffect();
         this.initLayoutManager();
         this.convert();
     }
@@ -547,7 +547,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
      *
      */
     public void firePropertyChange(){
-        initStyle();
+        refreshStylePreviewEffect();
     }
 
     /**

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

@@ -78,7 +78,7 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout {
 
                             @Override
                             public void propertyChange() {
-                                initStyle();
+                                XWAbsoluteBodyLayout.this.refreshStylePreviewEffect();
                             }
                         })
         };
@@ -105,8 +105,8 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout {
     }
 
     @Override
-    protected void initStyle() {
+    public void refreshStylePreviewEffect() {
-        initBorderAndBackgroundStyle();
+        refreshBorderAndBackgroundStylePreviewEffect();
     }
 
     /**
@@ -114,7 +114,7 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout {
      *
      */
     public void firePropertyChange(){
-        initStyle();
+        this.refreshStylePreviewEffect();
     }
 
     @Override

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

@@ -305,7 +305,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
     }
 
     @Override
-    protected void initStyle() {
+    public void refreshStylePreviewEffect() {
         // do nothing
     }
 

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

@@ -63,7 +63,7 @@ public class XWTitleLayout extends DedicateLayoutContainer {
 	}
 
 	@Override
-	protected void initBorderAndBackgroundStyle() {
+	public void refreshBorderAndBackgroundStylePreviewEffect() {
 		setBorder(null);
 		setBorderImage4Painting(null, 0.0);
 		setBackground4Painting(null, 0.0);
@@ -76,7 +76,7 @@ public class XWTitleLayout extends DedicateLayoutContainer {
 		// 初始化后（如打开旧模版)，需要重新调整组件/标题/边框的显示效果
 		XCreator xCreator = getBodyCreator();
 		if (xCreator instanceof XBorderStyleWidgetCreator) {
-			((XBorderStyleWidgetCreator) xCreator).initStyle();
+			((XBorderStyleWidgetCreator) xCreator).refreshStylePreviewEffect();
 		}
 	}
 
@@ -237,7 +237,7 @@ public class XWTitleLayout extends DedicateLayoutContainer {
 		}
 		// 刷新时重置下样式
 		if (bodyCreator != null) {
-			bodyCreator.initStyle();
+			bodyCreator.refreshStylePreviewEffect();
 		}
 		isRefreshing = false;
 	}

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

@@ -160,7 +160,7 @@ public class XWCardLayout extends XLayoutContainer {
      */
     @Override
     protected XLayoutContainer getCreatorWrapper(String widgetName) {
-        initStyle();
+        refreshStylePreviewEffect();
         Dimension dimension = new Dimension();
         //主结构是一个borderlayout, 标签部分是north, card部分为center
         WCardMainBorderLayout border = new WCardMainBorderLayout();
@@ -389,7 +389,7 @@ public class XWCardLayout extends XLayoutContainer {
 
                     @Override
                     public void propertyChange() {
-                        initStyle();
+                        refreshStylePreviewEffect();
                     }
                 })
         };
@@ -397,10 +397,10 @@ public class XWCardLayout extends XLayoutContainer {
 
     //初始化样式
     @Override
-    protected void initStyle() {
+    public void refreshStylePreviewEffect() {
         BorderPacker style = toData().getBorderStyle();
         initBorderTitleStyle(style);
-        initBorderAndBackgroundStyle();
+        refreshBorderAndBackgroundStylePreviewEffect();
         clearOrShowTitleLayout(ComparatorUtils.equals(style.getType(), LayoutBorderStyle.TITLE));
     }
 
@@ -479,7 +479,7 @@ public class XWCardLayout extends XLayoutContainer {
      */
     @Override
     public void firePropertyChange() {
-        initStyle();
+        refreshStylePreviewEffect();
     }
 
     public void resetTabBackground(TemplateStyle templateStyle) {

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

@@ -417,7 +417,7 @@ public class XWCardMainBorderLayout extends XWBorderLayout {
 	public void firePropertyChange(){
 		XWCardLayout cardLayout = this.getCardPart();
 		if (cardLayout != null && cardLayout.toData() != null) {
-			cardLayout.initStyle();
+			cardLayout.refreshStylePreviewEffect();
 		}
 	}
 

designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java

@@ -181,6 +181,7 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
                     wFitLayout.setBorderStyle(layout.getBorderStyle());
                 }
                 copyLayoutAttr(layout, xwFitLayout.toData());
+                xwFitLayout.refreshStylePreviewEffect();
             }
         }
         layout.setBorderStyleFollowingTheme(themePane.isFollowingTheme());

designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java

@@ -42,6 +42,7 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.report.core.ReportUtils;
 
 import javax.swing.*;
+import javax.swing.border.Border;
 import java.awt.*;
 
 /**
@@ -243,6 +244,16 @@ public class FRFitLayoutDefinePane extends AbstractFRLayoutDefinePane<WFitLayout
                 FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
                 formDesigner.getSelectionModel().setSelectedCreators(
                         FormSelectionUtils.rebuildSelection(xWFitLayout, new Widget[]{wAbsoluteBodyLayout}));
+
+                if (xwAbsoluteBodyLayout.toData() != null) {
+                    xwAbsoluteBodyLayout.toData().setBorderStyleFollowingTheme(wAbsoluteBodyLayout.isBorderStyleFollowingTheme());
+                    xwAbsoluteBodyLayout.toData().setBorderStyle(wAbsoluteBodyLayout.getBorderStyle());
+                }
+                xwAbsoluteBodyLayout.refreshStylePreviewEffect();
+                if (xWFitLayout.toData() != null) {
+                    xWFitLayout.toData().resetStyle();
+                }
+                xWFitLayout.refreshStylePreviewEffect();
             }
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);

designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java

@@ -383,8 +383,27 @@ public class CellSelection extends Selection {
                 return false;
             }
         }
-
+        int rowStartIndex = row;
+        int rowEndIndex = row + rowSpan - 1;
+        int columnStartIndex = column;
+        int columnEndIndex = column + columnSpan - 1;
+
+        // 合并已有单元格，还是新建单元格
+        boolean hasCellElement = false;
+        for (int ri = rowStartIndex; ri <= rowEndIndex; ri++) {
+            for (int ci = columnStartIndex; ci <= columnEndIndex; ci++) {
+                CellElement ce = ec.getCellElement(ci, ri);
+                if (ce != null) {
+                    hasCellElement = true;
+                    break;
+                }
+            }
+        }
+        if (hasCellElement) {
             ec.merge(row, row + rowSpan - 1, column, column + columnSpan - 1);
+        } else {
+            ec.addCellElement(DefaultThemedTemplateCellElementCase.createInstance(column, row, columnSpan, rowSpan, null), true);
+        }
 
         return true;
     }