From 298fab27bf729127d6669aea6d722342f1dd17b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Mon, 24 May 2021 09:32:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?CHART-19344=20=E5=8F=96=E8=89=B2=E5=99=A8?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=82=B9=E5=87=BB=E4=B9=8B=E5=90=8E=E7=A1=AE?= =?UTF-8?q?=E5=AE=9A=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/style/color/ColorButton.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorButton.java b/designer-base/src/main/java/com/fr/design/style/color/ColorButton.java index f5f2288ff9..a052f99f13 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorButton.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorButton.java @@ -126,6 +126,11 @@ public class ColorButton extends AbstractSelectBox { public void setVisible(boolean b) { super.setVisible(b); } + + @Override + protected boolean selectRealTime() { + return false; + } }; colorPane.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent e) { From 21f61d5e9239a05138e5ecd9dd427c8cd54f565d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Mon, 24 May 2021 14:00:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?CHART-19306=20=E5=85=AC=E5=BC=8F=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=AD=89=E4=BA=8E=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/gui/style/series/ColorPickerPaneWithMaxMin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/ColorPickerPaneWithMaxMin.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/ColorPickerPaneWithMaxMin.java index 5a0846a188..c6ac36a0cc 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/ColorPickerPaneWithMaxMin.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/ColorPickerPaneWithMaxMin.java @@ -93,9 +93,9 @@ public class ColorPickerPaneWithMaxMin extends ColorPickerPaneWithFormula { private void setTextState(TinyFormulaPane tinyFormulaPane, int index, int maxIndex, String value) { boolean enable = false; if (index == 0) { - value = "∞"; + value = "=∞"; } else if (index == maxIndex) { - value = "-∞"; + value = "=-∞"; } else { enable = true; } From 1e7065f9690de99b24cb55ac0cc6531570755f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Mon, 24 May 2021 14:21:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?CHART-19306=20=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=B8=90=E5=8F=98=E8=89=B2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/van/chart/gauge/VanChartGaugeBeautyPane.java | 2 ++ 1 file changed, 2 insertions(+) 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 9f4f0ecb73..4f2831b227 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 @@ -1,5 +1,6 @@ package com.fr.van.chart.gauge; +import com.fr.chart.base.ChartConstants; import com.fr.chart.base.GradientStyle; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.TableLayout; @@ -46,6 +47,7 @@ public class VanChartGaugeBeautyPane extends VanChartBeautyPane { }; gradientBarPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); + colorGradient.updateColor(ChartConstants.GRADIENT_START, ChartConstants.GRADIENT_END); return gradientBarPane; } From cd40cde35e57e3f277dc213e211153f22d98ea98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Mon, 24 May 2021 14:43:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=A2=9C=E8=89=B2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/van/chart/gauge/VanChartGaugeBeautyPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4f2831b227..61a1fc5e31 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 @@ -47,7 +47,7 @@ public class VanChartGaugeBeautyPane extends VanChartBeautyPane { }; gradientBarPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); - colorGradient.updateColor(ChartConstants.GRADIENT_START, ChartConstants.GRADIENT_END); + colorGradient.updateColor(ChartConstants.GRADIENT_END, ChartConstants.GRADIENT_START); return gradientBarPane; }