From 4ceae7fd1b2252f4dc4813b02d8ac5c7ac6ea9d8 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 18 Oct 2022 23:46:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:art:=20=E5=AF=BC=E5=87=BA=20PDF=20?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E7=95=8C=E9=9D=A2=E4=B8=8D=E5=8F=97=E4=B8=BB?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=BC=A9=E6=94=BE=E5=BD=B1=E5=93=8D=20Fix=20?= =?UTF-8?q?https://github.com/siyuan-note/siyuan/issues/6262?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/protyle/export/index.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/protyle/export/index.ts b/app/src/protyle/export/index.ts index 666f85748..96e8c1f75 100644 --- a/app/src/protyle/export/index.ts +++ b/app/src/protyle/export/index.ts @@ -2,7 +2,7 @@ import {hideMessage, showMessage} from "../../dialog/message"; import {Constants} from "../../constants"; /// #if !BROWSER import {OpenDialogReturnValue} from "electron"; -import {BrowserWindow, dialog, app} from "@electron/remote"; +import {app, BrowserWindow, dialog} from "@electron/remote"; import * as fs from "fs"; import * as path from "path"; import {afterExport} from "./util"; @@ -382,6 +382,9 @@ const renderPDF = (id: string) => { }, }); window.siyuan.printWin.webContents.userAgent = `SiYuan/${app.getVersion()} https://b3log.org/siyuan Electron`; + window.siyuan.printWin.once("ready-to-show", () => { + window.siyuan.printWin.webContents.setZoomFactor(1); + }) fetchPost("/api/export/exportTempContent", {content: html}, (response) => { window.siyuan.printWin.loadURL(response.data.url); }); From 0eb535c012e7cbfe2c72839403276ecc6bb55e27 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 18 Oct 2022 23:46:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?:art:=20=E5=AF=BC=E5=87=BA=20PDF=20?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E7=95=8C=E9=9D=A2=E4=B8=8D=E5=8F=97=E4=B8=BB?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=BC=A9=E6=94=BE=E5=BD=B1=E5=93=8D=20Fix=20?= =?UTF-8?q?https://github.com/siyuan-note/siyuan/issues/6262?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/protyle/export/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/protyle/export/index.ts b/app/src/protyle/export/index.ts index 96e8c1f75..7a6c59173 100644 --- a/app/src/protyle/export/index.ts +++ b/app/src/protyle/export/index.ts @@ -383,6 +383,7 @@ const renderPDF = (id: string) => { }); window.siyuan.printWin.webContents.userAgent = `SiYuan/${app.getVersion()} https://b3log.org/siyuan Electron`; window.siyuan.printWin.once("ready-to-show", () => { + // 导出 PDF 预览界面不受主界面缩放影响 https://github.com/siyuan-note/siyuan/issues/6262 window.siyuan.printWin.webContents.setZoomFactor(1); }) fetchPost("/api/export/exportTempContent", {content: html}, (response) => { From 95d2b7f67c7485c894427d98f1e102613f337a25 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 19 Oct 2022 09:44:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?:bug:=20=E4=BF=AE=E6=94=B9=E5=B8=A6?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E7=9A=84=E6=96=87=E6=A1=A3=E5=90=8D=E9=94=9A?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E4=BC=9A=E6=9B=B4=E6=96=B0=E4=B8=BA=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E5=90=8D=20https://github.com/siyuan-note/siyuan/issu?= =?UTF-8?q?es/6259?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/file.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel/model/file.go b/kernel/model/file.go index 305500e4c..25b453d63 100644 --- a/kernel/model/file.go +++ b/kernel/model/file.go @@ -1275,12 +1275,14 @@ func RenameDoc(boxID, p, title string) (err error) { title = "Untitled" } + refText := getNodeRefText(tree.Root) evt := util.NewCmdResult("rename", 0, util.PushModeBroadcast, util.PushModeNone) evt.Data = map[string]interface{}{ - "box": boxID, - "id": tree.Root.ID, - "path": p, - "title": title, + "box": boxID, + "id": tree.Root.ID, + "path": p, + "title": title, + "refText": refText, } util.PushEvent(evt)