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 控件样式开放自定义-去掉单元格的“字体大小”属性--减少冗余代码

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

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