Pull request #6280: REPORT-61105 & REPORT-61096 & REPORT-61012 控件联动及兼容老模板调整

Merge in DESIGN/design from ~PENGDA/design:release/11.0 to release/11.0

* commit 'a9733eca8682a3d9a37f5bf65cf76ecfb4869a6d':
  REPORT-61105 & REPORT-61096 & REPORT-61012 控件联动及兼容老模板调整

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

@@ -403,6 +403,8 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
 
             private static final long serialVersionUID = -6564079764032351372L;
 
+            private UIComboBox exportTypeComboBox;
+            
             public ExportTypeCombobox() {
                 exportTypeComboBox = getComboBoxWithModel(new String[]{ExportJavaScript.EXPORT_PDF, ExportJavaScript.EXPORT_EXCEL_PAGE, ExportJavaScript.EXPORT_EXCEL_SIMPLE, ExportJavaScript.EXPORT_EXCEL_SHEET, ExportJavaScript.EXPORT_WORD, ExportJavaScript.EXPORT_IMAGE}
                         , EXPORT_TYPES_MAP);
@@ -453,6 +455,24 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
 
             public FileNameCombobox() {
                 fileNameComboBox = getComboBoxWithModel(new String[]{DEFAULT, CUSTOM}, FILENAME_TYPE_MAP);
+                fileNameComboBox.addItemListener(e -> {
+                    if (e.getStateChange() == ItemEvent.SELECTED) {
+                        final int row = table.getSelectedRow();
+                        if (row == -1) {
+                            return;
+                        }
+                        SingleJavaScript js = getList().get(row);
+                        Object ob = fileNameComboBox.getSelectedItem();
+                        if (ob != null) {
+                            String value = ob.toString();
+                            js.setDefaultFileName(StringUtils.equals(value, DEFAULT));
+                            if (js.isDefaultFileName()) {
+                                js.setFileName(StringUtils.EMPTY);
+                            }
+                        }
+                        table.repaint();
+                    }
+                });
                 this.addCellEditorListener(new CellEditorListener() {
 
                     @Override
@@ -462,15 +482,6 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
 
                     @Override
                     public void editingStopped(ChangeEvent e) {
-                        if (table.getSelectedRow() == -1) {
-                            return;
-                        }
-                        SingleJavaScript js = getList().get(table.getSelectedRow());
-                        Object ob = fileNameComboBox.getSelectedItem();
-                        if (ob != null) {
-                            String value = ob.toString();
-                            js.setDefaultFileName(StringUtils.equals(value, DEFAULT));
-                        }
                         fireTableDataChanged();
                     }
                 });
@@ -518,7 +529,11 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
 
             @Override
             public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
-                fileNameFormulaEditor.setValue(BaseFormula.createFormulaBuilder().build());
+                if (value != null) {
+                    fileNameFormulaEditor.setValue(BaseFormula.createFormulaBuilder().build(value));
+                } else {
+                    fileNameFormulaEditor.setValue(BaseFormula.createFormulaBuilder().build());
+                }
                 return fileNameFormulaEditor;
             }