Browse Source

Merge pull request #468 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0

* commit '3a6aa0de0a63516c61704e5556111460cd6a5e45':
  REPORT-11144
final/10.0
Mata.Li 6 years ago
parent
commit
81575c1edf
  1. 2
      designer-realize/src/main/java/com/fr/start/Designer.java
  2. 1
      designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java

2
designer-realize/src/main/java/com/fr/start/Designer.java

@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
import com.fr.base.FRContext; import com.fr.base.FRContext;
import com.fr.base.vcs.DesignerMode; import com.fr.base.vcs.DesignerMode;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.RestartHelper;
import com.fr.design.actions.core.ActionFactory; import com.fr.design.actions.core.ActionFactory;
import com.fr.design.actions.file.WebPreviewUtils; import com.fr.design.actions.file.WebPreviewUtils;
import com.fr.design.actions.file.newReport.NewPolyReportAction; import com.fr.design.actions.file.newReport.NewPolyReportAction;
@ -102,6 +103,7 @@ public class Designer extends BaseDesigner {
DesignUtils.clientSend(args); DesignUtils.clientSend(args);
return; return;
} }
RestartHelper.deleteRecordFilesWhenStart();
preloadResource(); preloadResource();

1
designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java

@ -23,7 +23,6 @@ public class PreStartActivator extends Activator {
@Override @Override
public void start() { public void start() {
RestartHelper.deleteRecordFilesWhenStart();
CloudCenter.getInstance(); CloudCenter.getInstance();
if (checkMultiStart()) { if (checkMultiStart()) {
return; return;

Loading…
Cancel
Save