From 066fbd40d2871f65cc9352b34a97b8a2bdd8151b Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 29 May 2025 10:07:44 +0800 Subject: [PATCH 1/3] :art: Upgrade to Electron v35.5.0 https://github.com/siyuan-note/siyuan/issues/14926 --- .github/CONTRIBUTING.md | 6 +++--- .github/CONTRIBUTING_zh_CN.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f40d4fc49..569f524a4 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -14,10 +14,10 @@ Install pnpm: `npm install -g pnpm@10.11.0` Set the Electron mirror environment variable and install Electron: -* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v35.4.0 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v35.5.0 -D` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@v35.4.0 -D` + * `pnpm install electron@v35.5.0 -D` NPM mirror: @@ -27,7 +27,7 @@ NPM mirror: Enter the app folder and execute: -* `pnpm install electron@v35.4.0 -D` +* `pnpm install electron@v35.5.0 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index b76f11181..96ca7fd52 100644 --- a/.github/CONTRIBUTING_zh_CN.md +++ b/.github/CONTRIBUTING_zh_CN.md @@ -14,10 +14,10 @@ 设置 Electron 镜像环境变量并安装 Electron： -* macOS/Linux：`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v35.4.0 -D` +* macOS/Linux：`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v35.5.0 -D` * Windows： * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@v35.4.0 -D` + * `pnpm install electron@v35.5.0 -D` NPM 镜像： @@ -27,7 +27,7 @@ NPM 镜像： 进入 app 文件夹执行： -* `pnpm install electron@v35.4.0 -D` +* `pnpm install electron@v35.5.0 -D` * `pnpm run dev` * `pnpm run start` From 4528be886e565909055081778c2f7d39a12a6c8c Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 29 May 2025 10:44:54 +0800 Subject: [PATCH 2/3] :art: Improve backlink filtering below the heading https://github.com/siyuan-note/siyuan/issues/14929 --- kernel/model/backlink.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/kernel/model/backlink.go b/kernel/model/backlink.go index ea2543303..5cff17ead 100644 --- a/kernel/model/backlink.go +++ b/kernel/model/backlink.go @@ -476,7 +476,7 @@ func GetBacklink(id, keyword, mentionKeyword string, beforeLen int, containChild var paragraphParentIDs []string for _, link := range links { for _, ref := range link.Refs { - if "NodeParagraph" == ref.Type { + if "NodeParagraph" == ref.Type || "NodeHeading" == ref.Type { paragraphParentIDs = append(paragraphParentIDs, ref.ParentID) } } @@ -494,7 +494,7 @@ func GetBacklink(id, keyword, mentionKeyword string, beforeLen int, containChild } for _, link := range links { for _, ref := range link.Refs { - if "NodeParagraph" == ref.Type { + if "NodeParagraph" == ref.Type || "NodeHeading" == ref.Type { if processedParagraphs.Contains(ref.ParentID) { continue } @@ -580,7 +580,7 @@ func buildLinkRefs(defRootID string, refs []*sql.Ref, keywords []string) (ret [] var paragraphParentIDs []string for _, link := range links { for _, ref := range link.Refs { - if "NodeParagraph" == ref.Type { + if "NodeParagraph" == ref.Type || "NodeHeading" == ref.Type { parentRefParagraphs[ref.ParentID] = ref paragraphParentIDs = append(paragraphParentIDs, ref.ParentID) } @@ -615,7 +615,15 @@ func buildLinkRefs(defRootID string, refs []*sql.Ref, keywords []string) (ret [] continue } - if "" != strings.TrimSpace(c.Text()) { + text := c.Text() + if strings.HasPrefix(text, "#") { + tmp := strings.ReplaceAll(text, "#", "") + if " " == tmp { // 如果是标题标记符则跳过 + continue + } + } + + if "" != strings.TrimSpace(text) { paragraphUseParentLi = false break } @@ -640,7 +648,7 @@ func buildLinkRefs(defRootID string, refs []*sql.Ref, keywords []string) (ret [] } for _, link := range links { for _, ref := range link.Refs { - if "NodeParagraph" == ref.Type { + if "NodeParagraph" == ref.Type || "NodeHeading" == ref.Type { if processedParagraphs.Contains(ref.ParentID) { continue } From 0a0012f562ad49c68c7f24230e92c32be6486637 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 29 May 2025 11:16:24 +0800 Subject: [PATCH 3/3] :art: Improve the user guide https://github.com/siyuan-note/siyuan/issues/13870 --- .../20200924100950-9op5xi1.sy | 29 ++++++++++++++----- .../20200813004551-gm0pbn1.sy | 29 ++++++++++++++----- .../20211226122549-jktxego.sy | 29 ++++++++++++++----- .../20240530101000-xsbxokr.sy | 29 ++++++++++++++----- 4 files changed, 88 insertions(+), 28 deletions(-) diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy index 4119ad896..ce64a50b1 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy @@ -7,7 +7,7 @@ "id": "20200924100950-9op5xi1", "title": "Shortcuts", "type": "doc", - "updated": "20250423105931" + "updated": "20250529111226" }, "Children": [ { @@ -3679,7 +3679,7 @@ "HeadingLevel": 2, "Properties": { "id": "20210106154056-koo4wdj", - "updated": "20250303234918" + "updated": "20250529110920" }, "Children": [ { @@ -3698,7 +3698,7 @@ "HeadingLevel": 3, "Properties": { "id": "20210106154319-v9tt3e2", - "updated": "20250303234918" + "updated": "20250529110920" }, "Children": [ { @@ -3718,7 +3718,7 @@ "Properties": { "colgroup": "||", "id": "20240112150534-wiik5sl", - "updated": "20250303234918" + "updated": "20250529110920" }, "Children": [ { @@ -7316,7 +7316,13 @@ }, { "Type": "NodeTableCell", - "Data": "td" + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "The function in the backlink panel is to open the block where the cursor is located" + } + ] } ] }, @@ -16266,7 +16272,7 @@ "HeadingLevel": 3, "Properties": { "id": "20220902200437-58why4v", - "updated": "20250115161129" + "updated": "20250529111226" }, "Children": [ { @@ -16285,7 +16291,7 @@ "Properties": { "colgroup": "|", "id": "20220902200448-06bh19l", - "updated": "20250115161129" + "updated": "20250529111226" }, "Children": [ { @@ -16492,6 +16498,15 @@ "Type": "NodeText", "Data": "​ / " }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "Copy file" + }, + { + "Type": "NodeText", + "Data": "​ → " + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy index 36a501d96..63fe7e186 100644 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy +++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy @@ -7,7 +7,7 @@ "id": "20200813004551-gm0pbn1", "title": "快捷键", "type": "doc", - "updated": "20250423105922" + "updated": "20250529111202" }, "Children": [ { @@ -3677,7 +3677,7 @@ "HeadingLevel": 2, "Properties": { "id": "20201227133317-rkh4bji", - "updated": "20250303234645" + "updated": "20250529110805" }, "Children": [ { @@ -3692,7 +3692,7 @@ "HeadingLevel": 3, "Properties": { "id": "20201227133317-kazyttz", - "updated": "20250303234645" + "updated": "20250529110805" }, "Children": [ { @@ -3716,7 +3716,7 @@ "Properties": { "colgroup": "||", "id": "20201227133317-vopotjc", - "updated": "20250303234645" + "updated": "20250529110805" }, "Children": [ { @@ -7292,7 +7292,13 @@ }, { "Type": "NodeTableCell", - "Data": "td" + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "在反链面板中的作用是打开光标所在块" + } + ] } ] }, @@ -16198,7 +16204,7 @@ "HeadingLevel": 3, "Properties": { "id": "20220901210205-d5z8hhk", - "updated": "20250115155218" + "updated": "20250529111202" }, "Children": [ { @@ -16217,7 +16223,7 @@ "Properties": { "colgroup": "|", "id": "20220902201053-imb47bl", - "updated": "20250115155218" + "updated": "20250529111202" }, "Children": [ { @@ -16424,6 +16430,15 @@ "Type": "NodeText", "Data": "​ / " }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "复制文件" + }, + { + "Type": "NodeText", + "Data": "​ → " + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy index da224717e..1d6cd5f08 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy @@ -7,7 +7,7 @@ "id": "20211226122549-jktxego", "title": "快捷鍵", "type": "doc", - "updated": "20250423105919" + "updated": "20250529111304" }, "Children": [ { @@ -3671,7 +3671,7 @@ "HeadingLevel": 2, "Properties": { "id": "20211226122652-htptsmh", - "updated": "20250303234747" + "updated": "20250529111040" }, "Children": [ { @@ -3686,7 +3686,7 @@ "HeadingLevel": 3, "Properties": { "id": "20211226122652-xp1hi60", - "updated": "20250303234747" + "updated": "20250529111040" }, "Children": [ { @@ -3706,7 +3706,7 @@ "Properties": { "colgroup": "||", "id": "20240112151141-ggglv0f", - "updated": "20250303234747" + "updated": "20250529111040" }, "Children": [ { @@ -7309,7 +7309,13 @@ }, { "Type": "NodeTableCell", - "Data": "td" + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "在反鏈面板中的作用是打開遊標所在區塊" + } + ] } ] }, @@ -16324,7 +16330,7 @@ "HeadingLevel": 3, "Properties": { "id": "20220902195608-jh61ukq", - "updated": "20250115160036" + "updated": "20250529111304" }, "Children": [ { @@ -16343,7 +16349,7 @@ "Properties": { "colgroup": "|", "id": "20220902195638-92scg94", - "updated": "20250115160036" + "updated": "20250529111304" }, "Children": [ { @@ -16550,6 +16556,15 @@ "Type": "NodeText", "Data": "​ / " }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "複製文件" + }, + { + "Type": "NodeText", + "Data": "​ → " + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", diff --git a/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-xsbxokr.sy b/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-xsbxokr.sy index da9c2788d..4a344e8c4 100644 --- a/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-xsbxokr.sy +++ b/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-xsbxokr.sy @@ -9,7 +9,7 @@ "id": "20240530101000-xsbxokr", "title": "ショートカット", "type": "doc", - "updated": "20250423105910" + "updated": "20250529111249" }, "Children": [ { @@ -3627,7 +3627,7 @@ "Properties": { "ID": "20240530101000-twmuxke", "id": "20240530101000-675gu9g", - "updated": "20250303234901" + "updated": "20250529111052" }, "Children": [ { @@ -3653,7 +3653,7 @@ "Properties": { "ID": "20240530101000-tkbdrth", "id": "20240530101000-9wkmh8w", - "updated": "20250303234901" + "updated": "20250529111052" }, "Children": [ { @@ -3673,7 +3673,7 @@ "Properties": { "colgroup": "||", "id": "20240530101000-1isfzez", - "updated": "20250303234901" + "updated": "20250529111052" }, "Children": [ { @@ -7276,7 +7276,13 @@ }, { "Type": "NodeTableCell", - "Data": "td" + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "バックリンクパネルの機能は、カーソルが位置するブロックを開くことです。" + } + ] } ] }, @@ -16404,7 +16410,7 @@ "Properties": { "ID": "20240530101000-84m3izj", "id": "20240530101000-q5l68vs", - "updated": "20250115162016" + "updated": "20250529111249" }, "Children": [ { @@ -16433,7 +16439,7 @@ "Properties": { "colgroup": "|", "id": "20240530101000-4pvglr9", - "updated": "20250115162016" + "updated": "20250529111249" }, "Children": [ { @@ -16649,6 +16655,15 @@ "Type": "NodeText", "Data": "​ / " }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "ファイルのコピー" + }, + { + "Type": "NodeText", + "Data": "​ → " + }, { "Type": "NodeTextMark", "TextMarkType": "kbd",