From d27fbb50d19faba3e5815d40f13fb1f3ab70b7e7 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 12 Sep 2017 16:09:55 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-4421=20=E4=BB=A5=E4=B8=8B=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=9C=AA=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98=3D>?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A9=BA=E6=8C=87=E9=92=88=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/parameter/ParameterPropertyPane.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java b/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java index 629af593f..31d864157 100644 --- a/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java +++ b/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java @@ -90,8 +90,13 @@ public class ParameterPropertyPane extends JPanel{ return; } // 表单中，只有添加并选中参数面板时，才显示 - boolean hideInJForm = DesignerContext.getDesignerFrame().getSelectedJTemplate() instanceof JForm && - !(FormHierarchyTreePane.getInstance().getComponentTree().getSelectionPath().getLastPathComponent() instanceof XWParameterLayout); + boolean hideInJForm; + try { + hideInJForm = DesignerContext.getDesignerFrame().getSelectedJTemplate() instanceof JForm && + !(FormHierarchyTreePane.getInstance().getComponentTree().getSelectionPath().getLastPathComponent() instanceof XWParameterLayout); + } catch (NullPointerException ex) { + hideInJForm = false; + } if (isVisible && toolbarPane.hasSelectedLabelItem() && !hideInJForm) { addParaPane.setVisible(true); this.setPreferredSize(null); From bc8c97f4621b148fdee139887dacdb9e69963fa6 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 12 Sep 2017 16:12:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-4421=20=E4=BB=A5=E4=B8=8B=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=9C=AA=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98=3D>?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A9=BA=E6=8C=87=E9=92=88=E9=94=99=E8=AF=AF?= =?UTF-8?q?=3D>=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/parameter/ParameterPropertyPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java b/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java index 31d864157..9fac85121 100644 --- a/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java +++ b/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java @@ -95,7 +95,7 @@ public class ParameterPropertyPane extends JPanel{ hideInJForm = DesignerContext.getDesignerFrame().getSelectedJTemplate() instanceof JForm && !(FormHierarchyTreePane.getInstance().getComponentTree().getSelectionPath().getLastPathComponent() instanceof XWParameterLayout); } catch (NullPointerException ex) { - hideInJForm = false; + hideInJForm = true; } if (isVisible && toolbarPane.hasSelectedLabelItem() && !hideInJForm) { addParaPane.setVisible(true); From 1b9c30f9612d2bb831cde74184b9b35a53500dbd Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 12 Sep 2017 16:54:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8Ccpt?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=88=87=E6=8D=A2=E5=88=B0=E8=A1=A8=E5=8D=95?= =?UTF-8?q?-=E8=B6=85=E7=BA=A7=E9=93=BE=E6=8E=A5=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/form/FormElementCaseDesigner.java | 4 ++-- .../com/fr/design/mainframe/form/FormECDesignerProvider.java | 4 +++- designer_form/src/com/fr/design/mainframe/JForm.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/form/FormElementCaseDesigner.java b/designer/src/com/fr/design/mainframe/form/FormElementCaseDesigner.java index a93604dcb..103a69511 100644 --- a/designer/src/com/fr/design/mainframe/form/FormElementCaseDesigner.java +++ b/designer/src/com/fr/design/mainframe/form/FormElementCaseDesigner.java @@ -229,8 +229,8 @@ public class FormElementCaseDesigner implements BaseJForm { EastRegionContainerPane.getInstance().replaceCellAttrPane(elementCaseDesign.getEastDownPane()); EastRegionContainerPane.getInstance().replaceCellElementPane(elementCaseDesign.getEastUpPane()); EastRegionContainerPane.getInstance().replaceConditionAttrPane(elementCaseDesign.getConditionAttrPane()); - EastRegionContainerPane.getInstance().replaceHyperlinkPane(elementCaseDesign.getHyperlinkPane()); + EastRegionContainerPane.getInstance().replaceHyperlinkPane(elementCaseDesign.getHyperlinkPane(this)); return; } From 60e88301beb9c6c9c4c65f34cc5297118ca8261c Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 12 Sep 2017 17:02:04 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-4421=20=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parameter/ParameterPropertyPane.java | 58 ++++++++++--------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java b/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java index 9fac85121..43e840823 100644 --- a/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java +++ b/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java @@ -26,16 +26,19 @@ public class ParameterPropertyPane extends JPanel{ private static ParameterPropertyPane THIS; private boolean isEditing = false; private static final int HIDE_HEIGHT = 40; + private static final int PADDING_SMALL = 5; + private static final int PADDING_MIDDLE = 10; + private static final int PADDING_LARGE = 15; public static final ParameterPropertyPane getInstance() { - if(THIS == null) { + if (THIS == null) { THIS = new ParameterPropertyPane(); } return THIS; } public static final ParameterPropertyPane getInstance(FormDesigner editor) { - if(THIS == null) { + if (THIS == null) { THIS = new ParameterPropertyPane(); } THIS.setEditor(editor); @@ -49,38 +52,41 @@ public class ParameterPropertyPane extends JPanel{ } private ParameterPropertyPane() { - toolbarPane = new ParameterToolBarPane(); - BasicScrollPane basicScrollPane = new BasicScrollPane() { - @Override - protected JPanel createContentPane() { - return toolbarPane; - } - - @Override - public void populateBean(Object ob) { - - } + init(); + } - @Override - protected String title4PopupWindow() { - return null; - } - }; + private void init() { + toolbarPane = new ParameterToolBarPane(); + BasicScrollPane basicScrollPane = new BasicScrollPane() { + @Override + protected JPanel createContentPane() { + return toolbarPane; + } + + @Override + public void populateBean(Object ob) { + // do nothing + } + + @Override + protected String title4PopupWindow() { + return null; + } + }; JPanel scrollPaneWrapperInner = new JPanel(new BorderLayout()); - scrollPaneWrapperInner.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 5)); + scrollPaneWrapperInner.setBorder(BorderFactory.createEmptyBorder(0, PADDING_MIDDLE, PADDING_MIDDLE, PADDING_SMALL)); scrollPaneWrapperInner.add(basicScrollPane, BorderLayout.CENTER); addParaPane = new JPanel(new BorderLayout()); addParaPane.add(scrollPaneWrapperInner, BorderLayout.CENTER); addParaPane.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.SPLIT_LINE)); - initParameterListener(); this.setLayout(new BorderLayout(0, 6)); - this.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); + this.setBorder(BorderFactory.createEmptyBorder(PADDING_MIDDLE, 0, PADDING_MIDDLE, 0)); this.add(addParaPane, BorderLayout.CENTER); - } + } - // 显示或隐藏添加参数面板 + // 显示或隐藏添加参数面板 public void refreshState() { setAddParaPaneVisible(toolbarPane.hasSelectedLabelItem()); } @@ -110,7 +116,7 @@ public class ParameterPropertyPane extends JPanel{ private void setEditor(FormDesigner editor) { if (formHierarchyTreePaneWrapper == null) { formHierarchyTreePaneWrapper = new JPanel(new BorderLayout()); - formHierarchyTreePaneWrapper.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 15)); + formHierarchyTreePaneWrapper.setBorder(BorderFactory.createEmptyBorder(0, PADDING_MIDDLE, 0, PADDING_LARGE)); this.add(formHierarchyTreePaneWrapper, BorderLayout.SOUTH); } formHierarchyTreePaneWrapper.remove(FormHierarchyTreePane.getInstance()); @@ -121,7 +127,7 @@ public class ParameterPropertyPane extends JPanel{ toolbarPane.setParaMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { - if(paraPane == null) { + if (paraPane == null) { return; } final UIButton parameterSelectedLabel = (UIButton) e.getSource(); @@ -142,7 +148,7 @@ public class ParameterPropertyPane extends JPanel{ toolbarPane.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - if(paraPane == null) { + if (paraPane == null) { return; } paraPane.addingAllParameter2Editor(); From 4281202edffaac9ebd0ed78a05c1ab502025f678 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 12 Sep 2017 17:13:02 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/FormECDesignerProvider.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/form/FormECDesignerProvider.java b/designer_base/src/com/fr/design/mainframe/form/FormECDesignerProvider.java index 525601fef..b1ef53885 100644 --- a/designer_base/src/com/fr/design/mainframe/form/FormECDesignerProvider.java +++ b/designer_base/src/com/fr/design/mainframe/form/FormECDesignerProvider.java @@ -13,80 +13,80 @@ import com.fr.design.menu.ToolBarDef; import com.fr.form.FormElementCaseProvider; public interface FormECDesignerProvider { - - public static final String XML_TAG = "FormElementCaseDesigner"; + + String XML_TAG = "FormElementCaseDesigner"; /** * 选中目标的 对应Menu * @return 返回MenuDef数组. */ - public MenuDef[] menus4Target(); + MenuDef[] menus4Target(); /** * 获取焦点 */ - public void requestFocus() ; + void requestFocus() ; /** * 工具栏菜单字体字号等 * @return 工具栏菜单数组 */ - public ToolBarDef[] toolbars4Target(); + ToolBarDef[] toolbars4Target(); /** * 表单的报表块的工具按钮复制剪切那行 * @return 工具按钮 */ - public JComponent[] toolBarButton4Form(); + JComponent[] toolBarButton4Form(); /** * 模板菜单 * @return 返回菜单 */ - public ShortCut[] shortcut4TemplateMenu(); + ShortCut[] shortcut4TemplateMenu(); /** *当前正在编辑的elementcase * @return 当前正在编辑的elementcase */ - public FormElementCaseProvider getEditingElementCase(); + FormElementCaseProvider getEditingElementCase(); /** * 右上角属性表 * @return 属性面板 */ - public JComponent getEastDownPane(); + JComponent getEastDownPane(); /** * 右下角控件树或者扩展属性 * @return 属性面板 */ - public JComponent getEastUpPane(); + JComponent getEastUpPane(); /** * 条件属性面板 * @return 属性面板 */ - public JComponent getConditionAttrPane(); + JComponent getConditionAttrPane(); /** * 超级链接面板 * @param jt 当前模板（JForm） * @return 属性面板 */ - public JComponent getHyperlinkPane(JTemplate jt); + JComponent getHyperlinkPane(JTemplate jt); /** * 超级链接面板 * @return 属性面板 */ - public TargetComponent getEditingElementCasePane(); + TargetComponent getEditingElementCasePane(); /** * 获取当前ElementCase的缩略图 * @param elementCaseContainerSize 缩略图的大小 * @return 图 */ - public BufferedImage getElementCaseImage(Dimension elementCaseContainerSize); + BufferedImage getElementCaseImage(Dimension elementCaseContainerSize); } \ No newline at end of file