github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-13 23:52:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vanessa 2023-06-06 21:54:58 +08:00
commit dd69fa26a7
4 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/electron/main.js
View File

@ -119,8 +119,10 @@ const exitApp = (port, errorWindowId) => {
} }
}; };
const localServer = "http://127.0.0.1"
const getServer = (port = kernelPort) => { const getServer = (port = kernelPort) => {
return "http://127.0.0.1:" + port; return localServer + ":" + port;
}; };
const sleep = (ms) => { const sleep = (ms) => {
@ -359,16 +361,13 @@ const boot = () => {
const menu = Menu.buildFromTemplate(template); const menu = Menu.buildFromTemplate(template);
Menu.setApplicationMenu(menu); Menu.setApplicationMenu(menu);
// 当前页面链接使用浏览器打开 // 当前页面链接使用浏览器打开
currentWindow.webContents.on("will-navigate", (event, url) => { currentWindow.webContents.on("will-navigate", (event) => {
if (event.sender) { const url = event.url;
const currentURL = new URL(event.sender.getURL()); event.preventDefault();
if (url.startsWith(getServer(currentURL.port))) { if (url.startsWith(localServer)) {
return; return;
} }
event.preventDefault();
shell.openExternal(url); shell.openExternal(url);
}
}); });
currentWindow.on("close", (event) => { currentWindow.on("close", (event) => {
@ -664,10 +663,10 @@ app.whenReady().then(() => {
BrowserWindow.fromId(id).webContents.send("siyuan-export-close", id); BrowserWindow.fromId(id).webContents.send("siyuan-export-close", id);
}); });
ipcMain.on("siyuan-export-prevent", (event, id) => { ipcMain.on("siyuan-export-prevent", (event, id) => {
BrowserWindow.fromId(id).webContents.on("will-navigate", (event, url) => { BrowserWindow.fromId(id).webContents.on("will-navigate", (event) => {
const currentURL = new URL(event.sender.getURL()); const url = event.url;
event.preventDefault(); event.preventDefault();
if (url.startsWith(getServer(currentURL.port))) { if (url.startsWith(localServer)) {
return; return;
} }
shell.openExternal(url); shell.openExternal(url);

5
kernel/api/system.go
View File

@ -66,10 +66,11 @@ func getChangelog(c *gin.Context) {
model.Conf.ShowChangelog = false model.Conf.ShowChangelog = false
luteEngine := lute.New() luteEngine := lute.New()
htmlContent := luteEngine.Markdown("", contentData) htmlContent := luteEngine.MarkdownStr("", string(contentData))
htmlContent = util.LinkTarget(htmlContent, "")
data["show"] = true data["show"] = true
data["html"] = gulu.Str.FromBytes(htmlContent) data["html"] = htmlContent
ret.Data = data ret.Data = data
} }

20
kernel/bazaar/package.go
View File

@ -28,7 +28,6 @@ import (
"github.com/88250/gulu" "github.com/88250/gulu"
"github.com/88250/lute" "github.com/88250/lute"
"github.com/PuerkitoBio/goquery"
"github.com/araddon/dateparse" "github.com/araddon/dateparse"
"github.com/imroc/req/v3" "github.com/imroc/req/v3"
"github.com/siyuan-note/filelock" "github.com/siyuan-note/filelock"
@ -517,24 +516,7 @@ func renderREADME(repoURL string, mdData []byte) (ret string, err error) {
linkBase := "https://cdn.jsdelivr.net/gh/" + strings.TrimPrefix(repoURL, "https://github.com/") linkBase := "https://cdn.jsdelivr.net/gh/" + strings.TrimPrefix(repoURL, "https://github.com/")
luteEngine.SetLinkBase(linkBase) luteEngine.SetLinkBase(linkBase)
ret = luteEngine.Md2HTML(string(mdData)) ret = luteEngine.Md2HTML(string(mdData))
doc, err := goquery.NewDocumentFromReader(strings.NewReader(ret)) ret = util.LinkTarget(ret, linkBase)
if nil != err {
logging.LogErrorf("parse HTML failed: %s", err)
return
}
doc.Find("a").Each(func(i int, selection *goquery.Selection) {
if href, ok := selection.Attr("href"); ok {
if util.IsRelativePath(href) {
selection.SetAttr("href", linkBase+href)
}
// The hyperlink in the marketplace package README fails to jump to the browser to open https://github.com/siyuan-note/siyuan/issues/8452
selection.SetAttr("target", "_blank")
}
})
ret, _ = doc.Find("body").Html()
return return
} }

30
kernel/util/lute.go
View File

@ -16,7 +16,13 @@
package util package util
import "github.com/88250/lute" import (
"strings"
"github.com/88250/lute"
"github.com/PuerkitoBio/goquery"
"github.com/siyuan-note/logging"
)
func NewLute() (ret *lute.Lute) { func NewLute() (ret *lute.Lute) {
ret = lute.New() ret = lute.New()
@ -62,3 +68,25 @@ func NewStdLute() (ret *lute.Lute) {
ret.SetInlineMathAllowDigitAfterOpenMarker(true) // Formula parsing supports $ followed by numbers when importing Markdown https://github.com/siyuan-note/siyuan/issues/8362 ret.SetInlineMathAllowDigitAfterOpenMarker(true) // Formula parsing supports $ followed by numbers when importing Markdown https://github.com/siyuan-note/siyuan/issues/8362
return return
} }
func LinkTarget(htmlStr, linkBase string) (ret string) {
doc, err := goquery.NewDocumentFromReader(strings.NewReader(htmlStr))
if nil != err {
logging.LogErrorf("parse HTML failed: %s", err)
return
}
doc.Find("a").Each(func(i int, selection *goquery.Selection) {
if href, ok := selection.Attr("href"); ok {
if IsRelativePath(href) {
selection.SetAttr("href", linkBase+href)
}
// The hyperlink in the marketplace package README fails to jump to the browser to open https://github.com/siyuan-note/siyuan/issues/8452
selection.SetAttr("target", "_blank")
}
})
ret, _ = doc.Find("body").Html()
return
}