From 985546787dc69e203aec4580d1bde9ad5aa6c2b8 Mon Sep 17 00:00:00 2001
From: Fangjie Hu <Fangjie Hu>
Date: Mon, 7 Nov 2016 16:31:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E9=9D=A2=E6=9D=BF=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/gui/ChartTypeButtonPane.java         | 18 ++++++++++++++----
 .../mainframe/chart/gui/ChartTypePane.java     | 13 +++++++++----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java
index 46722836af..0f23beb5d8 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java
@@ -19,6 +19,7 @@ import com.fr.design.mainframe.chart.gui.ChartTypePane.ComboBoxPane;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
+import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -51,6 +52,7 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
     private UITextField currentEditingEditor = null;
 
     private ChartTypePane parent = null;
+    private String lastPlotID = StringUtils.EMPTY;
 
     //记录鼠标当前是否在操作添加按钮
     private boolean mouseOnChartTypeButtonPane = false;
@@ -281,16 +283,18 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
         return Inter.getLocText("FR-Chart-Types_Switch");
     }
 
+    /**
+     * 返回是否还需要更新
+     * @param name
+     * @return
+     */
     private void changeCollectionSelected(String name) {
         if (editingCollection != null) {
+            lastPlotID = editingCollection.getSelectedChart().getPlot().getPlotID();
             int count = editingCollection.getChartCount();
             for (int i = 0; i < count; i++) {
                 if (ComparatorUtils.equals(name, editingCollection.getChartName(i))) {
                     editingCollection.setSelectedIndex(i);
-                    //重构面板
-                    if (parent != null){
-                        parent.reLayoutEditPane(editingCollection.getSelectedChart());
-                    }
                     break;
                 }
             }
@@ -509,6 +513,12 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
                 changeCollectionSelected(getButtonName());
                 setSelectedWithFireListener(true);
                 fireSelectedChanged();
+
+                //需要先更新，最后重构面板
+                //重构面板
+                if (parent != null ){
+                    parent.reLayoutEditPane(lastPlotID, editingCollection);
+                }
             }
         }
 
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java
index a286b39c8c..eab0010eae 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java
@@ -262,12 +262,17 @@ public class ChartTypePane extends AbstractChartAttrPane{
 
 	}
 
+
 	/**
-	 * 重构面板
-	 * @param chart
+	 * 面板重构
+	 * @param lastPlotID
+	 * @param collection
 	 */
-	public void reLayoutEditPane(Chart chart){
-		if (editPane != null){
+	public void reLayoutEditPane(String lastPlotID, ChartCollection collection){
+		Chart chart = collection.getSelectedChart();
+		String plotID = chart.getPlot().getPlotID();
+		boolean isUseDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(plotID);
+		if (editPane != null && editPane.isDefaultPane() != isUseDefault || (!isUseDefault && !ComparatorUtils.equals(lastPlotID, plotID))){
 			editPane.reLayout(chart);
 		}
 	}