Browse Source

Merge pull request #1420 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0

* commit 'b69b0bcad8c7a8bf2039fce97b4ec8f84264a5aa':
  REPORT-24174【新引擎】批量转换及检测
feature/big-screen
kerry 5 years ago
parent
commit
3b9b679b93
  1. 2
      designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java
  2. 2
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
  3. 9
      designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

2
designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java

@ -258,7 +258,7 @@ public class MutilTempalteTabPane extends JComponent {
private String tempalteShowName(JTemplate<?, ?> template) {
String name = template.getEditingFILE().getName();
String name = template.getTemplateName();
if (!template.isSaved() && !name.endsWith(" *")) {
name += " *";
}

2
designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@ -830,7 +830,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
}
defaultTitleSB.append(username).append("@").append(envName).append("[").append(workspace.getDescription()).append("]");
if (editingTemplate != null) {
String path = editingTemplate.getEditingFILE().getPath();
String path = editingTemplate.getPath();
if (!editingTemplate.getEditingFILE().exists()) {
path = FILEFactory.MEM_PREFIX + path;
} else if (path.startsWith(ProjectConstants.REPORTLETS_NAME)) {

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

@ -243,12 +243,12 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
public void judgeSheetAuthority(String roles) {
}
/**
* 刷新内部资源
*/
public void refreshResource() {
try {
this.template = JTemplateFactory.asIOFile(this.editingFILE);
setTarget(this.template);
@ -1232,4 +1232,9 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
}
public abstract String route();
public String getTemplateName(){
return getEditingFILE().getName();
}
}

Loading…
Cancel
Save