From 74a2ea1a07d96d54d58753353ec6ecb59f6eae8a Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 24 Sep 2022 22:30:41 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E5=AF=BC=E5=87=BA=20PDF=20=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=BF=9D=E7=95=99=E6=8A=98=E5=8F=A0=E7=8A=B6=E6=80=81?= =?UTF-8?q?=20https://github.com/siyuan-note/siyuan/issues/5941?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/api/export.go | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/kernel/api/export.go b/kernel/api/export.go index 319dd540e..2f17f5404 100644 --- a/kernel/api/export.go +++ b/kernel/api/export.go @@ -18,9 +18,7 @@ package api import ( "net/http" - "os" "path" - "path/filepath" "strings" "github.com/88250/gulu" @@ -193,7 +191,6 @@ func exportPreviewHTML(c *gin.Context) { } id := arg["id"].(string) - tpl := arg["tpl"].(string) keepFold := false if arg["keepFold"] != nil { keepFold = arg["keepFold"].(bool) @@ -201,29 +198,11 @@ func exportPreviewHTML(c *gin.Context) { name, content := model.ExportHTML(id, "", true, keepFold) // 导出 PDF 预览时点击块引转换后的脚注跳转不正确 https://github.com/siyuan-note/siyuan/issues/5894 content = strings.ReplaceAll(content, "http://127.0.0.1:"+util.ServerPort+"/#", "#") - tpl = strings.ReplaceAll(tpl, "{tpl.name}", name) - tpl = strings.ReplaceAll(tpl, "{tpl.content}", content) - tmpName := gulu.Rand.String(7) - tmpDir := filepath.Join(util.TempDir, "export", "preview") - if err := os.MkdirAll(tmpDir, 0755); nil != err { - ret.Code = 1 - ret.Msg = err.Error() - ret.Data = map[string]interface{}{"closeTimeout": 7000} - return - } - tmpPath := filepath.Join(tmpDir, tmpName) - if err := os.WriteFile(tmpPath, []byte(tpl), 0644); nil != err { - ret.Code = 1 - ret.Msg = err.Error() - ret.Data = map[string]interface{}{"closeTimeout": 7000} - return - } - url := path.Join("http://127.0.0.1:"+util.ServerPort, "export", "preview", tmpName) ret.Data = map[string]interface{}{ - "id": id, - "name": name, - "url": url, + "id": id, + "name": name, + "content": content, } }