diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java
index 1168009e8..67a04c19f 100644
--- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java
+++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java
@@ -12,10 +12,10 @@ import com.fr.design.chart.gui.ChartWidgetOption;
 import com.fr.design.chartinterface.*;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.extra.ChartTypeInterfaceCloseableHandler;
-import com.fr.design.gui.chart.ChartEditPaneProvider;
 import com.fr.design.gui.core.WidgetOption;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
+import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@@ -415,7 +415,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
     }
 
     //获取指定图表的编辑面板
-    public ChartEditPaneProvider getChartConfigPane(String plotID) {
+    public ChartEditPane getChartConfigPane(String plotID) {
         Iterator iterator = chartTypeInterfaces.entrySet().iterator();
         while (iterator.hasNext()) {
             Map.Entry entry = (Map.Entry) iterator.next();
@@ -427,7 +427,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
         return getChartConfigPane(ChartTypeManager.CHART_PRIORITY, plotID);
     }
 
-    private ChartEditPaneProvider getChartConfigPane(String priority, String plotID) {
+    private ChartEditPane getChartConfigPane(String priority, String plotID) {
         return chartTypeInterfaces.get(priority).get(plotID).getChartConfigPane(plotID);
     }
 
diff --git a/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java b/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java
index 46677df62..fa581301e 100644
--- a/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java
+++ b/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java
@@ -3,9 +3,9 @@ package com.fr.design.chart.fun;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.ConditionAttributesPane;
-import com.fr.design.gui.chart.ChartEditPaneProvider;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
+import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@@ -90,6 +90,6 @@ public interface IndependentChartUIProvider extends Level {
      */
     String getPlotTypeTitle4PopupWindow();
 
-    ChartEditPaneProvider getChartConfigPane(String plotID);
+    ChartEditPane getChartConfigPane(String plotID);
 
 }
\ No newline at end of file
diff --git a/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI4Custom.java b/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI4Custom.java
index d8d72c83e..ce65ddb86 100644
--- a/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI4Custom.java
+++ b/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI4Custom.java
@@ -3,7 +3,6 @@ package com.fr.design.chart.fun.impl;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.chart.fun.IndependentChartUIProvider;
-import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
@@ -28,7 +27,7 @@ public abstract class AbstractIndependentChartUI4Custom implements IndependentCh
 
     @Override
     public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
-        return new ChartDataPane(listener);
+        return null;
     }
 
     @Override
@@ -42,7 +41,7 @@ public abstract class AbstractIndependentChartUI4Custom implements IndependentCh
     }
 
     public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){
-        return getPlotSeriesPane();
+        return null;
     }
 
     public BasicBeanPane<Plot> getPlotSeriesPane(){
@@ -54,12 +53,12 @@ public abstract class AbstractIndependentChartUI4Custom implements IndependentCh
     }
 
     public ConditionAttributesPane getPlotConditionPane(Plot plot){
-        return new DataSeriesConditionPane();
+        return null;
     }
 
     @Override
     public AbstractChartAttrPane[] getAttrPaneArray(AttributeChangeListener listener){
-        return new AbstractChartAttrPane[]{};
+        return null;
     }
 
     @Override
diff --git a/designer_chart/src/com/fr/design/mainframe/MiddleChartPropertyPane.java b/designer_chart/src/com/fr/design/mainframe/MiddleChartPropertyPane.java
index 7e37d8beb..68eb0da0c 100644
--- a/designer_chart/src/com/fr/design/mainframe/MiddleChartPropertyPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/MiddleChartPropertyPane.java
@@ -39,7 +39,7 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 	}
 
 	public void addChartEditPane(String plotID){
-		chartEditPane = (ChartEditPane) ChartTypeInterfaceManager.getInstance().getChartConfigPane(plotID);
+		chartEditPane = ChartTypeInterfaceManager.getInstance().getChartConfigPane(plotID);
 		chartEditPane.setSupportCellData(true);
 		this.createMainPane();
 		setSureProperty();
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/ThirdChartEditPane.java b/designer_chart/src/com/fr/design/mainframe/chart/ThirdChartEditPane.java
index 2325da151..680b7e86a 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/ThirdChartEditPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/ThirdChartEditPane.java
@@ -1,150 +1,27 @@
 package com.fr.design.mainframe.chart;
 
-import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
-import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.gui.chart.ChartEditPaneProvider;
-import com.fr.design.gui.frpane.AttributeChangeListener;
-import com.fr.design.gui.ibutton.UIHeadGroup;
-import com.fr.design.mainframe.TargetComponentContainer;
-import com.fr.design.mainframe.chart.gui.ChartDataPane;
-
-import javax.swing.*;
-import java.awt.*;
 
 /**
  * Created by mengao on 2017/5/3.
  */
 public abstract class ThirdChartEditPane extends ChartEditPane implements ChartEditPaneProvider {
-    //构建主面板
-    protected void createTabsPane() {
-        Icon[] iconArray = new Icon[paneList.size()];
-        card = new CardLayout();
-        center = new JPanel(card);
-
-        tabsHeaderIconPane = new UIHeadGroup(iconArray) {
-            @Override
-            public void tabChanged(int index) {
-            }
-        };
-
-    }
-
-    AttributeChangeListener listener = new AttributeChangeListener() {
-        @Override
-        public void attributeChange() {
-            updateBean(collection.getSelectedChart());
-        }
-    };
-
-    /**
-    * 重新构造面板
-     * @param currentChart 图表
-     */
-    public void reLayout(Chart currentChart){
-    }
-
-    protected ChartDataPane createChartDataPane(String plotID) {
-        ChartDataPane chartDataPane = ChartTypeInterfaceManager.getInstance().getChartDataPane(plotID, listener);
-        chartDataPane.setSupportCellData(dataPane4SupportCell.isSupportCellData());
-        return chartDataPane;
-    }
-
-    protected void addTypePane() {
-        paneList.add(typePane);
-    }
-
-    protected void setSelectedTab() {
-    }
 
-    /**
-     * 设置是否支持单元格
-     */
-    public void setSupportCellData(boolean supportCellData) {
-
-    }
+    protected void createTabsPane() {}
 
-    /**
-     * 返回选中的tab名称.
-     */
     public String getSelectedTabName() {
-        int index = Math.min(tabsHeaderIconPane.getSelectedIndex(), paneList.size() - 1);
-        return paneList.get(index).title4PopupWindow();
+        return paneList.get(1).title4PopupWindow();
     }
 
-    /**
-     * 设置容器.
-     */
-    public void setContainer(TargetComponentContainer container) {
-
-    }
-
-
-
     public void populate(ChartCollection collection) {
         populateBean(collection.getSelectedChart());
     }
 
-    protected ChartEditPane getCurrentChartEditPane() {
-        return this;
-    }
-
-
-    /**
-     * 响应事件.
-     */
-    public void fire() {
-
-    }
-
-    public int getSelectedChartIndex(Chart chart){
-        int index = 0;
-        return index;
-    }
-
-    //populate的时候看看要不要重构面板
-    private boolean checkNeedsReLayout(Chart chart){
-        return false;
-    }
-
-    /**
-     * 当前界面是否是默认的界面
-     * @return 是否是默认的界面
-     */
-    public boolean isDefaultPane(){
-        return this.isDefaultPane;
-    }
-
-    /**
-     * 展开到对应id的pane.
-     *
-     * @param id 界面的标志.id
-     */
-    public void gotoPane(String... id) {
-
-    }
-
-    /**
-     * 设置选中的id
-     *
-     * @param id 界面的标志.id
-     */
-    public void setSelectedIndex(String... id) {
-
-    }
-
     protected void dealWithStyleChange(){
         populateBean(collection.getSelectedChart());
     }
 
-    /**
-     *主要用于图表设计器，判断样式改变是否来自工具栏的全局样式按钮
-     * @param isFromToolBar 是否来自工具栏
-     */
-    public void styleChange(boolean isFromToolBar){
-
-    }
-
     /**
      * 图表设计器，显示选中的面板
      */
@@ -156,7 +33,6 @@ public abstract class ThirdChartEditPane extends ChartEditPane implements ChartE
      * 数据集改变的事件监听
      */
     public void registerDSChangeListener() {
-
     }
 
     @Override