From 73b5b4c02747bee28673dece3fc9fcb640e6bfdd Mon Sep 17 00:00:00 2001
From: juhaoyu <2335173323@qq.com>
Date: Thu, 21 Sep 2017 11:48:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89Designer=E7=9A=84=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E7=94=A8installHome=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E4=BA=86=EF=BC=8C=E5=90=A6=E5=88=99=E6=8A=A5=E8=A1=A8=E7=BB=84?=
 =?UTF-8?q?=E5=90=8C=E5=AD=A6=E4=BB=A3=E7=A0=81=E5=90=AF=E5=8A=A8=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E5=88=A4=E6=96=AD=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/start/BaseDesigner.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java
index 43a3377ccc..a3d278f8ab 100644
--- a/designer_base/src/com/fr/start/BaseDesigner.java
+++ b/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());

From 9c877ee17d5202a056cc81c8b83fbb053ba56563 Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Thu, 21 Sep 2017 16:25:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-4755=20[9.0=E4=BA=8C=E8=BD=AE?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=85=AC?=
 =?UTF-8?q?=E5=BC=8F=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=85=AC?=
 =?UTF-8?q?=E5=BC=8F=E8=AF=B4=E6=98=8E=E8=83=8C=E6=99=AF=E8=89=B2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/design/formula/FormulaPane.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_base/src/com/fr/design/formula/FormulaPane.java b/designer_base/src/com/fr/design/formula/FormulaPane.java
index 9ef2e4b2be..156a2e2f2e 100644
--- a/designer_base/src/com/fr/design/formula/FormulaPane.java
+++ b/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);