Browse Source

Pull request #1: REPORT-111299 控件扩展样式-复选框组扩展样式bugfix

Merge in ~JACKY.LI/design from feature/x to bugfix/11.0

* commit 'ac7feaf916d3de9d69ae883450bf67a934d2ea92':
  REPORT-114161 控件扩展样式—图文按钮新增的图标格没有默认选中
  REPORT-114070 控件扩展样式—布局方式固定列数,应该只支持正整数
  REPORT-114115 控件扩展样式—新建模板,联排按钮、图文按钮排布方式默认要选"等分布局"
release/11.0
jacky.li-李星 10 months ago
parent
commit
48b5706ce5
  1. 2
      designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/CapsuleCustomDefinePane.java
  2. 2
      designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/IconConfigPane.java
  3. 6
      designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/ImageCustomDefinePane.java
  4. 2
      designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/UnitedCustomDefinePane.java

2
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() { 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 = new UISpinner(0, Integer.MAX_VALUE, 1, DesignerUtils.INITIAL_COLUMN_SIZE);
columnSizeSpinner.setPreferredSize(new Dimension(DesignerUtils.LARGE_COMBO_WIDTH, 20)); 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 = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{columnSizeLabel, columnSizeSpinner}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_SMALL);

2
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() { public void addCount() {
deleteCountButton.setEnabled(true); deleteCountButton.setEnabled(true);
IconButton iconButton = new IconButton(""); IconButton iconButton = new IconButton("");
selectIconButton = iconButton;
editIconButton.setEnabled(true);
iconButtons.add(iconButton); iconButtons.add(iconButton);
int indexToInsert = northPane.getComponentCount() - 2; int indexToInsert = northPane.getComponentCount() - 2;
deleteCountButton.setEnabled(!iconButtons.isEmpty()); deleteCountButton.setEnabled(!iconButtons.isEmpty());

6
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() { private void initButtonAlignPane() {
UILabel buttonAlignLabel = DesignerUtils.createConfigLabel(Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment")); UILabel buttonAlignLabel = DesignerUtils.createConfigLabel(Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment"));
buttonAlignCombo = new UIComboBox(new String[]{ 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_Split"),
Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Nature"),
}); });
buttonAlignCombo.setPreferredSize(new Dimension(DesignerUtils.LARGE_COMBO_WIDTH, 20)); 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); 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() { 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 = new UISpinner(1, Integer.MAX_VALUE, 1, DesignerUtils.INITIAL_COLUMN_SIZE);
columnSizeSpinner.setPreferredSize(new Dimension(DesignerUtils.LARGE_COMBO_WIDTH, 20)); 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 = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{columnSizeLabel, columnSizeSpinner}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_SMALL);
columnSizePane.setVisible(false); columnSizePane.setVisible(false);

2
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); JPanel hPaddingSpinnerPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{leftSpinnerPanel, rightSpinnerPanel}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, LayoutConstants.VGAP_SMALL);
// 按钮排布下拉框 // 按钮排布下拉框
buttonAlignCombo = new UIComboBox(new String[]{ 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_Split"),
Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Nature"),
}); });
buttonAlignCombo.setPreferredSize(new Dimension(DesignerUtils.NORMAL_COMBO_WIDTH, 20)); buttonAlignCombo.setPreferredSize(new Dimension(DesignerUtils.NORMAL_COMBO_WIDTH, 20));
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;

Loading…
Cancel
Save