Pull request #13654: REPORT-115048 设计器里控件背景栏宽度显示异常

Merge in DESIGN/design from ~LEO.QIN/design:release/11.0 to release/11.0

* commit '68a4c2402ac2e51e5f1906f1ca01598e1fc45706':
  REPORT-115048 设计器里控件背景栏宽度显示异常 【问题原因】之前的布局实现后显示有点问题 【改动思路】使用新布局重写UI

build.gradle

@@ -87,6 +87,7 @@ allprojects {
         implementation 'com.fr.report:engine-chart:' + frDevVersion
         implementation 'com.fr.report:engine-i18n:' + frDevVersion
         implementation 'com.fr.design:design-i18n:' + frDevVersion
+        implementation 'com.fine.swing.ui:layout:1.0-SNAPSHOT'
         testImplementation 'org.easymock:easymock:3.5.1'
         testImplementation 'org.powermock:powermock-module-junit4:1.7.1'
         testImplementation 'org.powermock:powermock-api-easymock:1.7.1'

designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/DesktopWidgetStyleEditPane.java

@@ -1,9 +1,12 @@
 package com.fr.widgettheme.theme.edit.widget;
 
+import com.fine.swing.ui.layout.Column;
 import com.fr.base.background.ColorBackground;
 import com.fr.base.theme.TemplateTheme;
 import com.fr.design.gui.icombobox.LineComboBox;
 import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.style.color.NewColorSelectBox;
 import com.fr.design.utils.DesignUtils;
 import com.fr.locale.InterProviderFactory;
@@ -13,8 +16,6 @@ import com.fr.widgettheme.theme.widget.style.BorderStyle;
 import com.fr.widgettheme.theme.widget.style.ButtonBackgroundStyle;
 import com.fr.widgettheme.theme.widget.style.ThemeTextStyle;
 import com.fr.widgettheme.theme.widget.style.ThemedWidgetStyle;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.i18n.Toolkit;
 import com.fr.widgettheme.theme.widget.theme.WidgetThemeDisplayConstants;
 import com.fr.widgettheme.util.WidgetStyleComponentCombiner;
 import com.fr.widgettheme.util.WidgetThemeDesignerUtils;
@@ -22,6 +23,9 @@ import com.fr.widgettheme.util.WidgetThemeDesignerUtils;
 import java.awt.Color;
 import java.awt.Component;
 
+import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.column;
+
 
 /**
  * 桌面端主题面板
@@ -51,8 +55,7 @@ public class DesktopWidgetStyleEditPane<T extends TemplateTheme> extends WidgetS
         initSelectBackgroundColorBox();
         initFontNameSelectBox();
         return new Component[][]{
-                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Color")), colorSelectBox},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Color")), colorSelectBox}, new Component[]{WidgetThemeDesignerUtils.createTopAlignmentLabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Widget_Background")), initBackGroundComponent()},
-                new Component[]{WidgetThemeDesignerUtils.createTopAlignmentLabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Widget_Background")), WidgetStyleComponentCombiner.combineWidgetBackgroundComponent(widgetBgColorSelectBox, widgetBgAlphaDragPane, colorSelectBox.getPreferredSize().width)},
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Border_Line")), lineComboBox},
                 new Component[]{null, lineComboColorSelectBox},
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Border_Radius")), borderRadiusSpinner},
@@ -63,6 +66,10 @@ public class DesktopWidgetStyleEditPane<T extends TemplateTheme> extends WidgetS
         };
     }
 
+    private Column initBackGroundComponent() {
+        return column(10, cell(widgetBgColorSelectBox), cell(widgetBgAlphaDragPane)).getComponent();
+    }
+
     private void initSelectBackgroundColorBox() {
         selectBackgroundColorBox = new NewColorSelectBox(140, true);
         selectBackgroundColorBox.setSelectObject(WidgetThemeDisplayConstants.DEFAULT_THEME_COLOR);

designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/WidgetStyleEditPane.java

@@ -1,5 +1,6 @@
 package com.fr.widgettheme.theme.edit.widget;
 
+import com.fine.swing.ui.layout.Column;
 import com.fr.base.theme.TemplateTheme;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.designer.IntervalConstants;
@@ -29,6 +30,9 @@ import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.Component;
 
+import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.column;
+
 
 /**
  * 组件样式编辑基础类
@@ -104,7 +108,7 @@ public class WidgetStyleEditPane<T extends TemplateTheme> extends BasicBeanPane<
     public Component[][] generateComponent() {
         return new Component[][]{
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Color")), colorSelectBox},
-                new Component[]{WidgetThemeDesignerUtils.createTopAlignmentLabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Widget_Background")), WidgetStyleComponentCombiner.combineWidgetBackgroundComponent(widgetBgColorSelectBox, widgetBgAlphaDragPane, colorSelectBox.getPreferredSize().width)},
+                new Component[]{WidgetThemeDesignerUtils.createTopAlignmentLabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Widget_Background")), initBackGroundComponent()},
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Border_Line")), lineComboBox},
                 new Component[]{null, lineComboColorSelectBox},
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Border_Radius")), borderRadiusSpinner},
@@ -113,6 +117,13 @@ public class WidgetStyleEditPane<T extends TemplateTheme> extends BasicBeanPane<
         };
     }
 
+    private Column initBackGroundComponent() {
+        return column(10,
+                cell(widgetBgColorSelectBox),
+                cell(widgetBgAlphaDragPane)
+        ).getComponent();
+    }
+
     private void initCommonStyleEditor() {
         colorSelectBox = new NewColorSelectBox(WidgetThemeDisplayConstants.THEME_WIDGET_COMPONENT_WIDTH, true);
         colorSelectBox.setSelectObject(WidgetThemeDisplayConstants.DEFAULT_THEME_COLOR);

designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java

@@ -1,25 +1,18 @@
 package com.fr.design.widgettheme;
 
+import com.fine.swing.ui.layout.Column;
 import com.fr.base.background.ColorBackground;
 import com.fr.base.theme.TemplateTheme;
-import com.fr.design.gui.frpane.FontSizeComboPane;
-import com.fr.design.gui.frpane.UIPercentDragPane;
-import com.fr.design.gui.ibutton.UIColorButton;
-import com.fr.design.gui.ibutton.UIToggleButton;
-import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.utils.DesignUtils;
-import com.fr.general.IOUtils;
-import com.fr.util.ColorUtils;
-import com.fr.widgettheme.theme.widget.style.BorderStyle;
-import com.fr.widgettheme.theme.widget.style.ButtonBackgroundStyle;
-import com.fr.widgettheme.theme.widget.style.ThemeTextStyle;
-import com.fr.widgettheme.theme.widget.style.ThemedWidgetStyle;
-import com.fr.widgettheme.theme.bean.ButtonBackground;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.gui.frpane.FontSizeComboPane;
+import com.fr.design.gui.frpane.UIPercentDragPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.ibutton.UIColorButton;
+import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icombobox.LineComboBox;
+import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.style.FRFontPane;
 import com.fr.design.i18n.Toolkit;
@@ -28,10 +21,18 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.style.color.NewColorSelectBox;
+import com.fr.design.utils.DesignUtils;
 import com.fr.design.widget.ui.designer.component.UIBoundSpinner;
 import com.fr.form.ui.Widget;
 import com.fr.general.FRFont;
+import com.fr.general.IOUtils;
+import com.fr.util.ColorUtils;
+import com.fr.widgettheme.theme.bean.ButtonBackground;
 import com.fr.widgettheme.theme.panel.ButtonStyleDefinedPane;
+import com.fr.widgettheme.theme.widget.style.BorderStyle;
+import com.fr.widgettheme.theme.widget.style.ButtonBackgroundStyle;
+import com.fr.widgettheme.theme.widget.style.ThemeTextStyle;
+import com.fr.widgettheme.theme.widget.style.ThemedWidgetStyle;
 import com.fr.widgettheme.theme.widget.theme.WidgetThemeDisplayConstants;
 import com.fr.widgettheme.util.WidgetStyleComponentCombiner;
 import com.fr.widgettheme.util.WidgetThemeDesignerUtils;
@@ -45,6 +46,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.column;
+
 /**
  * 样式设置pane抽象类
  *
@@ -152,10 +156,18 @@ public abstract class BaseStyleSettingPane<T extends Widget> extends BasicBeanPa
         paneMap.put(StyleSetting.FONT, frFontPane);
         paneMap.put(StyleSetting.BTN_BACKGROUND, buttonStyleDefinedPane);
         paneMap.put(StyleSetting.SELECT_COLOR, selectBgColorBox);
-        paneMap.put(StyleSetting.WIDGET_BACKGROUND, WidgetStyleComponentCombiner.combineWidgetBackgroundComponent(widgetBgColorSelectBox, widgetBgAlphaDragPane, WidgetThemeDisplayConstants.THEME_PC_WIDGET_BACKGROUND_WIDTH));
+        paneMap.put(StyleSetting.WIDGET_BACKGROUND, initBackGroundComponent());
         paneMap.put(StyleSetting.ICON_COLOR, iconColorSelectBox);
     }
 
+    private Column initBackGroundComponent() {
+        return column(
+                10,
+                cell(widgetBgColorSelectBox),
+                cell(widgetBgAlphaDragPane)
+        ).getComponent();
+    }
+
     protected JPanel createHeadPane() {
         UILabel headLabel = new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Style_Setting"));
         String[] titles = new String[]{Toolkit.i18nText("Fine-Design_Widget_Follow_Theme"), Toolkit.i18nText("Fine-Design_Widget_Theme_Custom")};