Browse Source

Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~hzzz/design61 into release/10.0

research/10.0
hzzz 6 years ago
parent
commit
048c05bc36
  1. 2
      designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
  2. 9
      designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java

2
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

9
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;
}

Loading…
Cancel
Save