From ceb7e421ff5b7c3e9750dce6370b80b473c08523 Mon Sep 17 00:00:00 2001 From: "Richard.Fang" Date: Mon, 23 Sep 2024 10:24:27 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-134818=20fix:fbp=E5=9B=9E=E5=BD=92?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E6=8E=A7=E4=BB=B6=E5=B1=9E=E6=80=A7=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E5=8B=BE=E9=80=89=E6=A1=86=E8=A7=A6=E5=8F=91=E7=83=AD?= =?UTF-8?q?=E5=8C=BA=E8=BF=87=E5=A4=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/widget/ui/BasicSetVisiblePropertyPane.java | 7 +++++-- .../java/com/fr/design/parameter/RootDesignDefinePane.java | 6 +++--- .../fr/design/widget/ui/designer/ButtonGroupDictPane.java | 2 +- .../design/widget/ui/designer/CheckBoxGroupDefinePane.java | 3 ++- .../design/widget/ui/designer/ComboCheckBoxDefinePane.java | 4 +++- .../widget/ui/designer/CustomWritableRepeatEditorPane.java | 5 ++++- .../widget/ui/designer/DirectWriteEditorDefinePane.java | 4 ++-- .../design/widget/ui/designer/FieldEditorDefinePane.java | 2 +- .../com/fr/design/widget/ui/designer/LabelDefinePane.java | 4 ++-- .../com/fr/design/widget/ui/WritableRepeatEditorPane.java | 4 +++- 10 files changed, 26 insertions(+), 15 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java index 05dd7923e7..4613437e3a 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java @@ -3,6 +3,9 @@ package com.fr.design.mainframe.widget.ui; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.form.ui.Widget; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; + /** * Created by kerry on 2017/9/30. @@ -17,12 +20,12 @@ public class BasicSetVisiblePropertyPane extends FormBasicPropertyPane { protected void initComponent() { UICheckBox otherOtherConfig = createOtherConfig(); if(otherOtherConfig != null){ - corePane.add(otherOtherConfig); + corePane.add(row(cell(otherOtherConfig)).getComponent()); } visibleCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Visible"), true); visibleCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic")); - corePane.add(visibleCheckBox); + corePane.add(row(cell(visibleCheckBox)).getComponent()); } public UICheckBox createOtherConfig(){ diff --git a/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java b/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java index 679284edd3..b6fbaea532 100644 --- a/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java @@ -275,9 +275,9 @@ public class RootDesignDefinePane extends AbstractDataModify { cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Background"))).weight(LEFT_WEIGHT), cell(backgroundPane).weight(RIGHT_WEIGHT) ), - cell(displayReport), - cell(useParamsTemplate), - cell(fireAfterEditor) + row(cell(displayReport)), + row(cell(useParamsTemplate)), + row(cell(fireAfterEditor)) ).getComponent(); } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java index 86238df132..c29aff770c 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java @@ -42,7 +42,7 @@ public class ButtonGroupDictPane extends JPanel { cell(columnLabel).weight(LEFT_WEIGHT), cell(columnSpinner).weight(RIGHT_WEIGHT) ).getComponent(); this.add(column(VERTICAL_GAP, - cell(adaptiveCheckbox), + row(cell(adaptiveCheckbox)), cell(columnSettingRow) ).getComponent()); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java index 97df720aa0..5a90856fd6 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java @@ -13,6 +13,7 @@ import javax.swing.JPanel; import static com.fine.swing.ui.layout.Layouts.cell; import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; import static com.fr.design.constants.LayoutConstants.VERTICAL_GAP; public class CheckBoxGroupDefinePane extends ButtonGroupDefinePane { @@ -41,7 +42,7 @@ public class CheckBoxGroupDefinePane extends ButtonGroupDefinePane returnTypePane = new ReturnTypePane(); return column(VERTICAL_GAP, - cell(supportTagCheckBox),cell(returnTypePane) + row(cell(supportTagCheckBox)), + cell(returnTypePane) ).getComponent(); } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/CustomWritableRepeatEditorPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/CustomWritableRepeatEditorPane.java index c57d05da12..df0afbcfb2 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/CustomWritableRepeatEditorPane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/CustomWritableRepeatEditorPane.java @@ -7,6 +7,9 @@ import com.fr.form.ui.CustomWriteAbleRepeatEditor; import javax.swing.JPanel; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.cell; + /** * Author : Shockway * Date: 13-9-18 @@ -24,7 +27,7 @@ public abstract class CustomWritableRepeatEditorPane e cell(dicPane[0]).weight(LEFT_WEIGHT), cell(dicPane[1]).weight(RIGHT_WEIGHT) ), - cell(repeatCheckBox) + row(cell(repeatCheckBox)) ).getComponent(); if (waterMarkComponent[0] != null && waterMarkComponent[1] != null) { panel.add(row( @@ -115,7 +115,7 @@ public abstract class DirectWriteEditorDefinePane e public JPanel setValidatePane(){ directWriteCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Edit"), false); JPanel otherContentPane = column(LayoutConstants.VERTICAL_GAP).getComponent(); - otherContentPane.add(directWriteCheckBox); + otherContentPane.add(row(cell(directWriteCheckBox)).getComponent()); return otherContentPane; } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java index e847f7dac3..77a7ab450d 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java @@ -154,7 +154,7 @@ public abstract class FieldEditorDefinePane extends Abstr }); validatePane.add(column(VERTICAL_GAP, - cell(allowBlankCheckBox), + row(cell(allowBlankCheckBox)), cell(errorTipPane) ).getComponent()); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java index 031b21466e..0ba933b964 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java @@ -82,8 +82,8 @@ public class LabelDefinePane extends AbstractDataModify