From dd256bbaec7592abd00716bc85f209b8ce41afac Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 21 Oct 2024 17:34:21 +0800 Subject: [PATCH 01/20] :art: The backlink panel no longer displays child-block references https://github.com/siyuan-note/siyuan/issues/12861 --- kernel/api/ref.go | 16 ++++++++++++---- kernel/model/backlink.go | 8 ++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/kernel/api/ref.go b/kernel/api/ref.go index 075a75c5c46..24939b7e9a1 100644 --- a/kernel/api/ref.go +++ b/kernel/api/ref.go @@ -51,7 +51,7 @@ func getBackmentionDoc(c *gin.Context) { defID := arg["defID"].(string) refTreeID := arg["refTreeID"].(string) keyword := arg["keyword"].(string) - containChildren := true + containChildren := false if val, ok := arg["containChildren"]; ok { containChildren = val.(bool) } @@ -73,7 +73,7 @@ func getBacklinkDoc(c *gin.Context) { defID := arg["defID"].(string) refTreeID := arg["refTreeID"].(string) keyword := arg["keyword"].(string) - containChildren := true + containChildren := false if val, ok := arg["containChildren"]; ok { containChildren = val.(bool) } @@ -109,7 +109,11 @@ func getBacklink2(c *gin.Context) { if nil != mentionSortArg { mentionSort, _ = strconv.Atoi(mentionSortArg.(string)) } - boxID, backlinks, backmentions, linkRefsCount, mentionsCount := model.GetBacklink2(id, keyword, mentionKeyword, sort, mentionSort) + containChildren := false + if val, ok := arg["containChildren"]; ok { + containChildren = val.(bool) + } + boxID, backlinks, backmentions, linkRefsCount, mentionsCount := model.GetBacklink2(id, keyword, mentionKeyword, sort, mentionSort, containChildren) ret.Data = map[string]interface{}{ "backlinks": backlinks, "linkRefsCount": linkRefsCount, @@ -141,7 +145,11 @@ func getBacklink(c *gin.Context) { if nil != arg["beforeLen"] { beforeLen = int(arg["beforeLen"].(float64)) } - boxID, backlinks, backmentions, linkRefsCount, mentionsCount := model.GetBacklink(id, keyword, mentionKeyword, beforeLen) + containChildren := false + if val, ok := arg["containChildren"]; ok { + containChildren = val.(bool) + } + boxID, backlinks, backmentions, linkRefsCount, mentionsCount := model.GetBacklink(id, keyword, mentionKeyword, beforeLen, containChildren) ret.Data = map[string]interface{}{ "backlinks": backlinks, "linkRefsCount": linkRefsCount, diff --git a/kernel/model/backlink.go b/kernel/model/backlink.go index efe5536326b..f9bdaf9d2a3 100644 --- a/kernel/model/backlink.go +++ b/kernel/model/backlink.go @@ -230,7 +230,7 @@ func getBacklinkRenderNodes(n *ast.Node) (ret []*ast.Node, expand bool) { return } -func GetBacklink2(id, keyword, mentionKeyword string, sortMode, mentionSortMode int) (boxID string, backlinks, backmentions []*Path, linkRefsCount, mentionsCount int) { +func GetBacklink2(id, keyword, mentionKeyword string, sortMode, mentionSortMode int, containChildren bool) (boxID string, backlinks, backmentions []*Path, linkRefsCount, mentionsCount int) { keyword = strings.TrimSpace(keyword) mentionKeyword = strings.TrimSpace(mentionKeyword) backlinks, backmentions = []*Path{}, []*Path{} @@ -242,7 +242,7 @@ func GetBacklink2(id, keyword, mentionKeyword string, sortMode, mentionSortMode rootID := sqlBlock.RootID boxID = sqlBlock.Box - refs := sql.QueryRefsByDefID(id, false) + refs := sql.QueryRefsByDefID(id, containChildren) refs = removeDuplicatedRefs(refs) linkRefs, linkRefsCount, excludeBacklinkIDs := buildLinkRefs(rootID, refs, keyword) @@ -328,7 +328,7 @@ func GetBacklink2(id, keyword, mentionKeyword string, sortMode, mentionSortMode return } -func GetBacklink(id, keyword, mentionKeyword string, beforeLen int) (boxID string, linkPaths, mentionPaths []*Path, linkRefsCount, mentionsCount int) { +func GetBacklink(id, keyword, mentionKeyword string, beforeLen int, containChildren bool) (boxID string, linkPaths, mentionPaths []*Path, linkRefsCount, mentionsCount int) { linkPaths = []*Path{} mentionPaths = []*Path{} @@ -340,7 +340,7 @@ func GetBacklink(id, keyword, mentionKeyword string, beforeLen int) (boxID strin boxID = sqlBlock.Box var links []*Block - refs := sql.QueryRefsByDefID(id, false) + refs := sql.QueryRefsByDefID(id, containChildren) refs = removeDuplicatedRefs(refs) // 为了减少查询，组装好 IDs 后一次查出 From d0c6268b9f9385701c9f7098101df3d821821306 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Mon, 21 Oct 2024 20:03:43 +0800 Subject: [PATCH 02/20] :lipstick: https://github.com/siyuan-note/siyuan/issues/12859 --- app/src/assets/scss/component/_snackbar.scss | 16 ++++++++-------- app/src/dialog/message.ts | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/assets/scss/component/_snackbar.scss b/app/src/assets/scss/component/_snackbar.scss index 6e2cfc17757..e3674f3bf9a 100644 --- a/app/src/assets/scss/component/_snackbar.scss +++ b/app/src/assets/scss/component/_snackbar.scss @@ -27,7 +27,6 @@ & > .b3-button { align-self: flex-end; margin-right: 18px; - } & > .fn__flex-1 { @@ -50,16 +49,16 @@ padding: 8px 16px; color: var(--b3-theme-on-primary); font-size: inherit; - background-color: var(--b3-theme-primary); + background-color: var(--b3-tooltips-background); box-sizing: border-box; - box-shadow: 0 3px 5px -1px rgb(0 0 0 / 20%), 0 6px 10px 0 rgb(0 0 0 / 14%), 0 1px 18px 0 rgb(0 0 0 / 12%); + box-shadow: var(--b3-tooltips-shadow); word-break: break-word; max-width: 20vw; text-align: left; display: inline-block; &--close { - padding-right: 27px; + padding-right: 50px; } a { @@ -75,13 +74,14 @@ &__close { position: absolute; cursor: pointer; - height: 16px; - width: 16px; + height: 18px; + width: 18px; color: var(--b3-theme-on-primary); transition: var(--b3-transition); - opacity: .68; - right: 5px; + right: 16px; top: 10px; + box-sizing: border-box; + opacity: .68; &:hover { opacity: 1; diff --git a/app/src/dialog/message.ts b/app/src/dialog/message.ts index 23b01b17f7a..2ec201bd1b5 100644 --- a/app/src/dialog/message.ts +++ b/app/src/dialog/message.ts @@ -4,7 +4,7 @@ import {Constants} from "../constants"; export const initMessage = () => { const messageElement = document.getElementById("message"); messageElement.innerHTML = `
-`; +`; messageElement.addEventListener("click", (event) => { let target = event.target as HTMLElement; while (target && !target.isEqualNode(messageElement)) { From df52d35efa6eadb0db0eecc4bf44873309d7e1c4 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 21 Oct 2024 20:11:50 +0800 Subject: [PATCH 03/20] :art: The backlink panel no longer displays breadcrumbs of the first-level blocks https://github.com/siyuan-note/siyuan/issues/12862 --- kernel/model/backlink.go | 4 ++-- kernel/model/block.go | 2 +- kernel/model/blockinfo.go | 10 ++++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/kernel/model/backlink.go b/kernel/model/backlink.go index f9bdaf9d2a3..9d8af1af3a6 100644 --- a/kernel/model/backlink.go +++ b/kernel/model/backlink.go @@ -171,10 +171,10 @@ func buildBacklink(refID string, refTree *parse.Tree, keywords []string, luteEng dom := renderBlockDOMByNodes(renderNodes, luteEngine) blockPaths := []*BlockPath{} - if nil != n.Parent && nil != n.Parent.Parent { + if nil != n.Parent && ast.NodeDocument != n.Parent.Type && nil != n.Parent.Parent && ast.NodeDocument != n.Parent.Parent.Type { // 仅在多余一层时才显示面包屑，这样界面展示更加简洁 // The backlink panel no longer displays breadcrumbs of the first-level blocks https://github.com/siyuan-note/siyuan/issues/12862 - blockPaths = buildBlockBreadcrumb(n, nil) + blockPaths = buildBlockBreadcrumb(n, nil, false) } ret = &Backlink{DOM: dom, BlockPaths: blockPaths, Expand: expand} return diff --git a/kernel/model/block.go b/kernel/model/block.go index 69e643a5772..d6009de122e 100644 --- a/kernel/model/block.go +++ b/kernel/model/block.go @@ -887,7 +887,7 @@ func getEmbeddedBlock(trees map[string]*parse.Tree, sqlBlock *sql.Block, heading } if breadcrumb { - blockPaths = buildBlockBreadcrumb(def, nil) + blockPaths = buildBlockBreadcrumb(def, nil, true) } if 1 > len(blockPaths) { blockPaths = []*BlockPath{} diff --git a/kernel/model/blockinfo.go b/kernel/model/blockinfo.go index ccfbcdba3ec..79d0ef89767 100644 --- a/kernel/model/blockinfo.go +++ b/kernel/model/blockinfo.go @@ -416,11 +416,11 @@ func BuildBlockBreadcrumb(id string, excludeTypes []string) (ret []*BlockPath, e return } - ret = buildBlockBreadcrumb(node, excludeTypes) + ret = buildBlockBreadcrumb(node, excludeTypes, true) return } -func buildBlockBreadcrumb(node *ast.Node, excludeTypes []string) (ret []*BlockPath) { +func buildBlockBreadcrumb(node *ast.Node, excludeTypes []string, displayCurrentNodeContent bool) (ret []*BlockPath) { ret = []*BlockPath{} if nil == node { return @@ -480,6 +480,12 @@ func buildBlockBreadcrumb(node *ast.Node, excludeTypes []string) (ret []*BlockPa name = strings.ReplaceAll(name, editor.Caret, "") name = util.EscapeHTML(name) + + if parent == node && !displayCurrentNodeContent { + // 反链中不显示当前块内容 https://github.com/siyuan-note/siyuan/issues/12862#issuecomment-2426406327 + name = "" + } + if add { ret = append([]*BlockPath{{ ID: id, From 787305f0254f6886133e3dc97d14c2b82367d2d7 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Mon, 21 Oct 2024 20:18:06 +0800 Subject: [PATCH 04/20] :lipstick: https://github.com/siyuan-note/siyuan/issues/12859 --- app/src/assets/scss/component/_snackbar.scss | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/assets/scss/component/_snackbar.scss b/app/src/assets/scss/component/_snackbar.scss index e3674f3bf9a..e4bcc8d69a7 100644 --- a/app/src/assets/scss/component/_snackbar.scss +++ b/app/src/assets/scss/component/_snackbar.scss @@ -39,8 +39,15 @@ } &--error .b3-snackbar__content { - background-color: var(--b3-theme-error); - color: var(--b3-theme-on-error); + padding-left: 47px; + + &:after { + content: "❗"; + position: absolute; + left: 16px; + top: 10px; + font-size: 16px; + } } &__content { From 31e56bf83a41be5d1faf128dde95f5cb7f70d622 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Mon, 21 Oct 2024 20:34:17 +0800 Subject: [PATCH 05/20] :lipstick: https://github.com/siyuan-note/siyuan/issues/12859 --- app/appearance/themes/daylight/theme.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/appearance/themes/daylight/theme.css b/app/appearance/themes/daylight/theme.css index 4b335676f4b..2f97b9508aa 100644 --- a/app/appearance/themes/daylight/theme.css +++ b/app/appearance/themes/daylight/theme.css @@ -55,7 +55,7 @@ --b3-menu-background: var(--b3-theme-surface); /* 提示 */ - --b3-tooltips-background: rgba(0, 0, 0, .9); + --b3-tooltips-background: #312f35; --b3-tooltips-color: var(--b3-theme-background-light); --b3-tooltips-second-color: #7d7c7a; --b3-tooltips-shadow: 0 2px 8px rgba(0, 0, 0, .1); From c618acaec377990179390fe4c7d945013c87fe64 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Mon, 21 Oct 2024 21:32:35 +0800 Subject: [PATCH 06/20] :lipstick: https://github.com/siyuan-note/siyuan/issues/12858 --- app/src/assets/scss/component/_chip.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/assets/scss/component/_chip.scss b/app/src/assets/scss/component/_chip.scss index 7b86b1f0b8d..df880e4185b 100644 --- a/app/src/assets/scss/component/_chip.scss +++ b/app/src/assets/scss/component/_chip.scss @@ -18,7 +18,7 @@ align-items: center; box-sizing: border-box; padding: 8px 12px; - border-radius: 8px; + border-radius: var(--b3-border-radius); transition: var(--b3-transition); text-decoration: none; From 382b65b1982305890196f11f6017dba350caaa7a Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 21 Oct 2024 21:38:56 +0800 Subject: [PATCH 07/20] :memo: Update changelogs --- app/changelogs/v3.1.10/v3.1.10.md | 39 ++++++++++++++++++++++++ app/changelogs/v3.1.10/v3.1.10_zh_CHT.md | 39 ++++++++++++++++++++++++ app/changelogs/v3.1.10/v3.1.10_zh_CN.md | 39 ++++++++++++++++++++++++ 3 files changed, 117 insertions(+) create mode 100644 app/changelogs/v3.1.10/v3.1.10.md create mode 100644 app/changelogs/v3.1.10/v3.1.10_zh_CHT.md create mode 100644 app/changelogs/v3.1.10/v3.1.10_zh_CN.md diff --git a/app/changelogs/v3.1.10/v3.1.10.md b/app/changelogs/v3.1.10/v3.1.10.md new file mode 100644 index 00000000000..42e7652f341 --- /dev/null +++ b/app/changelogs/v3.1.10/v3.1.10.md @@ -0,0 +1,39 @@ +## Overview + +This version improves database performance and user interface details. + +In addition, we have also improved the backlink panel logic and no longer include sub-blocks in the calculation, which helps to display backlinks more accurately. + +## Changelogs + +Below are the detailed changes in this version. + +### Enhancement + +* [Improve interaction when deleting two-way relation field in a database](https://github.com/siyuan-note/siyuan/issues/11252) +* [Improve plugin dock position persistence](https://github.com/siyuan-note/siyuan/issues/11931) +* [Supports disabling Markdown `~~` syntax input](https://github.com/siyuan-note/siyuan/issues/12641) +* [WebDAV/S3 data sync and backup support configurable concurrent requests](https://github.com/siyuan-note/siyuan/issues/12798) +* [Improve the logic of multiple selected blocks forming a super block](https://github.com/siyuan-note/siyuan/issues/12809) +* [Browser clipping extension sends no more scrolling pages](https://github.com/siyuan-note/siyuan/issues/12817) +* [Improve database template field loading performance](https://github.com/siyuan-note/siyuan/issues/12818) +* [Outline and bookmark supports displaying images](https://github.com/siyuan-note/siyuan/issues/12820) +* [Improve importing .sy.zip](https://github.com/siyuan-note/siyuan/issues/12825) +* [Improve database relation & rollup field loading performance](https://github.com/siyuan-note/siyuan/issues/12835) +* [Improve user interface](https://github.com/siyuan-note/siyuan/issues/12848) +* [Refresh doc tree after data sync](https://github.com/siyuan-note/siyuan/issues/12860) +* [The backlink panel no longer displays child-block references](https://github.com/siyuan-note/siyuan/issues/12861) +* [The backlink panel no longer displays breadcrumbs of the first-level blocks](https://github.com/siyuan-note/siyuan/issues/12862) + +### Bugfix + +* [Drag and drop to insert asset fails](https://github.com/siyuan-note/siyuan/issues/12791) +* [Abnormal after pasting certain content](https://github.com/siyuan-note/siyuan/issues/12792) +* [The word count of the selected block is inaccurate](https://github.com/siyuan-note/siyuan/issues/12793) +* [Unable to open PDF](https://github.com/siyuan-note/siyuan/issues/12794) +* [The corrupted data causes the kernel to hang](https://github.com/siyuan-note/siyuan/issues/12852) + +## Download + +* [B3log](https://b3log.org/siyuan/en/download.html) +* [GitHub](https://github.com/siyuan-note/siyuan/releases) diff --git a/app/changelogs/v3.1.10/v3.1.10_zh_CHT.md b/app/changelogs/v3.1.10/v3.1.10_zh_CHT.md new file mode 100644 index 00000000000..dd0f3b05e91 --- /dev/null +++ b/app/changelogs/v3.1.10/v3.1.10_zh_CHT.md @@ -0,0 +1,39 @@ +## 概述 + +此版本改進了資料庫效能和使用者介面細節。 + +另外，我們也改進了反鏈面板邏輯，不再將子塊納入計算，這有助於更精確地顯示反鏈。 + +## 變更記錄 + +以下是此版本中的詳細變更。 + +### 改進功能 + +* [改進刪除資料庫中雙向關聯欄位時的互動](https://github.com/siyuan-note/siyuan/issues/11252) +* [改進插件停靠列位置的持久化](https://github.com/siyuan-note/siyuan/issues/11931) +* [支援禁用 Markdown `~~` 語法輸入](https://github.com/siyuan-note/siyuan/issues/12641) +* [WebDAV/S3 資料同步與備份支援設定並發請求數](https://github.com/siyuan-note/siyuan/issues/12798) +* [改進多選塊形成超級塊的邏輯](https://github.com/siyuan-note/siyuan/issues/12809) +* [瀏覽器剪藏擴充功能不再需要捲動頁面](https://github.com/siyuan-note/siyuan/issues/12817) +* [改進資料庫範本欄位載入效能](https://github.com/siyuan-note/siyuan/issues/12818) +* [大綱和書籤支援顯示圖片](https://github.com/siyuan-note/siyuan/issues/12820) +* [改進導入 .sy.zip](https://github.com/siyuan-note/siyuan/issues/12825) +* [改進資料庫關聯和匯總欄位載入效能](https://github.com/siyuan-note/siyuan/issues/12835) +* [改進使用者介面](https://github.com/siyuan-note/siyuan/issues/12848) +* [資料同步後刷新文件樹](https://github.com/siyuan-note/siyuan/issues/12860) +* [反向連結面板不再顯示子塊引用](https://github.com/siyuan-note/siyuan/issues/12861) +* [反向連結面板不再顯示一一級塊的麵包屑](https://github.com/siyuan-note/siyuan/issues/12862) + +### 修復缺陷 + +* [拖曳插入資源檔案失敗](https://github.com/siyuan-note/siyuan/issues/12791) +* [貼上某些內容後異常](https://github.com/siyuan-note/siyuan/issues/12792) +* [選定區塊的字數統計不準確](https://github.com/siyuan-note/siyuan/issues/12793) +* [無法開啟 PDF](https://github.com/siyuan-note/siyuan/issues/12794) +* [資料損壞導致核心掛起](https://github.com/siyuan-note/siyuan/issues/12852) + +## 下載 + +* [B3log](https://b3log.org/siyuan/download.html) +* [GitHub](https://github.com/siyuan-note/siyuan/releases) diff --git a/app/changelogs/v3.1.10/v3.1.10_zh_CN.md b/app/changelogs/v3.1.10/v3.1.10_zh_CN.md new file mode 100644 index 00000000000..b1c731a47d6 --- /dev/null +++ b/app/changelogs/v3.1.10/v3.1.10_zh_CN.md @@ -0,0 +1,39 @@ +## 概述 + +该版本改进了数据库性能和用户界面细节。 + +另外，我们也改进了反链面板逻辑，不再将子块纳入计算，这有助于更加精确地显示反链。 + +## 变更记录 + +以下是此版本中的详细变更。 + +### 改进功能 + +* [改进删除数据库中双向关联字段时的交互](https://github.com/siyuan-note/siyuan/issues/11252) +* [改进插件停靠栏位置的持久化](https://github.com/siyuan-note/siyuan/issues/11931) +* [支持禁用 Markdown `~~` 语法输入](https://github.com/siyuan-note/siyuan/issues/12641) +* [WebDAV/S3 数据同步和备份支持配置并发请求数](https://github.com/siyuan-note/siyuan/issues/12798) +* [改进多选块形成超级块的逻辑](https://github.com/siyuan-note/siyuan/issues/12809) +* [浏览器剪藏扩展不再需要滚动页面](https://github.com/siyuan-note/siyuan/issues/12817) +* [改进数据库模板字段加载性能](https://github.com/siyuan-note/siyuan/issues/12818) +* [大纲和书签支持显示图片](https://github.com/siyuan-note/siyuan/issues/12820) +* [改进导入 .sy.zip](https://github.com/siyuan-note/siyuan/issues/12825) +* [改进数据库关联和汇总字段加载性能](https://github.com/siyuan-note/siyuan/issues/12835) +* [改进用户界面](https://github.com/siyuan-note/siyuan/issues/12848) +* [数据同步后刷新文档树](https://github.com/siyuan-note/siyuan/issues/12860) +* [反向链接面板不再显示子块引用](https://github.com/siyuan-note/siyuan/issues/12861) +* [反向链接面板不再显示一级块的面包屑](https://github.com/siyuan-note/siyuan/issues/12862) + +### 修复缺陷 + +* [拖放插入资源文件失败](https://github.com/siyuan-note/siyuan/issues/12791) +* [粘贴某些内容后异常](https://github.com/siyuan-note/siyuan/issues/12792) +* [选定块的字数统计不准确](https://github.com/siyuan-note/siyuan/issues/12793) +* [无法打开 PDF](https://github.com/siyuan-note/siyuan/issues/12794) +* [数据损坏导致内核挂起](https://github.com/siyuan-note/siyuan/issues/12852) + +## 下载 + +* [B3log](https://b3log.org/siyuan/download.html) +* [GitHub](https://github.com/siyuan-note/siyuan/releases) From 9f825bd9be33e5668628af4df69ffb7cd9b33a1e Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 21 Oct 2024 22:32:05 +0800 Subject: [PATCH 08/20] :art: Improve database paging loading https://github.com/siyuan-note/siyuan/issues/12780 --- app/appearance/langs/de_DE.json | 1 + app/appearance/langs/en_US.json | 1 + app/appearance/langs/es_ES.json | 1 + app/appearance/langs/fr_FR.json | 1 + app/appearance/langs/he_IL.json | 1 + app/appearance/langs/it_IT.json | 1 + app/appearance/langs/ja_JP.json | 1 + app/appearance/langs/pl_PL.json | 1 + app/appearance/langs/ru_RU.json | 1 + app/appearance/langs/zh_CHT.json | 1 + app/appearance/langs/zh_CN.json | 1 + app/src/protyle/render/av/view.ts | 2 +- 12 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/appearance/langs/de_DE.json b/app/appearance/langs/de_DE.json index f55d35d783b..67b24984df1 100644 --- a/app/appearance/langs/de_DE.json +++ b/app/appearance/langs/de_DE.json @@ -1,4 +1,5 @@ { + "entryNum": "Anzahl der Einträge", "workspaceData": "Arbeitsbereichsdaten", "confirmRemoveRelationField": "Sind Sie sicher, dass Sie das Feld, das mit ${x} verknüpft ist, löschen möchten?", "removeButKeepRelationField": "Entfernen, aber verknüpftes Feld behalten", diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 0422ada8588..58608e0fb9c 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,5 @@ { + "entryNum": "Number of entries", "workspaceData": "Workspace data", "confirmRemoveRelationField": "Are you sure you want to delete the field associated with ${x}?", "removeButKeepRelationField": "Remove, but keep related field", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index af0db74f605..e7d7b939d3c 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,5 @@ { + "entryNum": "Número de entradas", "workspaceData": "Datos del espacio de trabajo", "confirmRemoveRelationField": "¿Está seguro de que desea eliminar el campo asociado a ${x}?", "removeButKeepRelationField": "Eliminar, pero mantener el campo relacionado", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index f2f03a6e489..e4aff93eb7d 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,5 @@ { + "entryNum": "Nombre d'entrées", "workspaceData": "Données de l'espace de travail", "confirmRemoveRelationField": "Êtes-vous sûr de vouloir supprimer le champ associé à ${x}?", "removeButKeepRelationField": "Supprimer, mais conserver le champ associé", diff --git a/app/appearance/langs/he_IL.json b/app/appearance/langs/he_IL.json index 481d0d3c66c..5aac13d944e 100644 --- a/app/appearance/langs/he_IL.json +++ b/app/appearance/langs/he_IL.json @@ -1,4 +1,5 @@ { + "entryNum": "מספר ערכים", "workspaceData": "נתוני סביבת עבודה", "confirmRemoveRelationField": "האם אתה בטוח שברצונך למחוק את השדה המשויך ל-${x}?", "removeButKeepRelationField": "מחק, אך שמור על שדה הקשר", diff --git a/app/appearance/langs/it_IT.json b/app/appearance/langs/it_IT.json index 0f9f1f24cff..efbc4bfd7e9 100644 --- a/app/appearance/langs/it_IT.json +++ b/app/appearance/langs/it_IT.json @@ -1,4 +1,5 @@ { + "entryNum": "Numero di voci", "workspaceData": "Dati dello spazio di lavoro", "confirmRemoveRelationField": "Sei sicuro di voler eliminare il campo associato a ${x}?", "removeButKeepRelationField": "Rimuovi, ma mantieni il campo correlato", diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json index 58cd0ab4cdf..35bea10f442 100644 --- a/app/appearance/langs/ja_JP.json +++ b/app/appearance/langs/ja_JP.json @@ -1,4 +1,5 @@ { + "entryNum": "エントリ数", "workspaceData": "ワークスペースデータ", "confirmRemoveRelationField": "${x} に関連するフィールドを同時に削除してもよろしいですか？", "removeButKeepRelationField": "削除して関連フィールドを保持", diff --git a/app/appearance/langs/pl_PL.json b/app/appearance/langs/pl_PL.json index 583c9e6fdbe..b9689c6b162 100644 --- a/app/appearance/langs/pl_PL.json +++ b/app/appearance/langs/pl_PL.json @@ -1,4 +1,5 @@ { + "entryNum": "Количество записей", "workspaceData": "Dane przestrzeni roboczej", "confirmRemoveRelationField": "Czy na pewno chcesz usunąć pole powiązane z ${x}?", "removeButKeepRelationField": "Usuń, ale zachowaj powiązane pole", diff --git a/app/appearance/langs/ru_RU.json b/app/appearance/langs/ru_RU.json index 0fc456ebd3d..d36786f7f5a 100644 --- a/app/appearance/langs/ru_RU.json +++ b/app/appearance/langs/ru_RU.json @@ -1,4 +1,5 @@ { + "entryNum": "Количество записей", "workspaceData": "Данные рабочей области", "confirmRemoveRelationField": "Вы уверены, что хотите удалить поле, связанное с ${x}?", "removeButKeepRelationField": "Удалить, но сохранить связанное поле", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 5ea386f9567..33697abd5e4 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,5 @@ { + "entryNum": "條目數", "workspaceData": "工作空間數據", "confirmRemoveRelationField": "確定同時刪除關聯至 ${x} 中的字段嗎？", "removeButKeepRelationField": "刪除，但保留關聯字段", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index f7f2ab9f0b4..c5c40035093 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,5 @@ { + "entryNum": "条目数", "workspaceData": "工作空间数据", "confirmRemoveRelationField": "确定同时删除关联至 ${x} 中的字段吗？", "removeButKeepRelationField": "删除，但保留关联字段", diff --git a/app/src/protyle/render/av/view.ts b/app/src/protyle/render/av/view.ts index aa3c1a43552..d5235cd0b95 100644 --- a/app/src/protyle/render/av/view.ts +++ b/app/src/protyle/render/av/view.ts @@ -187,7 +187,7 @@ export const getViewHTML = (data: IAV) => { From 5cb56263ff0a224425b1c09b61e9611eb85835a5 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Mon, 21 Oct 2024 22:40:10 +0800 Subject: [PATCH 09/20] :lipstick: https://github.com/siyuan-note/siyuan/issues/12862 --- app/src/protyle/wysiwyg/renderBacklink.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/protyle/wysiwyg/renderBacklink.ts b/app/src/protyle/wysiwyg/renderBacklink.ts index 190e9d65c71..30221e3d1c0 100644 --- a/app/src/protyle/wysiwyg/renderBacklink.ts +++ b/app/src/protyle/wysiwyg/renderBacklink.ts @@ -101,7 +101,7 @@ export const getBacklinkHeadingMore = (moreElement: HTMLElement) => { export const genBreadcrumb = (blockPaths: IBreadcrumb[], renderFirst = false) => { if (1 > blockPaths.length) { - return ""; + return `
`; } let html = ""; From 78ebd3119e79cf99650adadcfe993650b16833fa Mon Sep 17 00:00:00 2001 From: Vanessa Date: Mon, 21 Oct 2024 22:41:07 +0800 Subject: [PATCH 10/20] :rotating_light: --- app/src/history/doc.ts | 6 +++--- app/src/history/history.ts | 2 +- app/src/plugin/loader.ts | 2 +- app/src/protyle/util/editorCommonEvent.ts | 2 +- app/src/protyle/wysiwyg/renderBacklink.ts | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/history/doc.ts b/app/src/history/doc.ts index 4c3be571d3c..3226a0f43c1 100644 --- a/app/src/history/doc.ts +++ b/app/src/history/doc.ts @@ -131,9 +131,9 @@ export const openDocHistory = (options: { dialog.destroy(); } else if (type === "rollback" && !isLoading) { getHistoryPath(target.parentElement, opElement.value, options.id, (item) => { - let dataPath = item.path; + const dataPath = item.path; isLoading = false; - let confirmTip = window.siyuan.languages.rollbackConfirm.replace("${name}", item.title) + const confirmTip = window.siyuan.languages.rollbackConfirm.replace("${name}", item.title) .replace("${time}", target.previousElementSibling.previousElementSibling.textContent.trim()); confirmDialog("⚠️ " + window.siyuan.languages.rollback, confirmTip, () => { fetchPost("/api/history/rollbackDocHistory", { @@ -147,7 +147,7 @@ export const openDocHistory = (options: { break; } else if (target.classList.contains("b3-list-item") && !isLoading) { getHistoryPath(target, opElement.value, options.id, (item) => { - let dataPath = item.path; + const dataPath = item.path; fetchPost("/api/history/getDocHistoryContent", { historyPath: dataPath, }, (response) => { diff --git a/app/src/history/history.ts b/app/src/history/history.ts index 25c25f7b23d..787195af348 100644 --- a/app/src/history/history.ts +++ b/app/src/history/history.ts @@ -539,7 +539,7 @@ const bindEvent = (app: App, element: Element, dialog?: Dialog) => { name = window.siyuan.languages.workspaceData; time = target.parentElement.querySelector("span[data-type='hCreated']").textContent.trim(); } - let confirmTip = window.siyuan.languages.rollbackConfirm.replace("${name}", name) + const confirmTip = window.siyuan.languages.rollbackConfirm.replace("${name}", name) .replace("${time}", time); confirmDialog("⚠️ " + window.siyuan.languages.rollback, confirmTip, () => { if (dataType === "assets") { diff --git a/app/src/plugin/loader.ts b/app/src/plugin/loader.ts index 81a87ca7ad6..5d7904742de 100644 --- a/app/src/plugin/loader.ts +++ b/app/src/plugin/loader.ts @@ -104,7 +104,7 @@ const updateDock = (dockItem: Config.IUILayoutDockTab[], index: number, plugin: plugin.docks[tabItem.type].config.show = tabItem.show; plugin.docks[tabItem.type].config.size = tabItem.size; if (!window.siyuan.storage[Constants.LOCAL_PLUGIN_DOCKS][plugin.name]) { - window.siyuan.storage[Constants.LOCAL_PLUGIN_DOCKS][plugin.name] = {} + window.siyuan.storage[Constants.LOCAL_PLUGIN_DOCKS][plugin.name] = {}; } window.siyuan.storage[Constants.LOCAL_PLUGIN_DOCKS][plugin.name][tabItem.type] = plugin.docks[tabItem.type].config; setStorageVal(Constants.LOCAL_PLUGIN_DOCKS, window.siyuan.storage[Constants.LOCAL_PLUGIN_DOCKS]); diff --git a/app/src/protyle/util/editorCommonEvent.ts b/app/src/protyle/util/editorCommonEvent.ts index 9dbf18c29e3..6605877f2f6 100644 --- a/app/src/protyle/util/editorCommonEvent.ts +++ b/app/src/protyle/util/editorCommonEvent.ts @@ -781,7 +781,7 @@ const dragSame = async (protyle: IProtyle, sourceElements: Element[], targetElem hasFoldHeading = true; return true; } - }) + }); if (!isCopy && (sourceElements.length > 1 || hasFoldHeading) && sourceElements[0].parentElement.classList.contains("sb") && sourceElements[0].parentElement.getAttribute("data-sb-layout") === "col") { diff --git a/app/src/protyle/wysiwyg/renderBacklink.ts b/app/src/protyle/wysiwyg/renderBacklink.ts index 30221e3d1c0..143b0bdba3f 100644 --- a/app/src/protyle/wysiwyg/renderBacklink.ts +++ b/app/src/protyle/wysiwyg/renderBacklink.ts @@ -101,7 +101,7 @@ export const getBacklinkHeadingMore = (moreElement: HTMLElement) => { export const genBreadcrumb = (blockPaths: IBreadcrumb[], renderFirst = false) => { if (1 > blockPaths.length) { - return `
`; + return '
'; } let html = ""; From 22e954c4e785558dc9dc5754f12cc99e8d5a24af Mon Sep 17 00:00:00 2001 From: Vanessa Date: Mon, 21 Oct 2024 23:18:45 +0800 Subject: [PATCH 11/20] :art: https://github.com/siyuan-note/siyuan/issues/12868 --- app/src/protyle/wysiwyg/keydown.ts | 6 ++++-- app/src/protyle/wysiwyg/remove.ts | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/protyle/wysiwyg/keydown.ts b/app/src/protyle/wysiwyg/keydown.ts index ba9f85a33c4..3740c1b6389 100644 --- a/app/src/protyle/wysiwyg/keydown.ts +++ b/app/src/protyle/wysiwyg/keydown.ts @@ -696,7 +696,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => { // 页面按向下/右箭头丢失焦点 https://ld246.com/article/1629954026096 const lastEditElement = getContenteditableElement(nodeElement); // 代码块需替换最后一个 /n https://github.com/siyuan-note/siyuan/issues/3221 - if (lastEditElement && lastEditElement.textContent.replace(/\n$/, "").length <= getSelectionOffset(lastEditElement, undefined, range).end) { + if (lastEditElement && !lastEditElement.querySelector(".emoji") && lastEditElement.textContent.replace(/\n$/, "").length <= getSelectionOffset(lastEditElement, undefined, range).end) { event.stopPropagation(); event.preventDefault(); focusByRange(range); @@ -860,7 +860,9 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => { const currentNode = range.startContainer.childNodes[range.startOffset - 1] as HTMLElement; if (position.start === 0 && ( range.startOffset === 0 || - (currentNode && currentNode.nodeType === 3 && !hasPreviousSibling(currentNode) && currentNode.innerText === "") // https://ld246.com/article/1649251218696 + (currentNode && currentNode.nodeType === 3 && !hasPreviousSibling(currentNode) && + // 需使用 textContent，文本元素没有 innerText + currentNode.textContent === "") // https://ld246.com/article/1649251218696 )) { removeBlock(protyle, nodeElement, range, "Backspace"); event.stopPropagation(); diff --git a/app/src/protyle/wysiwyg/remove.ts b/app/src/protyle/wysiwyg/remove.ts index 1869605f191..e50e8a4c6e6 100644 --- a/app/src/protyle/wysiwyg/remove.ts +++ b/app/src/protyle/wysiwyg/remove.ts @@ -389,7 +389,7 @@ export const removeBlock = (protyle: IProtyle, blockElement: Element, range: Ran focusBlock(previousLastElement, undefined, false); } else { const previousLastEditElement = getContenteditableElement(previousLastElement); - if (editableElement && editableElement.textContent !== "") { + if (editableElement && (editableElement.textContent !== "" || editableElement.querySelector(".emoji"))) { // 非空块 range.setEndAfter(editableElement.lastChild); // 数学公式回车后再删除 https://github.com/siyuan-note/siyuan/issues/3850 From 2da376c7c9623a5a5d2cee37469e13df659727d3 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 21 Oct 2024 23:31:15 +0800 Subject: [PATCH 12/20] :art: Improve database paging loading https://github.com/siyuan-note/siyuan/issues/12780 --- kernel/api/av.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kernel/api/av.go b/kernel/api/av.go index 190aab12035..de1ae7f35d5 100644 --- a/kernel/api/av.go +++ b/kernel/api/av.go @@ -560,12 +560,18 @@ func renderAttributeView(c *gin.Context) { var views []map[string]interface{} for _, v := range attrView.Views { + pSize := 10 + if nil != v.Table && av.LayoutTypeTable == v.LayoutType { + pSize = v.Table.PageSize + } + view := map[string]interface{}{ "id": v.ID, "icon": v.Icon, "name": v.Name, "hideAttrViewName": v.HideAttrViewName, "type": v.LayoutType, + "pageSize": pSize, } views = append(views, view) From 8f9df4ac3ff6b6cdaa67fdc290c7b006e7857842 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Mon, 21 Oct 2024 23:32:55 +0800 Subject: [PATCH 13/20] :art: https://github.com/siyuan-note/siyuan/issues/12867 --- app/src/protyle/toolbar/Link.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/protyle/toolbar/Link.ts b/app/src/protyle/toolbar/Link.ts index 47b6019e8a6..003f6e8fd97 100644 --- a/app/src/protyle/toolbar/Link.ts +++ b/app/src/protyle/toolbar/Link.ts @@ -45,6 +45,10 @@ export class Link extends ToolbarItem { } } } + // https://github.com/siyuan-note/siyuan/issues/12867 + if (!dataHref && clipText.startsWith("assets/")) { + dataHref = clipText; + } } catch (e) { console.log(e); } From f708e99a749d6029216d10e55ce28e9a41d4ffdd Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 21 Oct 2024 23:40:51 +0800 Subject: [PATCH 14/20] :art: The backlink panel no longer displays child-block references https://github.com/siyuan-note/siyuan/issues/12861 --- app/appearance/langs/de_DE.json | 2 ++ app/appearance/langs/en_US.json | 2 ++ app/appearance/langs/es_ES.json | 2 ++ app/appearance/langs/fr_FR.json | 2 ++ app/appearance/langs/he_IL.json | 2 ++ app/appearance/langs/it_IT.json | 2 ++ app/appearance/langs/ja_JP.json | 2 ++ app/appearance/langs/pl_PL.json | 2 ++ app/appearance/langs/ru_RU.json | 2 ++ app/appearance/langs/zh_CHT.json | 2 ++ app/appearance/langs/zh_CN.json | 2 ++ app/src/config/editor.ts | 9 +++++++++ app/src/config/search.ts | 5 +++-- app/src/layout/dock/Backlink.ts | 1 - app/src/mobile/settings/editor.ts | 9 +++++++++ app/src/protyle/util/reload.ts | 1 - app/src/types/config.d.ts | 4 ++++ kernel/api/ref.go | 8 ++++---- kernel/conf/editor.go | 2 ++ 19 files changed, 53 insertions(+), 8 deletions(-) diff --git a/app/appearance/langs/de_DE.json b/app/appearance/langs/de_DE.json index 67b24984df1..1eddcfb068c 100644 --- a/app/appearance/langs/de_DE.json +++ b/app/appearance/langs/de_DE.json @@ -1,4 +1,6 @@ { + "backlinkContainChildren": "Enthalten Rückverweise untergeordnete Blöcke", + "backlinkContainChildrenTip": "Wenn aktiviert, werden untergeordnete Blöcke in die Berechnung der Rückverweise einbezogen", "entryNum": "Anzahl der Einträge", "workspaceData": "Arbeitsbereichsdaten", "confirmRemoveRelationField": "Sind Sie sicher, dass Sie das Feld, das mit ${x} verknüpft ist, löschen möchten?", diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 58608e0fb9c..570217c9f9b 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,6 @@ { + "backlinkContainChildren": "Do backlinks contain child blocks", + "backlinkContainChildrenTip": "When enabled, child blocks will be included in the backlink calculation", "entryNum": "Number of entries", "workspaceData": "Workspace data", "confirmRemoveRelationField": "Are you sure you want to delete the field associated with ${x}?", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index e7d7b939d3c..426978c5e55 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,6 @@ { + "backlinkContainChildren": "¿Los enlaces inversos contienen bloques secundarios?", + "backlinkContainChildrenTip": "Una vez habilitado, los bloques secundarios se incluirán en el cálculo de los enlaces inversos", "entryNum": "Número de entradas", "workspaceData": "Datos del espacio de trabajo", "confirmRemoveRelationField": "¿Está seguro de que desea eliminar el campo asociado a ${x}?", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index e4aff93eb7d..c45c368916d 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,6 @@ { + "backlinkContainChildren": "Les liens retour contiennent-ils des sous-blocs", + "backlinkContainChildrenTip": "Une fois activé, les sous-blocs seront inclus dans le calcul des liens retour", "entryNum": "Nombre d'entrées", "workspaceData": "Données de l'espace de travail", "confirmRemoveRelationField": "Êtes-vous sûr de vouloir supprimer le champ associé à ${x}?", diff --git a/app/appearance/langs/he_IL.json b/app/appearance/langs/he_IL.json index 5aac13d944e..b5e218ff5e3 100644 --- a/app/appearance/langs/he_IL.json +++ b/app/appearance/langs/he_IL.json @@ -1,4 +1,6 @@ { + "backlinkContainChildren": "האם קישורים חוזרים כוללים בלוקים משניים", + "backlinkContainChildrenTip": "לאחר ההפעלה, בלוקים משניים ייכללו בחישוב הקישורים החוזרים", "entryNum": "מספר ערכים", "workspaceData": "נתוני סביבת עבודה", "confirmRemoveRelationField": "האם אתה בטוח שברצונך למחוק את השדה המשויך ל-${x}?", diff --git a/app/appearance/langs/it_IT.json b/app/appearance/langs/it_IT.json index efbc4bfd7e9..b841cf6c9fa 100644 --- a/app/appearance/langs/it_IT.json +++ b/app/appearance/langs/it_IT.json @@ -1,4 +1,6 @@ { + "backlinkContainChildren": "I backlink contengono blocchi figli", + "backlinkContainChildrenTip": "Dopo l'attivazione, i blocchi figli saranno inclusi nel calcolo dei backlink", "entryNum": "Numero di voci", "workspaceData": "Dati dello spazio di lavoro", "confirmRemoveRelationField": "Sei sicuro di voler eliminare il campo associato a ${x}?", diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json index 35bea10f442..9f4ea776792 100644 --- a/app/appearance/langs/ja_JP.json +++ b/app/appearance/langs/ja_JP.json @@ -1,4 +1,6 @@ { + "backlinkContainChildren": "バックリンクに子ブロックを含めるかどうか", + "backlinkContainChildrenTip": "有効にすると、子ブロックがバックリンク計算に含まれます", "entryNum": "エントリ数", "workspaceData": "ワークスペースデータ", "confirmRemoveRelationField": "${x} に関連するフィールドを同時に削除してもよろしいですか？", diff --git a/app/appearance/langs/pl_PL.json b/app/appearance/langs/pl_PL.json index b9689c6b162..23213ee0bc3 100644 --- a/app/appearance/langs/pl_PL.json +++ b/app/appearance/langs/pl_PL.json @@ -1,4 +1,6 @@ { + "backlinkContainChildren": "Czy linki zwrotne zawierają bloki podrzędne", + "backlinkContainChildrenTip": "Po włączeniu bloki podrzędne zostaną uwzględnione w obliczeniach linków zwrotnych", "entryNum": "Количество записей", "workspaceData": "Dane przestrzeni roboczej", "confirmRemoveRelationField": "Czy na pewno chcesz usunąć pole powiązane z ${x}?", diff --git a/app/appearance/langs/ru_RU.json b/app/appearance/langs/ru_RU.json index d36786f7f5a..82e62035d38 100644 --- a/app/appearance/langs/ru_RU.json +++ b/app/appearance/langs/ru_RU.json @@ -1,4 +1,6 @@ { + "backlinkContainChildren": "Включать ли дочерние блоки в обратные ссылки", + "backlinkContainChildrenTip": "После включения дочерние блоки будут включены в расчет обратных ссылок", "entryNum": "Количество записей", "workspaceData": "Данные рабочей области", "confirmRemoveRelationField": "Вы уверены, что хотите удалить поле, связанное с ${x}?", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 33697abd5e4..041315fe73f 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,6 @@ { + "backlinkContainChildren": "反向鏈接包含子塊", + "backlinkContainChildrenTip": "啟用後子塊將被納入到反向鏈接計算中", "entryNum": "條目數", "workspaceData": "工作空間數據", "confirmRemoveRelationField": "確定同時刪除關聯至 ${x} 中的字段嗎？", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index c5c40035093..d8884343f1b 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,6 @@ { + "backlinkContainChildren": "反向链接包含子块", + "backlinkContainChildrenTip": "启用后子块将被纳入到反向链接计算中", "entryNum": "条目数", "workspaceData": "工作空间数据", "confirmRemoveRelationField": "确定同时删除关联至 ${x} 中的字段吗？", diff --git a/app/src/config/editor.ts b/app/src/config/editor.ts index 5c526f81e6e..7208d34e14d 100644 --- a/app/src/config/editor.ts +++ b/app/src/config/editor.ts @@ -191,6 +191,14 @@ export const editor = { +
${window.siyuan.languages.generateHistory} @@ -386,6 +394,7 @@ export const editor = { blockRefDynamicAnchorTextMaxLen: parseInt((editor.element.querySelector("#blockRefDynamicAnchorTextMaxLen") as HTMLInputElement).value), backlinkExpandCount: parseInt((editor.element.querySelector("#backlinkExpandCount") as HTMLInputElement).value), backmentionExpandCount: parseInt((editor.element.querySelector("#backmentionExpandCount") as HTMLInputElement).value), + backlinkContainChildren: (editor.element.querySelector("#backlinkContainChildren") as HTMLInputElement).checked, dynamicLoadBlocks: dynamicLoadBlocks, codeLigatures: (editor.element.querySelector("#codeLigatures") as HTMLInputElement).checked, codeTabSpaces: parseInt((editor.element.querySelector("#codeTabSpaces") as HTMLInputElement).value), diff --git a/app/src/config/search.ts b/app/src/config/search.ts index 8d3ffd65898..23e89487596 100644 --- a/app/src/config/search.ts +++ b/app/src/config/search.ts @@ -24,8 +24,9 @@ export const initConfigSearch = (element: HTMLElement, app: App) => { "onlySearchForDoc", "onlySearchForDocTip", "dynamicLoadBlocks", "dynamicLoadBlocksTip", "fontSizeScrollZoom", "fontSizeScrollZoomTip", "listItemDotNumberClickFocus", "listItemDotNumberClickFocusTip", "editorMarkdownInlineAsterisk", "editorMarkdownInlineUnderscore", "editorMarkdownInlineSup", "editorMarkdownInlineSupTip", "editorMarkdownInlineSub", "editorMarkdownInlineSubTip", - "editorMarkdownInlineTag", "editorMarkdownInlineTagTip", "editorMarkdownInlineMath", "editorMarkdownInlineMathTip", - "allowHTMLBLockScript", "allowHTMLBLockScriptTip", + "editorMarkdownInlineTag", "editorMarkdownInlineTagTip", "editorMarkdownInlineMath", "editorMarkdownInlineMathTip", "editorMarkdownInlineStrikethrough", "editorMarkdownInlineStrikethroughTip", + "allowHTMLBLockScript", "allowHTMLBLockScriptTip", "backlinkExpandCount", "backlinkExpandTip", "backmentionExpandCount", "backmentionExpandTip", + "backlinkContainChildren", "backlinkContainChildrenTip" ]), // 文档树 diff --git a/app/src/layout/dock/Backlink.ts b/app/src/layout/dock/Backlink.ts index 9590fccf1af..08f316b7fb6 100644 --- a/app/src/layout/dock/Backlink.ts +++ b/app/src/layout/dock/Backlink.ts @@ -437,7 +437,6 @@ export class Backlink extends Model { defID: this.blockId, refTreeID: docId, keyword: isMention ? this.inputsElement[1].value : this.inputsElement[0].value, - containChildren: false }, (response) => { svgElement.removeAttribute("disabled"); svgElement.classList.add("b3-list-item__arrow--open"); diff --git a/app/src/mobile/settings/editor.ts b/app/src/mobile/settings/editor.ts index 1db63aa3332..32e56c654ec 100644 --- a/app/src/mobile/settings/editor.ts +++ b/app/src/mobile/settings/editor.ts @@ -45,6 +45,7 @@ const setEditor = (modelMainElement: Element) => { window.siyuan.config.editor.blockRefDynamicAnchorTextMaxLen = parseInt((modelMainElement.querySelector("#blockRefDynamicAnchorTextMaxLen") as HTMLInputElement).value); window.siyuan.config.editor.backlinkExpandCount = parseInt((modelMainElement.querySelector("#backlinkExpandCount") as HTMLInputElement).value); window.siyuan.config.editor.backmentionExpandCount = parseInt((modelMainElement.querySelector("#backmentionExpandCount") as HTMLInputElement).value); + window.siyuan.config.editor.backlinkContainChildren = (modelMainElement.querySelector("#backlinkContainChildren") as HTMLInputElement).checked; window.siyuan.config.editor.codeLigatures = (modelMainElement.querySelector("#codeLigatures") as HTMLInputElement).checked; window.siyuan.config.editor.codeTabSpaces = parseInt((modelMainElement.querySelector("#codeTabSpaces") as HTMLInputElement).value); window.siyuan.config.editor.fontSize = parseInt((modelMainElement.querySelector("#fontSize") as HTMLInputElement).value); @@ -220,6 +221,14 @@ export const initEditor = () => {
${window.siyuan.languages.backmentionExpandTip}
+
${window.siyuan.languages.generateHistory} diff --git a/app/src/protyle/util/reload.ts b/app/src/protyle/util/reload.ts index 47b699a610c..b39fd91a4ac 100644 --- a/app/src/protyle/util/reload.ts +++ b/app/src/protyle/util/reload.ts @@ -44,7 +44,6 @@ export const reloadProtyle = (protyle: IProtyle, focus: boolean, updateReadonly? defID: protyle.element.getAttribute("data-defid"), refTreeID: protyle.block.rootID, keyword: isMention ? inputsElement[1].value : inputsElement[0].value, - containChildren: false }, response => { protyle.options.backlinkData = isMention ? response.data.backmentions : response.data.backlinks; renderBacklink(protyle, protyle.options.backlinkData); diff --git a/app/src/types/config.d.ts b/app/src/types/config.d.ts index 14c34d48bb1..9bebba93fc6 100644 --- a/app/src/types/config.d.ts +++ b/app/src/types/config.d.ts @@ -341,6 +341,10 @@ declare namespace Config { * The default number of backlinks to mention */ backmentionExpandCount: number; + /** + * Whether the backlink contains children + */ + backlinkContainChildren: boolean; /** * The maximum length of the dynamic anchor text for block references */ diff --git a/kernel/api/ref.go b/kernel/api/ref.go index 24939b7e9a1..a912ce561ca 100644 --- a/kernel/api/ref.go +++ b/kernel/api/ref.go @@ -51,7 +51,7 @@ func getBackmentionDoc(c *gin.Context) { defID := arg["defID"].(string) refTreeID := arg["refTreeID"].(string) keyword := arg["keyword"].(string) - containChildren := false + containChildren := model.Conf.Editor.BacklinkContainChildren if val, ok := arg["containChildren"]; ok { containChildren = val.(bool) } @@ -73,7 +73,7 @@ func getBacklinkDoc(c *gin.Context) { defID := arg["defID"].(string) refTreeID := arg["refTreeID"].(string) keyword := arg["keyword"].(string) - containChildren := false + containChildren := model.Conf.Editor.BacklinkContainChildren if val, ok := arg["containChildren"]; ok { containChildren = val.(bool) } @@ -109,7 +109,7 @@ func getBacklink2(c *gin.Context) { if nil != mentionSortArg { mentionSort, _ = strconv.Atoi(mentionSortArg.(string)) } - containChildren := false + containChildren := model.Conf.Editor.BacklinkContainChildren if val, ok := arg["containChildren"]; ok { containChildren = val.(bool) } @@ -145,7 +145,7 @@ func getBacklink(c *gin.Context) { if nil != arg["beforeLen"] { beforeLen = int(arg["beforeLen"].(float64)) } - containChildren := false + containChildren := model.Conf.Editor.BacklinkContainChildren if val, ok := arg["containChildren"]; ok { containChildren = val.(bool) } diff --git a/kernel/conf/editor.go b/kernel/conf/editor.go index 71a5679660f..607a0e912c4 100644 --- a/kernel/conf/editor.go +++ b/kernel/conf/editor.go @@ -51,6 +51,7 @@ type Editor struct { OnlySearchForDoc bool `json:"onlySearchForDoc"` // 是否启用 [[ 仅搜索文档块 BacklinkExpandCount int `json:"backlinkExpandCount"` // 反向链接默认展开数量 BackmentionExpandCount int `json:"backmentionExpandCount"` // 反链提及默认展开数量 + BacklinkContainChildren bool `json:"backlinkContainChildren"` // 反向链接是否包含子块进行计算 Markdown *util.Markdown `json:"markdown"` // Markdown 配置 } @@ -86,6 +87,7 @@ func NewEditor() *Editor { RTL: false, BacklinkExpandCount: 8, BackmentionExpandCount: -1, + BacklinkContainChildren: false, Markdown: util.MarkdownSettings, } } From 0d1c62a4e4f4040b9a70669d03d2686e6d530f75 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 21 Oct 2024 23:52:02 +0800 Subject: [PATCH 15/20] :bug: Fix NPE --- kernel/model/backlink.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/model/backlink.go b/kernel/model/backlink.go index 9d8af1af3a6..46129471651 100644 --- a/kernel/model/backlink.go +++ b/kernel/model/backlink.go @@ -96,7 +96,9 @@ func GetBackmentionDoc(defID, refTreeID, keyword string, containChildren bool) ( trees := filesys.LoadTrees(mentionBlockIDs) for id, tree := range trees { backlink := buildBacklink(id, tree, mentionKeywords, luteEngine) - ret = append(ret, backlink) + if nil != backlink { + ret = append(ret, backlink) + } } return } @@ -133,7 +135,9 @@ func GetBacklinkDoc(defID, refTreeID, keyword string, containChildren bool) (ret keywords = append(keywords, keyword) } backlink := buildBacklink(linkRef.ID, refTree, keywords, luteEngine) - ret = append(ret, backlink) + if nil != backlink { + ret = append(ret, backlink) + } } return } From 817a11052728e3c85af514723a1a0e7479fe4709 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 21 Oct 2024 23:52:10 +0800 Subject: [PATCH 16/20] :memo: Update changelogs --- app/changelogs/v3.1.10/v3.1.10.md | 6 ++++-- app/changelogs/v3.1.10/v3.1.10_zh_CHT.md | 8 +++++--- app/changelogs/v3.1.10/v3.1.10_zh_CN.md | 6 ++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/changelogs/v3.1.10/v3.1.10.md b/app/changelogs/v3.1.10/v3.1.10.md index 42e7652f341..10df390eb0d 100644 --- a/app/changelogs/v3.1.10/v3.1.10.md +++ b/app/changelogs/v3.1.10/v3.1.10.md @@ -2,7 +2,7 @@ This version improves database performance and user interface details. -In addition, we have also improved the backlink panel logic and no longer include sub-blocks in the calculation, which helps to display backlinks more accurately. +In addition, we have also improved the backlink panel details to support excluding child-blocks from backlink calculations, which helps to display backlinks more accurately. ## Changelogs @@ -13,6 +13,7 @@ Below are the detailed changes in this version. * [Improve interaction when deleting two-way relation field in a database](https://github.com/siyuan-note/siyuan/issues/11252) * [Improve plugin dock position persistence](https://github.com/siyuan-note/siyuan/issues/11931) * [Supports disabling Markdown `~~` syntax input](https://github.com/siyuan-note/siyuan/issues/12641) +* [Improve database paging loading](https://github.com/siyuan-note/siyuan/issues/12780) * [WebDAV/S3 data sync and backup support configurable concurrent requests](https://github.com/siyuan-note/siyuan/issues/12798) * [Improve the logic of multiple selected blocks forming a super block](https://github.com/siyuan-note/siyuan/issues/12809) * [Browser clipping extension sends no more scrolling pages](https://github.com/siyuan-note/siyuan/issues/12817) @@ -22,8 +23,9 @@ Below are the detailed changes in this version. * [Improve database relation & rollup field loading performance](https://github.com/siyuan-note/siyuan/issues/12835) * [Improve user interface](https://github.com/siyuan-note/siyuan/issues/12848) * [Refresh doc tree after data sync](https://github.com/siyuan-note/siyuan/issues/12860) -* [The backlink panel no longer displays child-block references](https://github.com/siyuan-note/siyuan/issues/12861) +* [Support child-blocks not being included in the backlink calculation](https://github.com/siyuan-note/siyuan/issues/12861) * [The backlink panel no longer displays breadcrumbs of the first-level blocks](https://github.com/siyuan-note/siyuan/issues/12862) +* [Improve custom emojis at the beginning of the block](https://github.com/siyuan-note/siyuan/issues/12868) ### Bugfix diff --git a/app/changelogs/v3.1.10/v3.1.10_zh_CHT.md b/app/changelogs/v3.1.10/v3.1.10_zh_CHT.md index dd0f3b05e91..a99c416d623 100644 --- a/app/changelogs/v3.1.10/v3.1.10_zh_CHT.md +++ b/app/changelogs/v3.1.10/v3.1.10_zh_CHT.md @@ -2,7 +2,7 @@ 此版本改進了資料庫效能和使用者介面細節。 -另外，我們也改進了反鏈面板邏輯，不再將子塊納入計算，這有助於更精確地顯示反鏈。 +另外，我們也改進了反鏈面板細節，支援子區塊不納入反鏈計算，這有助於更精確地顯示反鏈。 ## 變更記錄 @@ -13,6 +13,7 @@ * [改進刪除資料庫中雙向關聯欄位時的互動](https://github.com/siyuan-note/siyuan/issues/11252) * [改進插件停靠列位置的持久化](https://github.com/siyuan-note/siyuan/issues/11931) * [支援禁用 Markdown `~~` 語法輸入](https://github.com/siyuan-note/siyuan/issues/12641) +* [改進資料庫分頁載入](https://github.com/siyuan-note/siyuan/issues/12780) * [WebDAV/S3 資料同步與備份支援設定並發請求數](https://github.com/siyuan-note/siyuan/issues/12798) * [改進多選塊形成超級塊的邏輯](https://github.com/siyuan-note/siyuan/issues/12809) * [瀏覽器剪藏擴充功能不再需要捲動頁面](https://github.com/siyuan-note/siyuan/issues/12817) @@ -22,8 +23,9 @@ * [改進資料庫關聯和匯總欄位載入效能](https://github.com/siyuan-note/siyuan/issues/12835) * [改進使用者介面](https://github.com/siyuan-note/siyuan/issues/12848) * [資料同步後刷新文件樹](https://github.com/siyuan-note/siyuan/issues/12860) -* [反向連結面板不再顯示子塊引用](https://github.com/siyuan-note/siyuan/issues/12861) +* [支援子區塊不納入反鏈計算](https://github.com/siyuan-note/siyuan/issues/12861) * [反向連結面板不再顯示一一級塊的麵包屑](https://github.com/siyuan-note/siyuan/issues/12862) +* [改進區塊開始處的自訂表情](https://github.com/siyuan-note/siyuan/issues/12868) ### 修復缺陷 @@ -36,4 +38,4 @@ ## 下載 * [B3log](https://b3log.org/siyuan/download.html) -* [GitHub](https://github.com/siyuan-note/siyuan/releases) +* [GitHub](https://github.com/siyuan-note/siyuan/releases) \ No newline at end of file diff --git a/app/changelogs/v3.1.10/v3.1.10_zh_CN.md b/app/changelogs/v3.1.10/v3.1.10_zh_CN.md index b1c731a47d6..92f6a7439f4 100644 --- a/app/changelogs/v3.1.10/v3.1.10_zh_CN.md +++ b/app/changelogs/v3.1.10/v3.1.10_zh_CN.md @@ -2,7 +2,7 @@ 该版本改进了数据库性能和用户界面细节。 -另外，我们也改进了反链面板逻辑，不再将子块纳入计算，这有助于更加精确地显示反链。 +另外，我们也改进了反链面板细节，支持子块不纳入反链计算，这有助于更加精确地显示反链。 ## 变更记录 @@ -13,6 +13,7 @@ * [改进删除数据库中双向关联字段时的交互](https://github.com/siyuan-note/siyuan/issues/11252) * [改进插件停靠栏位置的持久化](https://github.com/siyuan-note/siyuan/issues/11931) * [支持禁用 Markdown `~~` 语法输入](https://github.com/siyuan-note/siyuan/issues/12641) +* [改进数据库分页加载](https://github.com/siyuan-note/siyuan/issues/12780) * [WebDAV/S3 数据同步和备份支持配置并发请求数](https://github.com/siyuan-note/siyuan/issues/12798) * [改进多选块形成超级块的逻辑](https://github.com/siyuan-note/siyuan/issues/12809) * [浏览器剪藏扩展不再需要滚动页面](https://github.com/siyuan-note/siyuan/issues/12817) @@ -22,8 +23,9 @@ * [改进数据库关联和汇总字段加载性能](https://github.com/siyuan-note/siyuan/issues/12835) * [改进用户界面](https://github.com/siyuan-note/siyuan/issues/12848) * [数据同步后刷新文档树](https://github.com/siyuan-note/siyuan/issues/12860) -* [反向链接面板不再显示子块引用](https://github.com/siyuan-note/siyuan/issues/12861) +* [支持子块不纳入反链计算](https://github.com/siyuan-note/siyuan/issues/12861) * [反向链接面板不再显示一级块的面包屑](https://github.com/siyuan-note/siyuan/issues/12862) +* [改进块开始处的自定义表情](https://github.com/siyuan-note/siyuan/issues/12868) ### 修复缺陷 From 66f711d48d8f0e149a968d4c33b2b1805c4470b3 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Mon, 21 Oct 2024 23:53:58 +0800 Subject: [PATCH 17/20] :lipstick: https://github.com/siyuan-note/siyuan/issues/12862 --- app/src/protyle/wysiwyg/renderBacklink.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/protyle/wysiwyg/renderBacklink.ts b/app/src/protyle/wysiwyg/renderBacklink.ts index 143b0bdba3f..ff7c6cbaeba 100644 --- a/app/src/protyle/wysiwyg/renderBacklink.ts +++ b/app/src/protyle/wysiwyg/renderBacklink.ts @@ -16,7 +16,7 @@ export const renderBacklink = (protyle: IProtyle, backlinkData: { protyle.block.showAll = true; let html = ""; backlinkData.forEach(item => { - html += genBreadcrumb(item.blockPaths) + setBacklinkFold(item.dom, item.expand); + html += genBreadcrumb(item.blockPaths, false, backlinkData.length) + setBacklinkFold(item.dom, item.expand); }); protyle.wysiwyg.element.innerHTML = html; processRender(protyle.wysiwyg.element); @@ -99,9 +99,9 @@ export const getBacklinkHeadingMore = (moreElement: HTMLElement) => { moreElement.remove(); }; -export const genBreadcrumb = (blockPaths: IBreadcrumb[], renderFirst = false) => { +export const genBreadcrumb = (blockPaths: IBreadcrumb[], renderFirst: boolean, parentLength?: number) => { if (1 > blockPaths.length) { - return '
'; + return `
`; } let html = ""; From cd8f7c64a45a0f53cf078f6fa998bb526cb00264 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Tue, 22 Oct 2024 00:03:26 +0800 Subject: [PATCH 18/20] :art: https://github.com/siyuan-note/siyuan/issues/12780 --- app/src/protyle/render/av/render.ts | 6 +++++- app/src/types/index.d.ts | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts index 21d7d31b695..fa5133f3859 100644 --- a/app/src/protyle/render/av/render.ts +++ b/app/src/protyle/render/av/render.ts @@ -70,6 +70,10 @@ export const avRender = (element: Element, protyle: IProtyle, cb?: () => void, v const snapshot = protyle.options.history?.snapshot; let newViewID = e.getAttribute(Constants.CUSTOM_SY_AV_VIEW) || ""; if (typeof viewID === "string") { + const viewTabElement = e.querySelector(`.av__views > .layout-tab-bar > .item[data-id="${viewID}"]`) as HTMLElement + if (viewTabElement) { + e.dataset.pageSize = viewTabElement.dataset.page; + } newViewID = viewID; fetchPost("/api/av/setDatabaseBlockView", {id: e.dataset.nodeId, viewID}); e.setAttribute(Constants.CUSTOM_SY_AV_VIEW, newViewID); @@ -195,7 +199,7 @@ ${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value, rowIndex)} let tabHTML = ""; let viewData: IAVView; response.data.views.forEach((item: IAVView) => { - tabHTML += `
+ tabHTML += `
${item.icon ? unicode2Emoji(item.icon, "item__graphic", true) : ''} ${item.name}
`; diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index 8e27a41f9c4..b098d8817ce 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -760,6 +760,7 @@ interface IAVView { type: string icon: string hideAttrViewName: boolean + pageSize: number } interface IAVTable extends IAVView { From bc772fe4aadb7fd9e7be211bd294670e6883ac77 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 22 Oct 2024 09:43:35 +0800 Subject: [PATCH 19/20] :bookmark: Release v3.1.10 --- app/appx/AppxManifest.xml | 2 +- app/package.json | 2 +- app/src/protyle/render/av/render.ts | 2 +- kernel/util/working.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/appx/AppxManifest.xml b/app/appx/AppxManifest.xml index 63f2a001f1d..fc0dec43f17 100644 --- a/app/appx/AppxManifest.xml +++ b/app/appx/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="3.1.10.0"/> SiYuan 云南链滴科技有限公司 diff --git a/app/package.json b/app/package.json index 54423a24239..543c62ff909 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "SiYuan", - "version": "3.1.9", + "version": "3.1.10", "description": "Refactor your thinking", "homepage": "https://b3log.org/siyuan", "main": "./electron/main.js", diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts index fa5133f3859..534a32ef33d 100644 --- a/app/src/protyle/render/av/render.ts +++ b/app/src/protyle/render/av/render.ts @@ -70,7 +70,7 @@ export const avRender = (element: Element, protyle: IProtyle, cb?: () => void, v const snapshot = protyle.options.history?.snapshot; let newViewID = e.getAttribute(Constants.CUSTOM_SY_AV_VIEW) || ""; if (typeof viewID === "string") { - const viewTabElement = e.querySelector(`.av__views > .layout-tab-bar > .item[data-id="${viewID}"]`) as HTMLElement + const viewTabElement = e.querySelector(`.av__views > .layout-tab-bar > .item[data-id="${viewID}"]`) as HTMLElement; if (viewTabElement) { e.dataset.pageSize = viewTabElement.dataset.page; } diff --git a/kernel/util/working.go b/kernel/util/working.go index c79278c1cfd..60c57d8fbd9 100644 --- a/kernel/util/working.go +++ b/kernel/util/working.go @@ -44,7 +44,7 @@ import ( var Mode = "prod" const ( - Ver = "3.1.9" + Ver = "3.1.10" IsInsider = false ) From 1d0d06512e10a7cb174deb366268e831cabf014e Mon Sep 17 00:00:00 2001 From: Vanessa Date: Tue, 22 Oct 2024 09:48:26 +0800 Subject: [PATCH 20/20] :arrow_up: --- app/pnpm-lock.yaml | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index baa94c56eb2..65588c80124 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -773,8 +773,8 @@ packages: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} - browserslist@4.21.1: - resolution: {integrity: sha512-Nq8MFCSrnJXSc88yliwlzQe3qNe3VntIjhsArW9IJOEPSHNx23FalwApUVbzAWABLhYJJ7y8AynWI/XM8OdfjQ==} + browserslist@4.24.0: + resolution: {integrity: sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true @@ -1292,10 +1292,6 @@ packages: filelist@1.0.4: resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==} - fill-range@7.0.1: - resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} - engines: {node: '>=8'} - fill-range@7.1.1: resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} engines: {node: '>=8'} @@ -3350,7 +3346,7 @@ snapshots: app-builder-bin@5.0.0-alpha.7: {} - app-builder-lib@24.13.3(dmg-builder@24.13.3(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)))(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)): + app-builder-lib@24.13.3(dmg-builder@24.13.3(electron-builder-squirrel-windows@25.0.5))(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)): dependencies: '@develar/schema-utils': 2.6.5 '@electron/notarize': 2.2.1 @@ -3364,7 +3360,7 @@ snapshots: builder-util-runtime: 9.2.4 chromium-pickle-js: 0.2.0 debug: 4.3.4 - dmg-builder: 24.13.3(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)) + dmg-builder: 24.13.3(electron-builder-squirrel-windows@25.0.5) ejs: 3.1.10 electron-builder-squirrel-windows: 25.0.5(dmg-builder@24.13.3) electron-publish: 24.13.1 @@ -3384,7 +3380,7 @@ snapshots: transitivePeerDependencies: - supports-color - app-builder-lib@25.0.5(dmg-builder@24.13.3(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)))(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)): + app-builder-lib@25.0.5(dmg-builder@24.13.3(electron-builder-squirrel-windows@25.0.5))(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)): dependencies: '@develar/schema-utils': 2.6.5 '@electron/notarize': 2.3.2 @@ -3399,7 +3395,7 @@ snapshots: builder-util-runtime: 9.2.5 chromium-pickle-js: 0.2.0 debug: 4.3.4 - dmg-builder: 24.13.3(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)) + dmg-builder: 24.13.3(electron-builder-squirrel-windows@25.0.5) ejs: 3.1.10 electron-builder-squirrel-windows: 25.0.5(dmg-builder@24.13.3) electron-publish: 25.0.3 @@ -3654,7 +3650,7 @@ snapshots: chokidar@3.5.3: dependencies: anymatch: 3.1.2 - braces: 3.0.2 + braces: 3.0.3 glob-parent: 5.1.2 is-binary-path: 2.1.0 is-glob: 4.0.3 @@ -3864,9 +3860,9 @@ snapshots: dependencies: path-type: 4.0.0 - dmg-builder@24.13.3(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)): + dmg-builder@24.13.3(electron-builder-squirrel-windows@25.0.5): dependencies: - app-builder-lib: 24.13.3(dmg-builder@24.13.3(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)))(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)) + app-builder-lib: 24.13.3(dmg-builder@24.13.3(electron-builder-squirrel-windows@25.0.5))(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)) builder-util: 24.13.1 builder-util-runtime: 9.2.4 fs-extra: 10.1.0 @@ -3941,7 +3937,7 @@ snapshots: electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3): dependencies: - app-builder-lib: 25.0.5(dmg-builder@24.13.3(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)))(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)) + app-builder-lib: 25.0.5(dmg-builder@24.13.3(electron-builder-squirrel-windows@25.0.5))(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)) archiver: 5.3.2 builder-util: 25.0.3 fs-extra: 10.1.0 @@ -3952,11 +3948,11 @@ snapshots: electron-builder@24.13.3(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)): dependencies: - app-builder-lib: 24.13.3(dmg-builder@24.13.3(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)))(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)) + app-builder-lib: 24.13.3(dmg-builder@24.13.3(electron-builder-squirrel-windows@25.0.5))(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)) builder-util: 24.13.1 builder-util-runtime: 9.2.4 chalk: 4.1.2 - dmg-builder: 24.13.3(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)) + dmg-builder: 24.13.3(electron-builder-squirrel-windows@25.0.5) fs-extra: 10.1.0 is-ci: 3.0.1 lazy-val: 1.0.5 @@ -4206,10 +4202,6 @@ snapshots: dependencies: minimatch: 5.1.6 - fill-range@7.0.1: - dependencies: - to-regex-range: 5.0.1 - fill-range@7.1.1: dependencies: to-regex-range: 5.0.1