From 1b01ba03c61c4c48e096c84f6d0b5399da9bacba Mon Sep 17 00:00:00 2001
From: "Mata.Li" <Mata.Li@fanruan.com>
Date: Fri, 22 Jun 2018 14:09:01 +0800
Subject: [PATCH] REPORT-8860 and REPORT-8989

---
 .../com/fr/design/hyperlink/WebHyperNorthPane.java    |  7 +++----
 .../src/com/fr/start/module/DesignerStartup.java      | 11 +++++++++++
 .../fr/start/module/DesignerWorkspaceProvider.java    |  3 ++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/designer-base/src/com/fr/design/hyperlink/WebHyperNorthPane.java b/designer-base/src/com/fr/design/hyperlink/WebHyperNorthPane.java
index a7a0a8077..925be16ef 100644
--- a/designer-base/src/com/fr/design/hyperlink/WebHyperNorthPane.java
+++ b/designer-base/src/com/fr/design/hyperlink/WebHyperNorthPane.java
@@ -3,6 +3,7 @@ package com.fr.design.hyperlink;
 import com.fr.config.ServerPreferenceConfig;
 import com.fr.design.constants.LayoutConstants;
 
+import com.fr.design.gui.itextarea.UITextArea;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
@@ -23,7 +24,7 @@ import java.awt.BorderLayout;
 public class WebHyperNorthPane extends AbstractHyperNorthPane<WebHyperlink> {
     private UITextField itemNameTextField;
     private boolean needRenamePane = false;
-    private UITextField urlTextField;
+    private UITextArea urlTextField;
 
     public WebHyperNorthPane(boolean needRenamePane) {
         this.needRenamePane = needRenamePane;
@@ -47,11 +48,9 @@ public class WebHyperNorthPane extends AbstractHyperNorthPane<WebHyperlink> {
     protected JPanel setHeaderPanel() {
         JPanel headerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
 
-        urlTextField = new UITextField(43);
+        urlTextField = new UITextArea(1,headerPane.getWidth());
         urlTextField.setText(ProductConstants.WEBSITE_URL);
 
-
-        //UILabel label = new UILabel(Inter.getLocText(new String[]{"Example","Or"}, new String[]{":http://www.baidu.com","/main.jsp"}));
         JPanel urlWithHelp = GUICoreUtils.createNamedPane(urlTextField, "URL:");
 
         if (this.needRenamePane) {
diff --git a/designer-realize/src/com/fr/start/module/DesignerStartup.java b/designer-realize/src/com/fr/start/module/DesignerStartup.java
index c78905c7e..b5619df02 100644
--- a/designer-realize/src/com/fr/start/module/DesignerStartup.java
+++ b/designer-realize/src/com/fr/start/module/DesignerStartup.java
@@ -1,11 +1,14 @@
 package com.fr.start.module;
 
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.event.Event;
 import com.fr.event.Listener;
+import com.fr.general.ComparatorUtils;
 import com.fr.module.Activator;
 import com.fr.start.Designer;
 import com.fr.start.EnvSwitcher;
+import com.fr.start.ServerStarter;
 import com.fr.start.SplashContext;
 import com.fr.startup.activators.BasicActivator;
 import com.fr.workspace.Workspace;
@@ -43,6 +46,14 @@ public class DesignerStartup extends Activator {
         DesignerContext.getDesignerFrame().setVisible(true);
         //启动画面结束
         SplashContext.getInstance().hide();
+
+        //启动画面结束后，启动tip小窗口并打开决策页面
+        for (String arg : args) {
+                if (ComparatorUtils.equals(arg, "demo")) {
+                    ServerStarter.browserDemoURL();
+                    break;
+                }
+        }
         DesignerContext.getDesignerFrame().getProgressDialog().setVisible(true);
         startSub(StartFinishActivator.class);
     }
diff --git a/designer-realize/src/com/fr/start/module/DesignerWorkspaceProvider.java b/designer-realize/src/com/fr/start/module/DesignerWorkspaceProvider.java
index d95e00aed..d9107109a 100644
--- a/designer-realize/src/com/fr/start/module/DesignerWorkspaceProvider.java
+++ b/designer-realize/src/com/fr/start/module/DesignerWorkspaceProvider.java
@@ -20,11 +20,12 @@ public class DesignerWorkspaceProvider extends Activator {
             for (String arg : args) {
                 if (ComparatorUtils.equals(arg, "demo")) {
                     DesignerEnvManager.getEnvManager().setCurrentEnv2Default();
-                    ServerStarter.browserDemoURL();
+                   // ServerStarter.browserDemoURL();
                     break;
                 }
             }
         }
+
         getRoot().setSingleton(EnvSwitcher.class, new EnvSwitcher());
         //设置好环境即可，具体跟环境有关的模块会自动调用
         getRoot().getSingleton(EnvSwitcher.class).switch2LastEnv();