Pull request #13567: REPORT-114164 & REPORT-114305 单复选框bugfix

Merge in DESIGN/design from ~JACKY.LI/design:release/11.0 to release/11.0

* commit '268478dc5ab62e6beacf898b630fbd5965a42241':
  REPORT-114305 控件扩展样式—等分布局、自然布局效果都反了
  REPORT-114164 控件扩展样式-图文按钮图标格添加至12个以上，显示异常

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/ImageCustomDefinePane.java

@@ -9,6 +9,7 @@ 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.gui.ilable.UILabel;
+import com.fr.design.gui.iscrollbar.UIScrollBar;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -83,6 +84,14 @@ public class ImageCustomDefinePane extends MobileStyleCustomDefinePane {
             protected JPanel createContentPane() {
                 return scrollPanel;
             }
+
+            @Override
+            protected void setLeftContentPaneBounds(Container parent, UIScrollBar scrollBar, int beginY, int maxheight) {
+                int width = parent.getWidth();
+                int height = parent.getHeight();
+                leftcontentPane.setBounds(0, -beginY, width - scrollBar.getWidth() + getOverWidth(), leftcontentPane.getPreferredSize().height);
+                scrollBar.setBounds(width - scrollBar.getWidth(), 0, scrollBar.getWidth(), height);
+            }
         };
         this.add(basicScrollPane);
     }
@@ -157,9 +166,10 @@ public class ImageCustomDefinePane extends MobileStyleCustomDefinePane {
     private void initButtonAlignPane() {
         UILabel buttonAlignLabel = DesignerUtils.createConfigLabel(Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment"));
         buttonAlignCombo = new UIComboBox(new String[]{
-                Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Split"),
                 Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Nature"),
+                Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Split"),
         });
+        buttonAlignCombo.setSelectedIndex(1);
         buttonAlignCombo.setPreferredSize(new Dimension(DesignerUtils.LARGE_COMBO_WIDTH, 20));
         buttonAlignPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{buttonAlignLabel, buttonAlignCombo}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_SMALL);
     }

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/UnitedCustomDefinePane.java

@@ -143,9 +143,10 @@ public class UnitedCustomDefinePane extends MobileStyleCustomDefinePane {
         JPanel hPaddingSpinnerPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{leftSpinnerPanel, rightSpinnerPanel}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, LayoutConstants.VGAP_SMALL);
         // 按钮排布下拉框
         buttonAlignCombo = new UIComboBox(new String[]{
-                Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Split"),
                 Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Nature"),
+                Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Split")
         });
+        buttonAlignCombo.setSelectedIndex(1);
         buttonAlignCombo.setPreferredSize(new Dimension(DesignerUtils.NORMAL_COMBO_WIDTH, 20));
         double p = TableLayout.PREFERRED;
         double[] rowSize = {p, p, p};