Merge branch 'release/9.0' of http://cloud.finedevelop.com:2015/scm/ba/design into release/9.0

designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java

@@ -75,7 +75,9 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
             EastRegionContainerPane.getInstance().replaceConfiguredRolesPane(RolesAlreadyEditedPane.getInstance());
             return;
         }
+        if (DesignerContext.getDesignerFrame().getSelectedJTemplate() != null) {
             CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
+        }
         CellElementPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
         QuickEditorRegion.getInstance().populate(getCurrentEditor());
         JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();

designer_base/src/com/fr/design/extra/PluginUtils.java

@@ -195,7 +195,7 @@ public class PluginUtils {
         JSONArray resultJSONArray =  JSONArray.create();
         for(int i = 0; i < oriJSONArray.length(); i++){
             JSONObject jo = oriJSONArray.getJSONObject(i);
-            String envVersion = jo.optString("env-version");
+            String envVersion = jo.optString("envversion");
             if(isCompatibleCurrentEnv(envVersion)){
                 resultJSONArray.put(jo);
             }

designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java

@@ -37,7 +37,8 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH
     protected CardLayout cardLayout;
     protected JPanel cardPane;
     protected BasePlot plot;
-    private static final int TOP_TOOLBAR_HEIGHT = 24;
+    private static final int TOP_TOOLBAR_HEIGHT = 20;
+    private static final int TOP_TOOLBAR_WIDTH = 156;  // 可能因为用了tablelayout，要比其他地方多一个像素，看起来才正常
 
     public UIControlPane() {
         this.initComponentPane();
@@ -191,6 +192,7 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH
                 g2.fillRect(0, 0, c.getWidth(), c.getHeight());
             }
         });
+        topToolBar.setBorder(null);
         topToolBar.setLayout(new BorderLayout());
         ShortCut addItem = addItemShortCut().getShortCut();
         addItem.intoJToolBar(topToolBar);
@@ -206,10 +208,10 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH
     protected JPanel getLeftTopPane (UIToolbar topToolBar) {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
-        double[] columnSize = { p, f};
+        double[] columnSize = { p, f, TOP_TOOLBAR_WIDTH};
         double[] rowSize = {TOP_TOOLBAR_HEIGHT};
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(getAddItemText()), topToolBar},
+                new Component[]{new UILabel(getAddItemText()), new JPanel(), topToolBar},
         };
        return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
     }

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

@@ -925,7 +925,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         } else {
             this.addAndActivateJTemplate(jt);
         }
-
+        //REPORT-5084：激活后刷新一下右側面板
+        jt.refreshEastPropertiesPane();
     }
 
     /**

designer_base/src/com/fr/design/module/DesignModule.java

@@ -95,7 +95,7 @@ public abstract class DesignModule extends TopModule {
                 new NameObjectCreator(Inter.getLocText("FR-Designer_Email"), EmailJavaScript.class, EmailPane.class),
                 new NameObjectCreator(Inter.getLocText("Hyperlink-Web_link"), WebHyperlink.class, WebHyperlinkPane.ChartNoRename.class),
                 new NameObjectCreator(Inter.getLocText("JavaScript-Dynamic_Parameters"), ParameterJavaScript.class, ParameterJavaScriptPane.ChartNoRename.class),
-                new NameObjectCreator("FR-Designer_JavaScript", JavaScriptImpl.class, JavaScriptImplPane.ChartNoRename.class)
+                new NameObjectCreator(Inter.getLocText("FR-Designer_JavaScript"), JavaScriptImpl.class, JavaScriptImplPane.ChartNoRename.class)
         };
     }