From 3c0c24e3a7084b4d690eaf0c9af3b7ad06921708 Mon Sep 17 00:00:00 2001 From: Jeffrey Chen <78434827+TCOTC@users.noreply.github.com> Date: Fri, 16 Aug 2024 20:34:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=8C=89=E9=92=AE=E7=9A=84?= =?UTF-8?q?=E6=82=AC=E6=B5=AE=E6=8F=90=E7=A4=BA=E6=96=87=E6=A1=88=20(#1224?= =?UTF-8?q?0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update menu.ts * Revert "Update menu.ts" This reverts commit 9cf56a2c7b8d3e0bacb71a19bec74472773f38f7. * 更新文案 --- app/appearance/langs/en_US.json | 2 +- app/appearance/langs/es_ES.json | 2 +- app/appearance/langs/fr_FR.json | 2 +- app/appearance/langs/ja_JP.json | 2 +- app/appearance/langs/zh_CHT.json | 2 +- app/appearance/langs/zh_CN.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 5cf1a3070..81c0bf5fc 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -423,7 +423,7 @@ "sortByRankDesc": "Relevance DESC", "sortByRankAsc": "Relevance ASC", "saveCriterion": "Save query criteria", - "useCriterion": "Search criteria will be saved for next query", + "useCriterion": "The next query will no longer use the current query criteria", "removeCriterion": "Remove query criteria", "group": "Group", "noGroupBy": "No grouping", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 57acb711a..f0a110387 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -423,7 +423,7 @@ "sortByRankDesc": "Relevancia DESC", "sortByRankAsc": "Relevancia ASC", "saveCriterion": "Guardar criterios de consulta", - "useCriterion": "Los criterios de búsqueda se guardarán para la siguiente consulta", + "useCriterion": "Las condiciones de consulta actuales ya no se utilizarán para la siguiente consulta", "removeCriterion": "Eliminar criterios de consulta", "grupo": "Grupo", "noGroupBy": "Sin agrupar", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index d403d1061..8090ef021 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -423,7 +423,7 @@ "sortByRankDesc": "DESC de pertinence", "sortByRankAsc": "ASC de pertinence", "saveCriterion": "Enregistrer les critères de requête", - "useCriterion": "Les critères de recherche seront enregistrés pour la prochaine requête", + "useCriterion": "Les conditions de requête actuelles ne seront plus utilisées pour la prochaine requête", "removeCriterion": "Supprimer les critères de requête", "groupe": "Groupe", "noGroupBy": "Aucun regroupement", diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json index 49f4edc9d..427b1c342 100644 --- a/app/appearance/langs/ja_JP.json +++ b/app/appearance/langs/ja_JP.json @@ -423,7 +423,7 @@ "sortByRankDesc": "関連性 (降順)", "sortByRankAsc": "関連性 (昇順)", "saveCriterion": "検索条件を保存", - "useCriterion": "検索条件は次回の検索のために保存されます", + "useCriterion": "次回の検索条件を現在の検索条件で使用しない", "removeCriterion": "検索条件を削除", "group": "グループ ", "noGroupBy": "グループ化なし", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 1b99d3e5d..ee8079a21 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -423,7 +423,7 @@ "sortByRankDesc": "按相關度降序", "sortByRankAsc": "按相關度升序", "saveCriterion": "保存查詢條件", - "useCriterion": "搜尋條件將保存到下次查詢中", + "useCriterion": "下次查詢不再使用目前查詢條件", "removeCriterion": "清空查詢條件", "group": "分組", "noGroupBy": "不分組", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index bb5ebb151..f429b4f8a 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -423,7 +423,7 @@ "sortByRankDesc": "按相关度降序", "sortByRankAsc": "按相关度升序", "saveCriterion": "保存查询条件", - "useCriterion": "搜索条件将保存到下一次查询中", + "useCriterion": "下次查询不再使用当前查询条件", "removeCriterion": "清空查询条件", "group": "分组", "noGroupBy": "不分组", From f5e5816997b13f5b7ecfecdd16e7a55ad3561301 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Fri, 16 Aug 2024 20:49:13 +0800 Subject: [PATCH 2/2] :technologist: Improve kernel API getChildBlocks https://github.com/siyuan-note/siyuan/issues/12260 https://github.com/siyuan-note/siyuan/issues/8249 --- kernel/model/block.go | 44 ++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/kernel/model/block.go b/kernel/model/block.go index defd002ad..7fec9f204 100644 --- a/kernel/model/block.go +++ b/kernel/model/block.go @@ -636,9 +636,11 @@ func GetBlockKramdown(id string) (ret string) { } type ChildBlock struct { - ID string `json:"id"` - Type string `json:"type"` - SubType string `json:"subType,omitempty"` + ID string `json:"id"` + Type string `json:"type"` + SubType string `json:"subType,omitempty"` + Content string `json:"content,omitempty"` + Markdown string `json:"markdown,omitempty"` } func GetChildBlocks(id string) (ret []*ChildBlock) { @@ -660,10 +662,13 @@ func GetChildBlocks(id string) (ret []*ChildBlock) { if ast.NodeHeading == node.Type { children := treenode.HeadingChildren(node) for _, c := range children { + block := sql.BuildBlockFromNode(c, tree) ret = append(ret, &ChildBlock{ - ID: c.ID, - Type: treenode.TypeAbbr(c.Type.String()), - SubType: treenode.SubTypeAbbr(c), + ID: c.ID, + Type: treenode.TypeAbbr(c.Type.String()), + SubType: treenode.SubTypeAbbr(c), + Content: block.Content, + Markdown: block.Markdown, }) } return @@ -678,10 +683,13 @@ func GetChildBlocks(id string) (ret []*ChildBlock) { continue } + block := sql.BuildBlockFromNode(c, tree) ret = append(ret, &ChildBlock{ - ID: c.ID, - Type: treenode.TypeAbbr(c.Type.String()), - SubType: treenode.SubTypeAbbr(c), + ID: c.ID, + Type: treenode.TypeAbbr(c.Type.String()), + SubType: treenode.SubTypeAbbr(c), + Content: block.Content, + Markdown: block.Markdown, }) } return @@ -707,10 +715,13 @@ func GetTailChildBlocks(id string, n int) (ret []*ChildBlock) { children := treenode.HeadingChildren(node) for i := len(children) - 1; 0 <= i; i-- { c := children[i] + block := sql.BuildBlockFromNode(c, tree) ret = append(ret, &ChildBlock{ - ID: c.ID, - Type: treenode.TypeAbbr(c.Type.String()), - SubType: treenode.SubTypeAbbr(c), + ID: c.ID, + Type: treenode.TypeAbbr(c.Type.String()), + SubType: treenode.SubTypeAbbr(c), + Content: block.Content, + Markdown: block.Markdown, }) if n == len(ret) { return @@ -728,10 +739,13 @@ func GetTailChildBlocks(id string, n int) (ret []*ChildBlock) { continue } + block := sql.BuildBlockFromNode(c, tree) ret = append(ret, &ChildBlock{ - ID: c.ID, - Type: treenode.TypeAbbr(c.Type.String()), - SubType: treenode.SubTypeAbbr(c), + ID: c.ID, + Type: treenode.TypeAbbr(c.Type.String()), + SubType: treenode.SubTypeAbbr(c), + Content: block.Content, + Markdown: block.Markdown, }) if n == len(ret) {