From 671e60eda6e125bde6d60e007b77b7a0f2c0d2f5 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Wed, 1 Nov 2017 15:04:12 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-5304=20=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=B7=BB=E5=8A=A0=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=95=B0=E6=8D=AE=E9=9B=86=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=90=8E=EF=BC=8C=E9=A2=84=E8=A7=88=E6=97=A0?= =?UTF-8?q?=E5=93=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/tabledata/tabledatapane/FileTableDataPane.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java index db98a6928b..baeb4798ca 100644 --- a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java +++ b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java @@ -90,7 +90,6 @@ public class FileTableDataPane extends AbstractTableDataPane { private Parameter[] params; private JPanel filePath; private XMLNodeTreePane nodeTreePane; - private JPanel textSetPanel; private UICheckBox needColumnNameCheckBox;// 第一行是否作为标题 private UIRadioButton tableDismemberRadioButton;// 制表符 @@ -151,8 +150,8 @@ public class FileTableDataPane extends AbstractTableDataPane { southPanel.add(setPanel, BorderLayout.CENTER); setPanel.setPreferredSize(new Dimension(setPanelWidth, 460)); setPanel.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("FR-Designer_Set"))); - textSetPanel = textSetPanel(width,height); - setPanel.add(textSetPanel, BorderLayout.NORTH); + JPanel controlPane = textSetPanel(width,height); + setPanel.add(controlPane, BorderLayout.NORTH); fileTypeComboBox.addActionListener(getFileTypeListener(setPanel,width,height)); this.add(northPanel, BorderLayout.NORTH); @@ -465,11 +464,12 @@ public class FileTableDataPane extends AbstractTableDataPane { } else if (fileTypeComboBox.getSelectedIndex() == EXCEL) { setPanel.add(excelSetPanel(width,height), BorderLayout.NORTH); } else { - setPanel.add(textSetPanel, BorderLayout.NORTH); + setPanel.add(textSetPanel(width,height), BorderLayout.NORTH); } String tipContent = Inter.getLocText("FR-Designer-Type_Parameter") + "reportlets/excel/FineReport${abc}." + getFileSuffixToString() + "
" + "http://192.168.100.120:8080/XXServer/Report/excel${abc}.jsp
" + "  "; tips.setText(tipContent); + setPanel.revalidate(); } };