From bca82d153cafc20d29d765e7d4b41ae476416a99 Mon Sep 17 00:00:00 2001 From: obo Date: Tue, 20 Feb 2024 13:56:49 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-114548=20=E3=80=90=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A2=9E=E5=BC=BA-=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E8=BE=B9=E6=A1=86=E7=BA=BF=E5=9E=8B=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E3=80=91=E6=8C=89=E9=92=AE=E6=8E=A7=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E8=BE=B9=E6=A1=86=E7=BA=BF=E5=9E=8B=E9=A2=9C=E8=89=B2=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E4=BF=9D=E5=AD=98=E5=90=8E=EF=BC=8C=E5=86=8D?= =?UTF-8?q?=E6=89=93=E5=BC=80=E9=A2=9C=E8=89=B2=E4=BC=9A=E5=8F=98=E4=B8=BA?= =?UTF-8?q?=E8=B7=9F=E9=9A=8F=E7=9A=84=E4=B8=BB=E9=A2=98=E8=89=B2=E3=80=82?= =?UTF-8?q?=E4=B8=94=E8=BE=B9=E6=A1=86=E7=BA=BF=E5=9E=8B=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/widgettheme/common/NormalButtonSettingPane.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/common/NormalButtonSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/common/NormalButtonSettingPane.java index 2cfc721e5c..7fa1efbe80 100644 --- a/designer-form/src/main/java/com/fr/design/widgettheme/common/NormalButtonSettingPane.java +++ b/designer-form/src/main/java/com/fr/design/widgettheme/common/NormalButtonSettingPane.java @@ -61,8 +61,10 @@ public class NormalButtonSettingPane extends BaseStyleSettingP styleSettingHead.setSelectedIndex(0); } else { styleSettingHead.setSelectedIndex(1); - lineComboBox.setSelectedLineStyle(widgetTheme.getBorderStyle().getLineType()); - borderRadiusSpinner.setValue(widgetTheme.getBorderStyle().getRadius()); + BorderStyle borderStyle = widgetTheme.getBorderStyle(); + lineComboBox.setSelectedLineStyle(borderStyle.getLineType()); + borderRadiusSpinner.setValue(borderStyle.getRadius()); + borderColorSelectBox.setSelectObject(borderStyle.getBorderColor()); assignFontPane(widgetTheme); buttonStyleDefinedPane.populate(ButtonBackground.create(widgetTheme.getButtonBackgroundStyle())); }