Merge pull request #1335 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0

* commit 'c9cf4e51fb28b222c68af79fcefad0bffd86ecd3':
  REPORT-4985 文设计器-切换工作目录 中出现中文“默认”
  REPORT-4887 @plough：9.0设计器交互验收问题=>表单=》多余边框线
  REPORT-4887 @plough：9.0设计器交互验收问题=>聚合表=》组件尺寸、对齐间距
  REPORT-4887 @plough：9.0设计器交互验收问题=>选中悬浮元素时，去除单元格菜单中的无用项

designer/src/com/fr/design/actions/cell/CellAttributeTableAction.java

@@ -2,6 +2,7 @@ package com.fr.design.actions.cell;
 
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.mainframe.CellElementPropertyPane;
+import com.fr.design.mainframe.EastRegionContainerPane;
 
 import java.awt.event.ActionEvent;
 
@@ -20,4 +21,9 @@ public abstract class CellAttributeTableAction extends UpdateAction {
 		CellElementPropertyPane.getInstance().GoToPane(getID());
 	}
 
+	@Override
+	public void update() {
+		super.update();
+		this.setEnabled(EastRegionContainerPane.getInstance().isCellAttrPaneEnabled());
+	}
 }

designer/src/com/fr/design/actions/cell/CellWidgetAttrAction.java

@@ -24,4 +24,10 @@ public class CellWidgetAttrAction extends UpdateAction {
         EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_SETTINGS);
         EastRegionContainerPane.getInstance().setWindow2PreferWidth();
     }
+
+    @Override
+    public void update() {
+        super.update();
+        this.setEnabled(EastRegionContainerPane.getInstance().isWidgetSettingsPaneEnabled());
+    }
 }

designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java

@@ -26,4 +26,10 @@ public class ConditionAttributesAction extends UpdateAction {
         EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_CONDITION_ATTR);
         EastRegionContainerPane.getInstance().setWindow2PreferWidth();
     }
+
+    @Override
+    public void update() {
+        super.update();
+        this.setEnabled(EastRegionContainerPane.getInstance().isConditionAttrPaneEnabled());
+    }
 }

designer/src/com/fr/poly/PolyBlockProperTable.java

@@ -42,6 +42,8 @@ public class PolyBlockProperTable extends JPanel {
 		height = new UISpinner(0, MAX_SPINNER_VALUE, 1);
 		UIExpandablePane boundsPane = WidgetBoundsPaneFactory.createAbsoluteBoundsPane(x, y, width, height);
 		this.add(boundsPane, BorderLayout.CENTER);
+
+        this.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 10));
 	}
 
 	private void initListener(Container parentComponent) {

designer_base/src/com/fr/design/DesignerEnvManager.java

@@ -153,6 +153,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
      * DesignerEnvManager.
      */
     public static DesignerEnvManager getEnvManager() {
+        return getEnvManager(true);
+    }
+
+    public static DesignerEnvManager getEnvManager(boolean needCheckEnv) {
         if (designerEnvManager == null) {
             designerEnvManager = new DesignerEnvManager();
             try {
@@ -162,14 +166,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
             }
 
             // james：如果没有env定义，要设置一个默认的
-            if (designerEnvManager.nameEnvMap.size() <= 0) {
-                String installHome = StableUtils.getInstallHome();
-                if (installHome != null) {
-                    String name = Inter.getLocText("FR-Engine_DEFAULT");
-                    String envPath = StableUtils.pathJoin(new String[]{installHome, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME});
-                    designerEnvManager.putEnv(name, LocalEnv.createEnv(envPath));
-                    designerEnvManager.setCurEnvName(name);
-                }
+            if (needCheckEnv) {
+                checkNameEnvMap();
             }
 
             GeneralContext.addEnvChangedListener(new EnvChangedListener() {
@@ -187,6 +185,19 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         return designerEnvManager;
     }
 
+    public static void checkNameEnvMap() {
+        if (designerEnvManager == null || designerEnvManager.nameEnvMap.size() > 0) {
+            return;
+        }
+        String installHome = StableUtils.getInstallHome();
+        if (installHome != null) {
+            String name = Inter.getLocText("FR-Engine_DEFAULT");
+            String envPath = StableUtils.pathJoin(new String[]{installHome, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME});
+            designerEnvManager.putEnv(name, LocalEnv.createEnv(envPath));
+            designerEnvManager.setCurEnvName(name);
+        }
+    }
+
     /**
      * 添加设计器中相关的worker
      *

designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java

@@ -466,6 +466,17 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         }
     }
 
+    public boolean isConditionAttrPaneEnabled() {
+        return propertyItemMap.get(KEY_CONDITION_ATTR).isEnabled();
+    }
+
+    public boolean isWidgetSettingsPaneEnabled() {
+        return propertyItemMap.get(KEY_WIDGET_SETTINGS).isEnabled();
+    }
+
+    public boolean isCellAttrPaneEnabled() {
+        return propertyItemMap.get(KEY_CELL_ATTR).isEnabled();
+    }
 
 
     class PropertyItem {

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

@@ -171,7 +171,8 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
 
     protected void initLanguage() {
         //这两句的位置不能随便调换，因为会影响语言切换的问题
-        FRContext.setLanguage(DesignerEnvManager.getEnvManager().getLanguage());
+        FRContext.setLanguage(DesignerEnvManager.getEnvManager(false).getLanguage());
+        DesignerEnvManager.checkNameEnvMap();
     }
 
     protected void initDefaultFont() {

designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java

@@ -147,6 +147,7 @@ public class FormWidgetDetailPane extends FormDockView{
     private void initReuWidgetPanel() {
         elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList();
         downPane = new UIScrollPane(new ShareWidgetPane(elCaseBindInfoList, false));
+        downPane.setBorder(null);
         reuWidgetPanel.add(downPane);
     }
 
@@ -429,6 +430,7 @@ public class FormWidgetDetailPane extends FormDockView{
     public void refreshDownPanel(boolean isEdit) {
         reuWidgetPanel.remove(downPane);
         downPane = new UIScrollPane(new ShareWidgetPane(elCaseBindInfoList, isEdit));
+        downPane.setBorder(null);
         reuWidgetPanel.add(downPane);
         repaintContainer();