From b44b2fbc38f7ff8baa8cffec2a3328be52ee2f64 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Mon, 7 Oct 2024 20:36:58 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-135233=20=E8=B0=83=E6=95=B4TemplateExpor?= =?UTF-8?q?tOperator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../actions/file/export/AbstractExportAction.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java b/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java index 7dc25799f3..f669403db5 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java @@ -1,5 +1,7 @@ package com.fr.design.actions.file.export; +import com.fanruan.entity.template.TemplateExportBean; +import com.fanruan.repository.TemplateRepository; import com.fr.design.actions.JTemplateAction; import com.fr.design.base.mode.DesignModeContext; import com.fr.design.dialog.FineJOptionPane; @@ -18,12 +20,8 @@ import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; import com.fr.stable.project.ProjectConstants; import com.fr.third.jodd.io.FileNameUtil; -import com.fr.workspace.WorkContext; -import com.fr.workspace.server.exporter.TemplateExportOperator; -import javax.swing.JOptionPane; -import javax.swing.SwingWorker; -import javax.swing.UIManager; +import javax.swing.*; import java.awt.event.ActionEvent; import java.io.OutputStream; import java.util.Map; @@ -215,9 +213,7 @@ public abstract class AbstractExportAction> extends JT path = path.substring(ProjectConstants.REPORTLETS_NAME.length()); } - byte[] contents = - WorkContext.getCurrent().get(TemplateExportOperator.class) - .export(exportKey(), exportType(), null, path, para); + byte[] contents = TemplateRepository.getInstance().export(new TemplateExportBean().setKey(exportKey()).setType(exportType()).setPath(path).setParas(para)); outputStream.write(contents); }