Browse Source

Pull request #6332: REPORT-61437 导出-导出事件-自定义命名-提示文字会消失

Merge in DESIGN/design from ~ZACK/design:final/11.0 to final/11.0

* commit '00b387bc29f3f98609881c7a972b8741e15e7795':
  REPORT-61437 导出-导出事件-自定义命名-提示文字会消失
new-design
zack 3 years ago
parent
commit
48aeba74db
  1. 4
      designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java

4
designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java

@ -110,6 +110,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
private UICheckBox extendParametersCheckBox; private UICheckBox extendParametersCheckBox;
private ReportletParameterViewPane parameterViewPane; private ReportletParameterViewPane parameterViewPane;
private UIComboBox exportTypeComboBox; private UIComboBox exportTypeComboBox;
private UILabel fileNameTipLabel;
public CurrentTemplatePane() { public CurrentTemplatePane() {
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
@ -167,7 +168,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
fileNameFormulaEditor = new FormulaEditor(Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); fileNameFormulaEditor = new FormulaEditor(Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
fileNameFormulaEditor.setVisible(false); fileNameFormulaEditor.setVisible(false);
fileNameFormulaEditor.setEnabled(false); fileNameFormulaEditor.setEnabled(false);
UILabel fileNameTipLabel = new UILabel("<html><body style=\"color:rgb(147,147,147)\">" + Toolkit.i18nText("Fine-Design_Basic_Export_JS_Title_Tip_Front") + "\\/:*?\"<>|" + Toolkit.i18nText("Fine-Design_Basic_Export_JS_Title_Tip_Back") + "</html>"); fileNameTipLabel = new UILabel("<html><body style=\"color:rgb(147,147,147)\">" + Toolkit.i18nText("Fine-Design_Basic_Export_JS_Title_Tip_Front") + "\\/:*?\"<>|" + Toolkit.i18nText("Fine-Design_Basic_Export_JS_Title_Tip_Back") + "</html>");
fileNameTipLabel.setVisible(false); fileNameTipLabel.setVisible(false);
fileNameRadioGroup.addActionListener(new ActionListener() { fileNameRadioGroup.addActionListener(new ActionListener() {
@Override @Override
@ -221,6 +222,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
if (!js.isDefaultFileName()) { if (!js.isDefaultFileName()) {
fileNameFormulaEditor.setEnabled(true); fileNameFormulaEditor.setEnabled(true);
fileNameFormulaEditor.setVisible(true); fileNameFormulaEditor.setVisible(true);
fileNameTipLabel.setVisible(true);
fileNameFormulaEditor.setValue(BaseFormula.createFormulaBuilder().build(js.getFileName())); fileNameFormulaEditor.setValue(BaseFormula.createFormulaBuilder().build(js.getFileName()));
} }
if (js.isExtendParameters()) { if (js.isExtendParameters()) {

Loading…
Cancel
Save