Browse Source

Merge pull request #421 in BA/design from ~KERRY/design:dev to dev

* commit 'e7c5c7a8c3b36ef4eaa8f7f8626729df85f6f93e':
  REPORT-585 && REPORT-529 表单获取表单名的参数formletName需要在公式添加和创建文件数据集,切换文件类型时,下方的提示显示问题
master
superman 8 years ago
parent
commit
b62672359a
  1. 10
      designer_base/src/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
  2. 2
      designer_base/src/com/fr/design/formula/VariableResolverAdapter.java

10
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()]); 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) { private ActionListener getFileTypeListener(final JPanel setPanel, final int width, final int height) {
ActionListener fileTypeListener = new ActionListener() { ActionListener fileTypeListener = new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
@ -458,7 +466,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
} else { } else {
setPanel.add(textSetPanel(width,height), BorderLayout.NORTH); 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> "; + "http://192.168.100.120:8080/XXServer/Report/excel${abc}.jsp<br>" + "&nbsp</body> </html> ";
tips.setText(tipContent); tips.setText(tipContent);
} }

2
designer_base/src/com/fr/design/formula/VariableResolverAdapter.java

@ -29,7 +29,7 @@ public abstract class VariableResolverAdapter implements VariableResolver {
// 空值参数 // 空值参数
"NULL", "NOFILTER", "NULL", "NOFILTER",
// request变量 // 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 CalculatorProvider.SERVER_PORT, CalculatorProvider.SERVER_URL, CalculatorProvider.CONTEXT_PATH, CalculatorProvider.SESSION_ID
}; };
} }

Loading…
Cancel
Save