Merge pull request #1401 in BA/design from ~MOMEAK/design9.0:release/9.0 to release/9.0

* commit '671e60eda6e125bde6d60e007b77b7a0f2c0d2f5':
  REPORT-5304 服务器数据集添加多个文件数据集进行切换后，预览无响应

designer_base/src/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java

@@ -90,7 +90,6 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
     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<FileTableData> {
         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<FileTableData> {
                 } 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() + "<br>"
                         + "http://192.168.100.120:8080/XXServer/Report/excel${abc}.jsp<br>" + "&nbsp</body> </html> ";
                 tips.setText(tipContent);
+                setPanel.revalidate();
             }
         };