diff --git a/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java b/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java index dbb3280b25..d899853ed0 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java @@ -5,10 +5,10 @@ import com.fr.base.BaseUtils; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.ChartCollection; import com.fr.design.ChartTypeInterfaceManager; +import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.tabledata.Prepare4DataSourceChange; -import com.fr.design.dialog.BasicPane; import com.fr.design.gui.chart.ChartEditPaneProvider; import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.gui.ibutton.UIHeadGroup; @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.List; -public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4DataSourceChange, ChartEditPaneProvider { +public class ChartEditPane extends BasicBeanPane implements AttributeChange,Prepare4DataSourceChange, ChartEditPaneProvider { private final static int CHANGE_MIN_TIME = 80; @@ -51,6 +51,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 protected JPanel center; protected TargetComponentContainer container = null; protected TitleChangeListener titleChangeListener = null; + protected ChartEditPane chartEditPane =this; private Calendar lastTime; @@ -108,6 +109,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 } AbstractChartAttrPane selectedPane = paneList.get(tabsHeaderIconPane.getSelectedIndex()); selectedPane.update(collection); + if (!ComparatorUtils.equals(collection, lastCollection)) { //此处画图 @@ -346,4 +348,14 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 } }); } + + @Override + public void populateBean(Object ob) { + + } + + @Override + public Object updateBean() { + return null; + } } \ No newline at end of file diff --git a/designer_chart/src/com/fr/design/mainframe/chart/CustomChartEditPane.java b/designer_chart/src/com/fr/design/mainframe/chart/CustomChartEditPane.java index e07ecde3c6..a5125d0bf1 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/CustomChartEditPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/CustomChartEditPane.java @@ -15,7 +15,7 @@ import java.awt.*; /** * Created by mengao on 2017/5/3. */ -public class CustomChartEditPane extends ChartEditPane { +public class CustomChartEditPane extends ChartEditPane { //构建主面板 protected void createTabsPane() { Icon[] iconArray = new Icon[paneList.size()]; @@ -26,16 +26,16 @@ public class CustomChartEditPane extends ChartEditPane { tabsHeaderIconPane = new UIHeadGroup(iconArray) { @Override public void tabChanged(int index) { +// chartEditPane.populateBean(collection.getSelectedChart()); } }; - tabsHeaderIconPane.setNeedLeftRightOutLine(false); } AttributeChangeListener listener = new AttributeChangeListener() { @Override public void attributeChange() { - + chartEditPane.updateBean(); } }; @@ -93,7 +93,7 @@ public class CustomChartEditPane extends ChartEditPane { public void populate(ChartCollection collection) { - + chartEditPane.populateBean(collection.getSelectedChart()); } protected ChartEditPane getCurrentChartEditPane() { @@ -146,7 +146,7 @@ public class CustomChartEditPane extends ChartEditPane { } protected void dealWithStyleChange(){ - + chartEditPane.populateBean(collection.getSelectedChart()); } /** @@ -161,7 +161,7 @@ public class CustomChartEditPane extends ChartEditPane { * 图表设计器,显示选中的面板 */ public void populateSelectedTabPane() { - + chartEditPane.populateBean(collection.getSelectedChart()); } /**