Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)

* commit 'ba069aaf14bdadd27bd4899d64dba0caf3b0d841':
  无JIRA任务 打包
  CHART-2699 类型选择弹出框的图表 用图片
  CHART-2699 类型选择弹出框的图表 用图片

designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@@ -553,7 +553,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
             return;
         }
         try {
-            String envName = getDefaultEnvName();
+            final String envName = getDefaultEnvName();
             WorkContext.switchTo(DesignerWorkspaceGenerator.generate(getDefaultConfig()),new WorkContextCallback() {
 
                 @Override

designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java

@@ -136,15 +136,6 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
             allCharts[i] = rowChart;
         }
 
-        //异步加载图片
-//        new Thread(new Runnable() {
-//
-//            @Override
-//            public void run() {
-//                initAllChartsDemoImage(allCharts);
-//            }
-//        }).start();
-
         return child;
     }