Browse Source

Merge pull request #9189 in DESIGN/design from release/10.0 to bugfix/10.0

* commit '4ab85998a43bc5fd22cbcbb8b294aaf5bf6c34ba':
  REPORT-71476 新建保存后,目录没有选中模板,重命名不应该高亮 同步到10.0
  REPORT-72769 导出事件-已删除事件的导出模板设置会在再次新增的时候存在残留
bugfix/10.0
superman 2 years ago
parent
commit
88bc20fb02
  1. 2
      designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java
  2. 1
      designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

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

@ -279,8 +279,8 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
this.browserButton.setEnabled(false);
} else {
this.browserButton.setEnabled(true);
this.reportPathTextField.setText(ob.getTemplatePath());
}
this.reportPathTextField.setText(ob.getTemplatePath());
this.exportTypeComboBox.setSelectedItem(ob.getExportType());
this.fileNameRadioGroup.selectIndexButton(ob.isDefaultFileName() ? 0 : 1);
if (ob.isDefaultFileName()) {

1
designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@ -1555,6 +1555,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
refreshToolArea();
}
DesignerFrameFileDealerPane.getInstance().refresh();
DesignerFrameFileDealerPane.getInstance().stateChange();
}
});

Loading…
Cancel
Save