Merge pull request #5889 in DESIGN/design from release/11.0 to feature/x

* commit 'bc5db8ffae3f3a5302892b1e8404f5a85afa3a57':
  无JIRA任务，打包报错
  REPORT-59523 【主题切换】拖入的新组件没有跟随主题
  CHART-20522 && REPORT-59010 final传一份
  REPORT-59450 创建组件封面图背景是黑的
  REPORT-59166 韩文设计器设置条件属性 条件属性框体标题显示不全
  REPORT-59143 【设计器适配】模版设置为移动端模版也要支持新旧表单切换
  REPORT-59143 【设计器适配】模版设置为移动端模版也要支持新旧表单切换
  REPORT-59143 【设计器适配】模版设置为移动端模版也要支持新旧表单切换
  REPORT-59411 【FR11.beta.1冒烟】新自适应-body布局方式是绝对布局时，显示有缩放逻辑设置项
  REPORT-59647 视觉启动图要再换一下
  REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景
  REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景
  REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景
  还原范围
  fix conflict
  REPORT-59440 【主题切换】合并单元格以后，单元格样式都变成了自定义
  REPORT-59322 【主题切换】国际化配色方案-主题颜色内容截断
  CHART-20568 [产品验收]设计器预览页面图表组件鬼畜 & CHART-20627 图表块组件，鼠标双击，会出现图形重影
  REPORT-58984 服务器数据集兼容共享数据集final

designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java

@@ -387,8 +387,6 @@ public abstract class UIControlPane extends JControlPane {
             contentPane.setBackground(originColor);
             contentPane.setLayout(new BorderLayout());
             titleLabel = new UILabel(title);
-            Font font = new Font("SimSun", Font.PLAIN, 12);
-            titleLabel.setFont(font);
             contentPane.add(titleLabel, BorderLayout.WEST);
             contentPane.setBorder(new EmptyBorder(5, 14, 6, 0));
 

designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java

@@ -316,7 +316,6 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
         colorListExtendedPane.populate(colors);
         FineColorManager.FineColorReplaceByColorScheme replaceByColorScheme = new FineColorManager.FineColorReplaceByColorScheme(colors);
         T theme = updateBean();
-
         FineColorFlushUtils.replaceCacheObject(theme, replaceByColorScheme);
         FineColorManager.traverse(theme, replaceByColorScheme);
         populateBean4CustomEditors(theme);

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

@@ -28,6 +28,7 @@ import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.main.Form;
 import com.fr.form.main.WidgetGather;
 import com.fr.form.parameter.FormSubmitButton;
+import com.fr.form.ui.AbstractBorderStyleWidget;
 import com.fr.form.ui.Button;
 import com.fr.form.ui.CardAddButton;
 import com.fr.form.ui.CardSwitchButton;
@@ -232,7 +233,7 @@ public class XCreatorUtils {
         JTemplate<?,?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
         TemplateTheme theme = template.getTemplateTheme();
         if (theme instanceof FormTheme) {
-            setupTemplateTheme(creator, (FormTheme) theme, TemplateThemeCompatible.NONE);
+            setupTemplateTheme(creator, true, (FormTheme) theme, TemplateThemeCompatible.NONE);
         }
         return creator;
     }
@@ -378,12 +379,16 @@ public class XCreatorUtils {
         return null;
     }
 
-    public static void setupTemplateTheme(XCreator container, final FormTheme currentTemplateUsingTheme, TemplateThemeCompatible compatible) {
+
+    public static void setupTemplateTheme(XCreator container, final boolean forceFollowingTheme, final FormTheme currentTemplateUsingTheme, TemplateThemeCompatible compatible) {
         FineColorGather colorGather = new FineColorManager.FineColorReplaceByTheme(currentTemplateUsingTheme, compatible);
         Form.traversalWidget(container.toData(), new WidgetGather() {
             @Override
             public void dealWith(Widget widget) {
                 TemplateThemeAware<FormTheme> themedWidget = (TemplateThemeAware) widget;
+                if (forceFollowingTheme && widget instanceof AbstractBorderStyleWidget) {
+                    ((AbstractBorderStyleWidget) widget).setBorderStyleFollowingTheme(true);
+                }
                 themedWidget.onTemplateUsingThemeChange(currentTemplateUsingTheme, compatible);
             }
 

designer-form/src/main/java/com/fr/design/fit/attrpane/FRAbsoluteBodyLayoutExtendDefinePane.java

@@ -115,12 +115,10 @@ public class FRAbsoluteBodyLayoutExtendDefinePane extends FRAbsoluteLayoutDefine
         initLayoutComboBox();
 
         UILabel layoutTypeLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Layout_Type"));
-        UILabel scaleModeLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode"));
 
         JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(
                 new Component[][]{
-                        {layoutTypeLabel, layoutCombox},
-                        {scaleModeLabel, comboBox}
+                        {layoutTypeLabel, layoutCombox}
                 },
                 TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
 

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

@@ -99,7 +99,7 @@ public class ToolBarButton extends UIButton implements MouseListener, MouseMotio
 			creatorSource = no.getNameOption().createWidget();
 		}
 		if (creatorSource != null) {
-			XCreator xCreator = XCreatorUtils.createXCreator(creatorSource);
+			XCreator xCreator = XCreatorUtils.createThemedXCreator(creatorSource);
 			WidgetToolBarPane.getTarget().startDraggingBean(xCreator);
 			FormDesignerUtils.addWidgetProcessInfo(xCreator.toData());
 			lastPressEvent = null;

designer-form/src/main/java/com/fr/design/mainframe/share/action/CreateComponentAction.java

@@ -251,7 +251,10 @@ public class CreateComponentAction extends UpdateAction {
 
     private Image componentToImage(Component comp, Rectangle rect) {
 
-        BufferedImage im = new BufferedImage((int) rect.getWidth(), (int) rect.getHeight(), BufferedImage.TYPE_INT_RGB);
+        BufferedImage im = new BufferedImage((int) rect.getWidth(), (int) rect.getHeight(), BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g2d = (Graphics2D)im.getGraphics();
+        g2d.setColor(Color.WHITE);
+        g2d.fillRect(0, 0 , rect.width, rect.height);
         comp.paint(im.getGraphics());
         return im;
     }
@@ -260,7 +263,7 @@ public class CreateComponentAction extends UpdateAction {
     private Image moduleToImage(Form form, ElementCaseEditor editor, Map<String, Object> parameterMap, Rectangle rect) {
 
         if (editor == null) {
-            return new BufferedImage((int) rect.getWidth(), (int) rect.getHeight(), BufferedImage.TYPE_INT_RGB);
+            return new BufferedImage((int) rect.getWidth(), (int) rect.getHeight(), BufferedImage.TYPE_INT_ARGB);
         }
         FormElementCaseProvider provider = editor.getElementCase();
         provider.setName(editor.getWidgetName());

designer-form/src/main/java/com/fr/design/mainframe/share/util/ShareComponentUtils.java

@@ -61,7 +61,7 @@ public class ShareComponentUtils {
             boolean isCurrentUsingThemeSuitSharedComponent = StringUtils.isNotEmpty(theme.getName()) &&
                     StringUtils.isNotEmpty(suitableTemplateThemeName) &&
                     StringUtils.equals(theme.getName(), suitableTemplateThemeName);
-            XCreatorUtils.setupTemplateTheme(creator, (FormTheme) theme, isCurrentUsingThemeSuitSharedComponent ? TemplateThemeCompatible.NONE : TemplateThemeCompatible.ABSENT);
+            XCreatorUtils.setupTemplateTheme(creator, false, (FormTheme) theme, isCurrentUsingThemeSuitSharedComponent ? TemplateThemeCompatible.NONE : TemplateThemeCompatible.ABSENT);
         }
         return creator;
     }

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

@@ -383,8 +383,27 @@ public class CellSelection extends Selection {
                 return false;
             }
         }
-
-        ec.merge(row, row + rowSpan - 1, column, column + columnSpan - 1);
+        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;
     }