From 9ba2194628fdbae7bedbfa31e621779e9e1aa632 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Tue, 26 Sep 2017 10:59:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-4769=20=E9=80=89=E4=B8=AD=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=8D=95=E5=85=83=E6=A0=BC=EF=BC=8C=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=B7=A6=E5=AF=B9=E9=BD=90=EF=BC=8C=E5=88=87=E6=8D=A2=E5=8F=A6?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=8D=95=E5=85=83=E6=A0=BC=E5=AF=B9=E9=BD=90?=
 =?UTF-8?q?=E9=AB=98=E4=BA=AE=E6=B2=A1=E6=9C=89=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer/src/com/fr/design/actions/ButtonGroupAction.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer/src/com/fr/design/actions/ButtonGroupAction.java b/designer/src/com/fr/design/actions/ButtonGroupAction.java
index ad461c1f0d..e3f20f70bf 100644
--- a/designer/src/com/fr/design/actions/ButtonGroupAction.java
+++ b/designer/src/com/fr/design/actions/ButtonGroupAction.java
@@ -36,7 +36,7 @@ public abstract class ButtonGroupAction extends ElementCaseAction{
 				break;
 			}
 		}
-        if(value == -1 && createToolBarComponent().hasClick()) {
+        if(createToolBarComponent().hasClick()) {
             index = getSelectedIndex();
             createToolBarComponent().setClickState(false);
         }

From b9b17af01f608d8db3b9755e097f591c6ada30c8 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Tue, 26 Sep 2017 11:31:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81=EF=BC=88?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=87=8D=E5=A4=8D=EF=BC=8C=E4=B8=94=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=81=9A=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/DesignerEnvManager.java        | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/designer_base/src/com/fr/design/DesignerEnvManager.java b/designer_base/src/com/fr/design/DesignerEnvManager.java
index 1640f3de81..568deb96d8 100644
--- a/designer_base/src/com/fr/design/DesignerEnvManager.java
+++ b/designer_base/src/com/fr/design/DesignerEnvManager.java
@@ -1479,18 +1479,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
                 }
             }
         });
-
-        // xml读完之后,看一下nameEnvMap是不是长度为0
-        if (nameEnvMap.isEmpty() && StableUtils.getInstallHome() != null) {
-            String install_home = StableUtils.getInstallHome();
-            if (install_home != null && new java.io.File(install_home).exists()) {
-                nameEnvMap.put("Default", LocalEnv.createEnv(StableUtils.pathJoin(new String[]{
-                        install_home, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME
-                })));
-
-                curEnvName = "Default";
-            }
-        }
     }
 
     private void readRecentOpenFileList(XMLableReader reader) {