Merge remote-tracking branch 'origin/release/9.0' into release/9.0

designer_base/src/com/fr/start/BaseDesigner.java

@@ -48,6 +48,8 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
     private Timer timer;
 
     public BaseDesigner(String[] args) {
+        BuildContext.setBuildFilePath(buildPropertiesPath());
+
         if (isDebug()) {
             setDebugEnv();
         }
@@ -59,7 +61,6 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
             DesignUtils.clientSend(args);
             return;
         }
-        BuildContext.setBuildFilePath(buildPropertiesPath());
 
         //下面这两句的位置不能随便调换，因为会影响语言切换的问题
         initLanguage();

designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java

@@ -54,8 +54,8 @@ public class FormWidgetDefinePaneFactoryBase {
         defineMap.put(FormSubmitButton.class, new Appearance(FreeButtonDefinePane.class, WidgetConstants.BUTTON + ""));
         defineMap.put(WFitLayout.class, new Appearance(FRFitLayoutDefinePane.class, "wFitLayout"));
         defineMap.put(WCardMainBorderLayout.class, new Appearance(WCardMainLayoutDefinePane.class, "wCardMainBorderLayout"));
-        if (StableFactory.getMarkedClass(BridgeMark.Chart_Editor, AbstractBorderStyleWidget.class) != null) {
-            defineMap.put(StableFactory.getMarkedClass(BridgeMark.Chart_Editor, AbstractBorderStyleWidget.class), new Appearance(BorderStyleWidgetDefinePane.class, "chartEditor"));
+        if (StableFactory.getMarkedClass(BridgeMark.CHART_EDITOR, AbstractBorderStyleWidget.class) != null) {
+            defineMap.put(StableFactory.getMarkedClass(BridgeMark.CHART_EDITOR, AbstractBorderStyleWidget.class), new Appearance(BorderStyleWidgetDefinePane.class, "chartEditor"));
         }
 
         defineMap.put(WAbsoluteLayout.class, new Appearance(FRAbsoluteLayoutDefinePane.class, "wAbsoluteLayout"));