Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Vanessa 2022-10-19 09:53:25 +08:00
commit 98fc431014
2 changed files with 11 additions and 5 deletions

View file

@ -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,10 @@ 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) => {
window.siyuan.printWin.loadURL(response.data.url);
});

View file

@ -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)