Browse Source

Merge pull request #300 in DESIGN/design from ~HZZZ/design61:release/10.0 to release/10.0

* commit '1ba7d32fbb19152e16f95d6d7348d0b3c4861e92':
  REPORT-9221 10.0插件兼容-版本管理
research/10.0
Hzzz 6 years ago
parent
commit
28d2a50eb9
  1. 3
      designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java

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

@ -9,7 +9,6 @@ import com.fr.design.utils.DesignUtils;
import com.fr.file.FILE;
import com.fr.file.FileNodeFILE;
import com.fr.general.GeneralUtils;
import com.fr.general.web.ParameterConstants;
import com.fr.stable.project.ProjectConstants;
import com.fr.stable.web.AbstractWebletCreator;
@ -82,6 +81,7 @@ public final class WebPreviewUtils {
String path = currentTemplate.getPath();
if (path.startsWith(ProjectConstants.REPORTLETS_NAME)) {
path = path.substring(ProjectConstants.REPORTLETS_NAME.length() + 1);
}
java.util.List<String> parameterNameList = new java.util.ArrayList<String>();
java.util.List<String> parameterValueList = new java.util.ArrayList<String>();
@ -102,7 +102,6 @@ public final class WebPreviewUtils {
}
}
DesignUtils.visitEnvServerByParameters(baseRoute, parameterNameList.toArray(new String[parameterNameList.size()]), parameterValueList.toArray(new String[parameterValueList.size()]));
}
} else {
int selVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Web_Preview_Message"),
com.fr.design.i18n.Toolkit.i18nText("Preview_ToolTips"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);

Loading…
Cancel
Save