From 527c131c620bb6ee39ed6c4e34346705aa598e0d Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Fri, 9 Oct 2020 17:51:29 +0800
Subject: [PATCH] =?UTF-8?q?CHART-15968=20=E8=A7=A3=E5=86=B3=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E7=95=8C=E9=9D=A2=E5=B1=9E=E6=80=A7=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/van/chart/designer/style/label/VanChartLabelPane.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartLabelPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartLabelPane.java
index dfcd1a644..96e2a7d24 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartLabelPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartLabelPane.java
@@ -64,11 +64,14 @@ public class VanChartLabelPane extends AbstractVanChartScrollPane<Chart> {
             return;
         }
         ConditionAttr attrList = chart.getPlot().getConditionCollection().getDefaultAttr();
+
+        // labelPane中颜色选择器会触发listener.doChange()，导致style界面update两次，
+        // 为了避免递归updateBean时，remove与add不匹配，调整一下labelPane.update()的位置
+        AttrLabel attrLabel = labelPane.update();
         DataSeriesCondition attr = ((VanChartPlot)chart.getPlot()).getAttrLabelFromConditionCollection();
         if(attr != null) {
             attrList.remove(attr);
         }
-        AttrLabel attrLabel = labelPane.update();
         if (attrLabel != null) {
             attrList.addDataSeriesCondition(attrLabel);
         }