Browse Source

Merge pull request #1466 in DESIGN/design from ~BRUCE.DENG/design:bugfix/10.0 to bugfix/10.0

* commit '4d8f4b2f5c5fa36f470b6c0e52af3ceaf12c05fe':
  REPORT-26915 疫情大屏模板导出内置模板为空
bugfix/10.0
Bruce.Deng 5 years ago
parent
commit
94e29437a1
  1. 4
      designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java
  2. 5
      designer-base/src/main/java/com/fr/file/RenameExportFILE.java

4
designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java

@ -177,9 +177,9 @@ public abstract class AbstractExportAction<E extends JTemplate<?, ?>> extends JT
} catch (RemoteDesignPermissionDeniedException exp) {
FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
this.setProgress(100);
target.closeTemplate();
FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
JOptionPane.showMessageDialog(
DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Engine_Remote_Design_Permission_Denied"),
@ -188,9 +188,9 @@ public abstract class AbstractExportAction<E extends JTemplate<?, ?>> extends JT
UIManager.getIcon("OptionPane.errorIcon")
);
} catch (Exception exp) {
FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
this.setProgress(100);
target.closeTemplate();
FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
JOptionPane.showMessageDialog(
DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Report_Export_Failed") + "\n" + path,

5
designer-base/src/main/java/com/fr/file/RenameExportFILE.java

@ -99,4 +99,9 @@ public class RenameExportFILE extends AbstractFILE {
}
return out;
}
@Override
public void closeTemplate() throws Exception {
//do nothing
}
}
Loading…
Cancel
Save