From f79919b81f469a38220ed4e06d9aa0af2676a320 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Fri, 20 Oct 2017 15:51:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-4888=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E4=BF=AE=E6=94=B9=20=E8=81=9A=E5=90=88?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=8D=95=E5=85=83=E6=8A=A5=E8=A1=A8=E7=BC=A9?= =?UTF-8?q?=E6=94=BE=E9=97=AE=E9=A2=98=EF=BC=9B=E6=95=B0=E6=8D=AE=E5=AD=97?= =?UTF-8?q?=E5=85=B8-=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E5=AF=B9=E9=BD=90=EF=BC=9B=E6=95=B0=E6=8D=AE=E5=AD=97?= =?UTF-8?q?=E5=85=B8-=E5=85=AC=E5=BC=8F=20=E5=AD=97=E4=BD=93=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E7=81=B0=E5=8C=96=EF=BC=9B=E6=82=AC=E6=B5=AE=E5=85=83?= =?UTF-8?q?=E7=B4=A0item=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/mainframe/ReportFloatPane.java | 4 +++- designer/src/com/fr/poly/PolyDesignUI.java | 8 ++++---- designer/src/com/fr/poly/PolyDesigner.java | 2 +- .../src/com/fr/design/present/dict/FormulaDictPane.java | 2 +- .../src/com/fr/design/present/dict/TableDataDictPane.java | 3 ++- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/ReportFloatPane.java b/designer/src/com/fr/design/mainframe/ReportFloatPane.java index e759600426..c7cb6871f2 100644 --- a/designer/src/com/fr/design/mainframe/ReportFloatPane.java +++ b/designer/src/com/fr/design/mainframe/ReportFloatPane.java @@ -80,7 +80,9 @@ public class ReportFloatPane extends JPanel { insertFloatMenu.setIconPath("com/fr/design/images/control/addPopup.png"); JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); ElementCasePaneDelegate elementCasePaneDelegate = (ElementCasePaneDelegate) editingTemplate.getCurrentElementCasePane(); - refreshInsertFloatMenu(elementCasePaneDelegate); + if (elementCasePaneDelegate != null) { + refreshInsertFloatMenu(elementCasePaneDelegate); + } } private UIButton createButtonUI() { diff --git a/designer/src/com/fr/poly/PolyDesignUI.java b/designer/src/com/fr/poly/PolyDesignUI.java index b915e1ad8e..855f68a1ec 100644 --- a/designer/src/com/fr/poly/PolyDesignUI.java +++ b/designer/src/com/fr/poly/PolyDesignUI.java @@ -209,10 +209,10 @@ public class PolyDesignUI extends ComponentUI { private void paintAddingData(Graphics g, AddingData addingData) { BlockCreator comp = addingData.getCreator(); - int x = (int) (addingData.getCurrentX()*time); - int y = (int) (addingData.getCurrentY()*time); - int width = (int) (comp.getWidth()*time); - int height = (int) (comp.getHeight()*time); + int x = (int) (addingData.getCurrentX() / time); + int y = (int) (addingData.getCurrentY() / time); + int width = comp.getWidth(); + int height = comp.getHeight(); paintCreator(g, comp, x, y, width, height); } diff --git a/designer/src/com/fr/poly/PolyDesigner.java b/designer/src/com/fr/poly/PolyDesigner.java index c8cc3362fc..7c2f800c76 100644 --- a/designer/src/com/fr/poly/PolyDesigner.java +++ b/designer/src/com/fr/poly/PolyDesigner.java @@ -280,7 +280,7 @@ public class PolyDesigner extends ReportComponent { int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}}; UILabel tag = new UILabel(Inter.getLocText("FR-Designer-Formula_Dictionary_Display_Examples_Html")); - tag.setForeground(new Color(51, 51, 52)); + tag.setForeground(new Color(143, 143, 146)); tag.setPreferredSize(new Dimension(225, 80)); JPanel t = new JPanel(new BorderLayout()); t.add(tag, BorderLayout.CENTER); diff --git a/designer_base/src/com/fr/design/present/dict/TableDataDictPane.java b/designer_base/src/com/fr/design/present/dict/TableDataDictPane.java index 566591a1e4..fd7c14da1c 100644 --- a/designer_base/src/com/fr/design/present/dict/TableDataDictPane.java +++ b/designer_base/src/com/fr/design/present/dict/TableDataDictPane.java @@ -51,6 +51,7 @@ import java.util.List; public class TableDataDictPane extends FurtherBasicBeanPane implements Previewable, UIObserver { private static final int BEGIN = 1; private static final int END = 10; + private static final int VGAP = 24; private static final long serialVersionUID = -5469742115988153206L; private static final int SELECTED_NO_TABLEDATA = -2; public TableDataComboBox tableDataNameComboBox; @@ -111,7 +112,7 @@ public class TableDataDictPane extends FurtherBasicBeanPane new Component[]{new UILabel(Inter.getLocText("FR-Designer_Display_Value") + " ", UILabel.LEFT), valueDictPane}, }; - JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM); + JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, VGAP, LayoutConstants.VGAP_MEDIUM); this.setLayout(new BorderLayout()); this.add(panel, BorderLayout.CENTER); } From 48be05117fbe3159999ae91d9523f0bef448d345 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Fri, 20 Oct 2017 15:55:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-4888=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/poly/PolyDesigner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer/src/com/fr/poly/PolyDesigner.java b/designer/src/com/fr/poly/PolyDesigner.java index 7c2f800c76..c8cc3362fc 100644 --- a/designer/src/com/fr/poly/PolyDesigner.java +++ b/designer/src/com/fr/poly/PolyDesigner.java @@ -280,7 +280,7 @@ public class PolyDesigner extends ReportComponent