Browse Source

Pull request #12035: REPORT-94359 新建fvs模板-轮播目录齿轮图数据配置未保存

Merge in DESIGN/design from ~JOHN.YING/design:release/11.0 to release/11.0

* commit '56d0d4f9969d5e4a5328e64cca445b03f188248e':
  REPORT-94359 conflict
  REPORT-94359 新建fvs模板-轮播目录齿轮图数据配置未保存
  REPORT-94359 新建fvs模板-轮播目录齿轮图数据配置未保存
  REPORT-93422 控件样式开放自定义-去掉单元格的“字体大小”属性--减少冗余代码
newui
John.Ying-应志浩 2 years ago
parent
commit
5b422f4d6a
  1. 13
      designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java

13
designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java

@ -97,26 +97,17 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
* @param ePane 面板 * @param ePane 面板
*/ */
public void populateChartPropertyPane(ChartCollection collection, TargetComponent<?> ePane) { public void populateChartPropertyPane(ChartCollection collection, TargetComponent<?> ePane) {
new SwingWorker<Void, Void>() {
@Override
protected Void doInBackground() throws Exception {
GEOJSONHelper.getInstance();
return null;
}
@Override
protected void done() {
String chartID = collection.getSelectedChartProvider(ChartProvider.class).getID(); String chartID = collection.getSelectedChartProvider(ChartProvider.class).getID();
updateChartEditPane(collection.getSelectedChartProvider(ChartProvider.class).getID()); updateChartEditPane(collection.getSelectedChartProvider(ChartProvider.class).getID());
setSupportCellData(true); setSupportCellData(true);
container.setEPane(ePane); this.container.setEPane(ePane);
if (ChartTypeManager.getInstance().chartExit(chartID)) { if (ChartTypeManager.getInstance().chartExit(chartID)) {
chartEditPane.populate(collection); chartEditPane.populate(collection);
} else { } else {
GUICoreUtils.setEnabled(chartEditPane, false); GUICoreUtils.setEnabled(chartEditPane, false);
} }
} }
}.execute();
}
/** /**
* 感觉ChartCollection加载图表属性界面. * 感觉ChartCollection加载图表属性界面.

Loading…
Cancel
Save