Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zheng/design into dev

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);
             }

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
 		};
 	}