Merge pull request #336 in BA/design from ~ZHENG/design:dev to dev

* commit '1f7828f022908ac9fa6ab9c875961c5424db8778':
  表单内图表也可以设置图表背景

designer_chart/src/com/fr/design/mainframe/chart/gui/style/area/ChartAreaPane.java

@@ -45,13 +45,8 @@ public class ChartAreaPane extends ThirdTabPane<Chart> implements AutoSelectedPa
 		if(parent instanceof ChartStylePane) {
 			plotPane.setParentPane((ChartStylePane)parent);
 		}
-        JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+
-        if (jTemplate.isJWorkBook() || jTemplate.getEditingReportIndex() == BaseJForm.ELEMENTCASE_TAB) {
+		paneList.add(new NamePane(areaPane.title4PopupWindow(), areaPane));
-            //表单中的图表组件的图表区挪到控件属性表的样式中了
-            paneList.add(new NamePane(areaPane.title4PopupWindow(), areaPane));
-        }else if(jTemplate.isChartBook()){
-            paneList.add(new NamePane(areaPane.title4PopupWindow(), areaPane));
-        }
 
 		if(plot.isSupportPlotBackground()) {
 			paneList.add(new NamePane(plotPane.title4PopupWindow(), plotPane));