Browse Source

Pull request #3649: REPORT-48354 【10.0.14二轮冒烟】本地打开模板,切换到远程环境,预览模板保存成功后未跳到预览页面

Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0

* commit '3aa890d45098decb54898c0ec19f17379ab62ab3':
  REPORT-48354 【10.0.14二轮冒烟】本地打开模板,切换到远程环境,预览模板保存成功后未跳到预览页面
final/10.0
Kara 4 years ago
parent
commit
c2828377ed
  1. 16
      designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java

16
designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java

@ -73,6 +73,22 @@ public final class WebPreviewUtils {
FILE currentTemplate = jt.getEditingFILE();
// carl:是否是保存在运行环境下的模板,不是就不能被预览
if (currentTemplate instanceof FileNodeFILE) {
// 判断下模板是否存在 不存在先提示
if (!currentTemplate.exists()) {
int selVal = showConfirmDialog(
DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Basic_Web_Preview_Message"),
Toolkit.i18nText("Fine-Design_Basic_Preview_Tool_Tips"),
OK_CANCEL_OPTION,
WARNING_MESSAGE
);
if (OK_OPTION == selVal) {
if (!jt.saveAsTemplate()) {
return;
}
}
currentTemplate = jt.getEditingFILE();
}
browseUrl(currentTemplate, baseRoute, map, actionType, jt);
} else {
// 说明模板没有保存在报表运行环境下面,提示用户

Loading…
Cancel
Save