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

designer_base/src/com/fr/design/formula/FormulaPane.java

@@ -703,7 +703,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             UIScrollPane desScrollPane = new UIScrollPane(descriptionTextArea);
             desScrollPane.setBorder(null);
             this.add(this.createNamePane(Inter.getLocText("FR-Designer_FormulaPane_Formula_Description") + ":", desScrollPane), BorderLayout.EAST);
-            descriptionTextArea.setBackground(new Color(255, 255, 225));
+            descriptionTextArea.setBackground(Color.white);
             descriptionTextArea.setLineWrap(true);
             descriptionTextArea.setWrapStyleWord(true);
             descriptionTextArea.setEditable(false);

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

@@ -29,6 +29,7 @@ import com.fr.general.Inter;
 import com.fr.general.ModuleContext;
 import com.fr.general.SiteCenter;
 import com.fr.plugin.PluginCollector;
+import com.fr.plugin.conversion.PluginConversionModule;
 import com.fr.plugin.manage.PluginManager;
 import com.fr.plugin.manage.PluginStartup;
 import com.fr.stable.ArrayUtils;
@@ -66,7 +67,8 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
         RestartHelper.deleteRecordFilesWhenStart();
         //初始化插件引擎
         PluginStartup.start();
-        
+        //标记一下是设计器启动
+        PluginConversionModule.getInstance().markDesignerStart();
         SiteCenter.getInstance();
 
         DesignUtils.setPort(getStartPort());