Merge remote-tracking branch 'origin/release/11.0' into release/11.0

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

@@ -183,7 +183,7 @@ public class CapsuleCustomDefinePane extends MobileStyleCustomDefinePane {
      * 初始化固定列数面板
      */
     private void initColumnSizePane() {
-        UILabel columnSizeLabel = DesignerUtils.createConfigLabel(Toolkit.i18nText("Fine-Plugin-RadioGroup_Layout_Fixed_Number"));
+        UILabel columnSizeLabel = DesignerUtils.createConfigLabel("");
         columnSizeSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, DesignerUtils.INITIAL_COLUMN_SIZE);
         columnSizeSpinner.setPreferredSize(new Dimension(DesignerUtils.LARGE_COMBO_WIDTH, 20));
         columnSizePane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{columnSizeLabel, columnSizeSpinner}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_SMALL);

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

@@ -74,6 +74,8 @@ public class IconConfigPane extends JPanel {
     public void addCount() {
         deleteCountButton.setEnabled(true);
         IconButton iconButton = new IconButton("");
+        selectIconButton = iconButton;
+        editIconButton.setEnabled(true);
         iconButtons.add(iconButton);
         int indexToInsert = northPane.getComponentCount() - 2;
         deleteCountButton.setEnabled(!iconButtons.isEmpty());

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

@@ -157,8 +157,8 @@ 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_Nature"),
                 Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Split"),
+                Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Nature"),
         });
         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);
@@ -168,8 +168,8 @@ public class ImageCustomDefinePane extends MobileStyleCustomDefinePane {
      * 初始化固定列数面板
      */
     private void initColumnSizePane() {
-        UILabel columnSizeLabel = DesignerUtils.createConfigLabel(Toolkit.i18nText("Fine-Plugin-RadioGroup_Layout_Fixed_Number"));
-        columnSizeSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, DesignerUtils.INITIAL_COLUMN_SIZE);
+        UILabel columnSizeLabel = DesignerUtils.createConfigLabel("");
+        columnSizeSpinner = new UISpinner(1, Integer.MAX_VALUE, 1, DesignerUtils.INITIAL_COLUMN_SIZE);
         columnSizeSpinner.setPreferredSize(new Dimension(DesignerUtils.LARGE_COMBO_WIDTH, 20));
         columnSizePane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{columnSizeLabel, columnSizeSpinner}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_SMALL);
         columnSizePane.setVisible(false);

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

@@ -143,8 +143,8 @@ 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_Nature"),
                 Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Split"),
+                Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Nature"),
         });
         buttonAlignCombo.setPreferredSize(new Dimension(DesignerUtils.NORMAL_COMBO_WIDTH, 20));
         double p = TableLayout.PREFERRED;