Browse Source

Merge pull request #100 in BA/design from ~SHINE/design:dev to dev

* commit 'a5929659051b1b0a56824d5f79c368a7802c36c6':
  地图数据配置界面
master
superman 9 years ago
parent
commit
8d210ee628
  1. 6
      designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java
  2. 6
      designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java

6
designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java

@ -224,6 +224,10 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
return CalculateComboBox.CALCULATE_ARRAY[0]; return CalculateComboBox.CALCULATE_ARRAY[0];
} }
protected MoreNameCDDefinition createMoreNameCDDefinition() {
return new MoreNameCDDefinition();
}
/** /**
* 保存界面属性到ChartCollection * 保存界面属性到ChartCollection
*/ */
@ -233,7 +237,7 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
if (normalDefinition instanceof MoreNameCDDefinition) { if (normalDefinition instanceof MoreNameCDDefinition) {
moreDefinition = (MoreNameCDDefinition) normalDefinition; moreDefinition = (MoreNameCDDefinition) normalDefinition;
} else { } else {
moreDefinition = new MoreNameCDDefinition(); moreDefinition = createMoreNameCDDefinition();
} }
List<Object[]> data = seriesDataPane.updateBean(); List<Object[]> data = seriesDataPane.updateBean();

6
designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java

@ -278,7 +278,7 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
* 保存界面内容 字段值 * 保存界面内容 字段值
*/ */
public void updateBean(ChartCollection collection) { public void updateBean(ChartCollection collection) {
OneValueCDDefinition oneDefinition = new OneValueCDDefinition(); OneValueCDDefinition oneDefinition = createOneValueCDDefinition();
String seriesName = (String) this.seriesName.getSelectedItem(); String seriesName = (String) this.seriesName.getSelectedItem();
oneDefinition.setSeriesColumnName(seriesName); oneDefinition.setSeriesColumnName(seriesName);
@ -292,6 +292,10 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
collection.getSelectedChart().setFilterDefinition(oneDefinition); collection.getSelectedChart().setFilterDefinition(oneDefinition);
} }
protected OneValueCDDefinition createOneValueCDDefinition(){
return new OneValueCDDefinition();
}
/** /**
* 保存界面属性 新的ChartCollection * 保存界面属性 新的ChartCollection
*/ */

Loading…
Cancel
Save