From 505e683231759277a029c28a7577a2ec4f94a7ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Fri, 13 Sep 2024 16:55:26 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-134696=20&=20REPORT-134691=20&=20REPORT-?= =?UTF-8?q?134306=20&=20REPORT-133443=20fix:=20NewUI=E9=80=82=E9=85=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/gui/itextfield/UITextField.java | 2 +- .../correlation/AbstractCorrelationPane.java | 1 + .../fr/van/chart/gauge/VanChartGaugeBeautyPane.java | 5 ++++- .../fr/van/chart/gauge/VanChartGaugeSeriesPane.java | 11 ----------- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/itextfield/UITextField.java b/designer-base/src/main/java/com/fr/design/gui/itextfield/UITextField.java index 61f1b6b62c..07dfde3cde 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itextfield/UITextField.java +++ b/designer-base/src/main/java/com/fr/design/gui/itextfield/UITextField.java @@ -154,7 +154,7 @@ public class UITextField extends JTextField implements UIObserver, GlobalNameObs * 设置变化的背景颜色 */ public void setBackgroundUIColor(Color color) { -// ((UITextFieldUI) this.ui).setBackgroundColor4NoGiveNumber(color); + setBackground(color); } /** diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/correlation/AbstractCorrelationPane.java b/designer-chart/src/main/java/com/fr/design/chartx/component/correlation/AbstractCorrelationPane.java index 2cb52f4542..b29146223b 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/component/correlation/AbstractCorrelationPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/component/correlation/AbstractCorrelationPane.java @@ -81,6 +81,7 @@ public abstract class AbstractCorrelationPane extends BasicBeanPane { @Override public void actionPerformed(ActionEvent e) { tablePane.addLine(createLine()); + tablePane.doParentRepaintEvent(); fireTargetChanged(); } }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeBeautyPane.java b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeBeautyPane.java index 7fa6b47e51..347e700747 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeBeautyPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeBeautyPane.java @@ -10,6 +10,7 @@ import com.fr.plugin.chart.type.GradientType; import com.fr.van.chart.designer.component.VanChartBeautyPane; import javax.swing.JPanel; +import javax.swing.SwingUtilities; import java.awt.BorderLayout; import java.awt.Component; import java.awt.event.ActionEvent; @@ -57,7 +58,9 @@ public class VanChartGaugeBeautyPane extends VanChartBeautyPane { } private void checkGradientBarVisible() { - gradientBarPane.setVisible(getGradientTypeBox().getSelectedIndex() == 1); + SwingUtilities.invokeLater(() -> { + gradientBarPane.setVisible(getGradientTypeBox().getSelectedIndex() == 1); + }); } protected String[] getNameArray() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java index 2b3976647a..79b4d5b9c3 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java @@ -119,17 +119,6 @@ public class VanChartGaugeSeriesPane extends VanChartMultiColorSeriesPane { JPanel stylePane = valueFillStylePane == null ? new JPanel() : valueFillStylePane; colorPickerPane = new ColorPickerPaneWithMaxMin(parentPane, "meterString", valueFillStylePane) { - protected int getBoundX() { - return 0; - } - - protected int getBoundY() { - return 10; - } - - protected int getPreferredMarginY() { - return 10; - } protected double getDescriptionWidth() { double descriptionWidth = super.getDescriptionWidth();