From e7c5c7a8c3b36ef4eaa8f7f8626729df85f6f93e Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Mon, 24 Oct 2016 19:19:06 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-585=20&&=20REPORT-529=20=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E8=8E=B7=E5=8F=96=E8=A1=A8=E5=8D=95=E5=90=8D=E7=9A=84?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0formletName=E9=9C=80=E8=A6=81=E5=9C=A8?=
 =?UTF-8?q?=E5=85=AC=E5=BC=8F=E6=B7=BB=E5=8A=A0=E5=92=8C=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=95=B0=E6=8D=AE=E9=9B=86=EF=BC=8C=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8B=E6=96=B9=E7=9A=84=E6=8F=90=E7=A4=BA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tabledata/tabledatapane/FileTableDataPane.java     | 10 +++++++++-
 .../com/fr/design/formula/VariableResolverAdapter.java |  2 +-
 2 files changed, 10 insertions(+), 2 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 0a05e1893c..c27373d59d 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
@@ -445,6 +445,14 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         return suffixList.toArray(new String[suffixList.size()]);
     }
 
+    private String getFileSuffixToString() {
+        String suffixToString = fileTypeComboBox.getSelectedItem().toString().toLowerCase();
+        if (suffixToString.equalsIgnoreCase("excel")) {
+            suffixToString = "xls";
+        }
+        return suffixToString;
+    }
+
     private ActionListener getFileTypeListener(final JPanel setPanel, final int width, final int height) {
         ActionListener fileTypeListener = new ActionListener() {
             public void actionPerformed(ActionEvent e) {
@@ -458,7 +466,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                 } else {
                     setPanel.add(textSetPanel(width,height), BorderLayout.NORTH);
                 }
-                String tipContent = Inter.getLocText("FR-Designer-Type_Parameter") + "reportlets/excel/FineReport${abc}." + getFileSuffix() + "<br>"
+                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);
             }
diff --git a/designer_base/src/com/fr/design/formula/VariableResolverAdapter.java b/designer_base/src/com/fr/design/formula/VariableResolverAdapter.java
index 2489c6ff4f..eb80600acc 100644
--- a/designer_base/src/com/fr/design/formula/VariableResolverAdapter.java
+++ b/designer_base/src/com/fr/design/formula/VariableResolverAdapter.java
@@ -29,7 +29,7 @@ public abstract class VariableResolverAdapter implements VariableResolver {
 				// 空值参数
 				"NULL", "NOFILTER",
 				// request变量
-				CalculatorProvider.REPORT_NAME, CalculatorProvider.SERVLET_URL, CalculatorProvider.SERVER_SCHEMA, CalculatorProvider.SERVER_NAME,
+				CalculatorProvider.REPORT_NAME, CalculatorProvider.FORMLET_NAME, CalculatorProvider.SERVLET_URL, CalculatorProvider.SERVER_SCHEMA, CalculatorProvider.SERVER_NAME,
 				CalculatorProvider.SERVER_PORT, CalculatorProvider.SERVER_URL, CalculatorProvider.CONTEXT_PATH, CalculatorProvider.SESSION_ID
 		};
 	}