diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/btn/ExtraButtonPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/btn/AbstractExtraButtonPane.java similarity index 97% rename from designer-form/src/main/java/com/fr/design/widget/ui/btn/ExtraButtonPane.java rename to designer-form/src/main/java/com/fr/design/widget/ui/btn/AbstractExtraButtonPane.java index d9d9e35b86..67b8e4d26c 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/btn/ExtraButtonPane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/btn/AbstractExtraButtonPane.java @@ -28,7 +28,7 @@ import java.util.Set; * @since 11.0 * Created on 2023/4/19 */ -public abstract class ExtraButtonPane extends ButtonWithHotkeysDetailPane { +public abstract class AbstractExtraButtonPane extends ButtonWithHotkeysDetailPane { protected JPanel extraPane; protected boolean containsExtraPane; protected static double F = TableLayout.FILL; diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/btn/FormSubmitButtonDetailPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/btn/FormSubmitButtonDetailPane.java index 374a58ca5f..77a735df54 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/btn/FormSubmitButtonDetailPane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/btn/FormSubmitButtonDetailPane.java @@ -11,7 +11,7 @@ import java.awt.*; * @since 11.0 * Created on 2023/4/19 */ -public class FormSubmitButtonDetailPane extends ExtraButtonPane { +public class FormSubmitButtonDetailPane extends AbstractExtraButtonPane { @Override protected Component createCenterPane() { diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/AppendRowButtonDefinePane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/AppendRowButtonDefinePane.java index 64faed484d..981295a1ee 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/AppendRowButtonDefinePane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/AppendRowButtonDefinePane.java @@ -3,10 +3,10 @@ package com.fr.design.widget.ui.btn; import com.fr.base.IconManager; -import com.fr.design.layout.TableLayoutHelper; + import com.fr.report.web.button.write.AppendRowButton; -import com.fr.design.widget.btn.ButtonWithHotkeysDetailPane; + import java.awt.*; @@ -18,7 +18,7 @@ import java.awt.*; * @since 11.0 * Created on 2023/4/19 */ -public class AppendRowButtonDefinePane extends ExtraButtonPane { +public class AppendRowButtonDefinePane extends AbstractExtraButtonPane { private DefineAppendColumnRowPane defineColumnRowPane; // @Override diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefaultButtonDetailPane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefaultButtonDetailPane.java index 2c92e92d9d..84239e9048 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefaultButtonDetailPane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefaultButtonDetailPane.java @@ -15,7 +15,7 @@ import java.awt.*; * @since 11.0 * Created on 2023/4/19 */ -public class DefaultButtonDetailPane extends ExtraButtonPane