From 92981d755a2a97c24c9514576e9dedcaef86f378 Mon Sep 17 00:00:00 2001 From: obo Date: Tue, 21 Nov 2023 14:24:46 +0800 Subject: [PATCH 01/28] =?UTF-8?q?REPORT-107652=20=E3=80=90=E6=9C=80?= =?UTF-8?q?=E5=BC=BA=E6=8E=A7=E4=BB=B6=E3=80=91=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE=E6=8E=A7=E4=BB=B6=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E8=87=AA=E5=AE=9A=E4=B9=89=E5=90=8E=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=98=BE=E7=A4=BA=E5=A2=9E=E5=BC=BA=EF=BC=8C?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/widget/ui/btn/FreeButtonDetailPane.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java index c2f0ed4f3..71b5d2ad5 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java @@ -3,6 +3,7 @@ package com.fr.design.widget.ui.btn; import java.awt.Component; import com.fr.form.ui.FreeButton; +import com.fr.widgettheme.util.WidgetThemeDesignerUtils; /** * 自定义按钮 @@ -16,7 +17,7 @@ public class FreeButtonDetailPane extends AbstractExtraButtonPane { @Override protected Component createCenterPane() { - buttonSytleDefinedPane = new ButtonSytleDefinedPane(); + buttonSytleDefinedPane = WidgetThemeDesignerUtils.enableWidgetEnhance() ? null : new ButtonSytleDefinedPane(); return createExtraPane(buttonSytleDefinedPane); } @@ -27,13 +28,17 @@ public class FreeButtonDetailPane extends AbstractExtraButtonPane { public void populate(FreeButton button) { super.populate(button); - buttonSytleDefinedPane.populate(button); + if (buttonSytleDefinedPane != null) { + buttonSytleDefinedPane.populate(button); + } } @Override public FreeButton update() { FreeButton button = super.update(); - buttonSytleDefinedPane.update(button); + if (buttonSytleDefinedPane != null) { + buttonSytleDefinedPane.update(button); + } return button; } From 2f316e52131e1f4889a14390c456c6210449562a Mon Sep 17 00:00:00 2001 From: obo Date: Tue, 21 Nov 2023 19:59:18 +0800 Subject: [PATCH 02/28] =?UTF-8?q?=E6=8A=8A=E6=98=BE=E7=A4=BA=E5=A2=9E?= =?UTF-8?q?=E5=BC=BA=E5=88=A4=E6=96=AD=E6=8A=BD=E5=88=B0=E6=8A=BD=E8=B1=A1?= =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E4=BC=A0boolean=E7=BB=99=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/widget/btn/ButtonWithHotkeysDetailPane.java | 5 +++-- .../fr/design/widget/ui/btn/AppendRowButtonDefinePane.java | 2 +- .../com/fr/design/widget/ui/btn/DefaultButtonDetailPane.java | 2 +- .../fr/design/widget/ui/btn/DeleteRowButtonDefinePane.java | 2 +- .../com/fr/design/widget/ui/btn/FreeButtonDetailPane.java | 4 ++-- .../design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java index d146c7309..f542afde3 100644 --- a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java +++ b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java @@ -16,6 +16,7 @@ import com.fr.design.mainframe.widget.accessibles.AccessibleIconEditor; import com.fr.form.ui.Button; import com.fr.stable.StableUtils; +import com.fr.widgettheme.util.WidgetThemeDesignerUtils; /** * Created by IntelliJ IDEA. @@ -43,7 +44,7 @@ public abstract class ButtonWithHotkeysDetailPane extends Butt JPanel labelPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); iconPane = new AccessibleIconEditor(); labelPane.add(iconPane); - Component comp = createCenterPane(); + Component comp = createCenterPane(WidgetThemeDesignerUtils.enableWidgetEnhance()); Component[][] n_components = { {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Button_Type")), createCustomButtonTypeComboBox()}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")), buttonNameTextField = new UITextField()}, @@ -62,7 +63,7 @@ public abstract class ButtonWithHotkeysDetailPane extends Butt } - protected abstract Component createCenterPane(); + protected abstract Component createCenterPane(boolean needWidgetDisplayEnhance); /** * 判断是按钮控件下拉框的种类：1.有自定义按钮 2.无自定义按钮 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 981295a1e..8625e13e1 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 @@ -29,7 +29,7 @@ public class AppendRowButtonDefinePane extends Abstra // } @Override - protected Component createCenterPane() { + protected Component createCenterPane(boolean needWidgetDisplayEnhance) { defineColumnRowPane = new DefineAppendColumnRowPane(); return createExtraPane(defineColumnRowPane); } 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 84239e904..c89537516 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 @@ -18,7 +18,7 @@ import java.awt.*; public class DefaultButtonDetailPane extends AbstractExtraButtonPane