From 1ec59c1efa0966a8a40666f7077bca9dff841a60 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Wed, 18 Oct 2017 14:30:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-5084=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=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=89=93=E5=BC=80=E7=9A=84=E6=A8=A1=E6=9D=BF=E4=B8=AD?= =?UTF-8?q?=E6=9C=89=E8=AE=BE=E7=BD=AE=E4=BA=86=E7=82=B9=E5=87=BB=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=8C=89=E9=92=AE=EF=BC=8C=E6=89=93=E5=BC=80?= =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/gui/controlpane/UIListControlPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java index a148fd3b83..fd519b0aa0 100644 --- a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java +++ b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java @@ -98,7 +98,7 @@ public abstract class UIListControlPane extends UIControlPane { // richie:避免多次update和populate大大降低效率 if (!evt.getValueIsAdjusting()) { // shoc 切换的时候加检验 - if (hasInvalid(false)) { + if (hasInvalid(false) || DesignerContext.getDesignerFrame().getSelectedJTemplate() == null) { return; } ((JControlUpdatePane) UIListControlPane.this.controlUpdatePane).update(); From 1e33946812c30a8c7cc73404cc073a195f6c7c95 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Wed, 18 Oct 2017 16:21:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?REPORT-5084=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=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=89=93=E5=BC=80=E7=9A=84=E6=A8=A1=E6=9D=BF=E4=B8=AD?= =?UTF-8?q?=E6=9C=89=E8=AE=BE=E7=BD=AE=E4=BA=86=E7=82=B9=E5=87=BB=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=8C=89=E9=92=AE=EF=BC=8C=E6=89=93=E5=BC=80?= =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/ElementCasePaneDelegate.java | 4 +++- .../src/com/fr/design/gui/controlpane/UIListControlPane.java | 2 +- designer_base/src/com/fr/design/mainframe/DesignerFrame.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java index bbc87fa78c..0f1c38bd2c 100644 --- a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java +++ b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java @@ -75,7 +75,9 @@ public class ElementCasePaneDelegate extends ElementCasePane { EastRegionContainerPane.getInstance().replaceConfiguredRolesPane(RolesAlreadyEditedPane.getInstance()); return; } - CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this); + if (DesignerContext.getDesignerFrame().getSelectedJTemplate() != null) { + CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this); + } CellElementPropertyPane.getInstance().populate(ElementCasePaneDelegate.this); QuickEditorRegion.getInstance().populate(getCurrentEditor()); JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java index fd519b0aa0..a148fd3b83 100644 --- a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java +++ b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java @@ -98,7 +98,7 @@ public abstract class UIListControlPane extends UIControlPane { // richie:避免多次update和populate大大降低效率 if (!evt.getValueIsAdjusting()) { // shoc 切换的时候加检验 - if (hasInvalid(false) || DesignerContext.getDesignerFrame().getSelectedJTemplate() == null) { + if (hasInvalid(false)) { return; } ((JControlUpdatePane) UIListControlPane.this.controlUpdatePane).update(); diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index 279873f0b4..1881bd02c0 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/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(); } /** From ab6453dcb4de9f1eef4fcabc5152a1db499dce25 Mon Sep 17 00:00:00 2001 From: plough Date: Wed, 18 Oct 2017 17:23:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=8C=E4=B8=8B=E6=8B=89=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=95=BF=E5=BA=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/gui/controlpane/UIControlPane.java | 8 +++++--- designer_base/src/com/fr/design/module/DesignModule.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java index d3bfb96628..ec65e6b2d2 100644 --- a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java +++ b/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); } diff --git a/designer_base/src/com/fr/design/module/DesignModule.java b/designer_base/src/com/fr/design/module/DesignModule.java index 2830566c2e..a82fd032e5 100644 --- a/designer_base/src/com/fr/design/module/DesignModule.java +++ b/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) }; } From 8f6f1a1ba622e03bf6ab0e4db3225a3f65afb509 Mon Sep 17 00:00:00 2001 From: vito Date: Thu, 19 Oct 2017 16:56:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?REPORT-3976=20=E5=AE=A2=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=89=88=E6=9C=AC=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/extra/PluginUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/extra/PluginUtils.java b/designer_base/src/com/fr/design/extra/PluginUtils.java index 7ef3eaaad6..f4403c7fc0 100644 --- a/designer_base/src/com/fr/design/extra/PluginUtils.java +++ b/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); }