0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2024-08-16 21:03:54 +08:00
commit 4427507892
7 changed files with 35 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/appearance/langs/en_US.json
View file

@ -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",

2
app/appearance/langs/es_ES.json
View file

@ -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",

2
app/appearance/langs/fr_FR.json
View file

@ -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",

2
app/appearance/langs/ja_JP.json
View file

@ -423,7 +423,7 @@
"sortByRankDesc": "関連性 (降順)",
"sortByRankAsc": "関連性 (昇順)",
"saveCriterion": "検索条件を保存",
"useCriterion": "検索条件は次回の検索のために保存されます",
"useCriterion": "次回の検索条件を現在の検索条件で使用しない",
"removeCriterion": "検索条件を削除",
"group": "グループ ",
"noGroupBy": "グループ化なし",

2
app/appearance/langs/zh_CHT.json
View file

@ -423,7 +423,7 @@
"sortByRankDesc": "按相關度降序",
"sortByRankAsc": "按相關度升序",
"saveCriterion": "保存查詢條件",
"useCriterion": "搜尋條件將保存到下次查詢中",
"useCriterion": "下次查詢不再使用目前查詢條件",
"removeCriterion": "清空查詢條件",
"group": "分組",
"noGroupBy": "不分組",

2
app/appearance/langs/zh_CN.json
View file

@ -423,7 +423,7 @@
"sortByRankDesc": "按相关度降序",
"sortByRankAsc": "按相关度升序",
"saveCriterion": "保存查询条件",
"useCriterion": "搜索条件将保存到下一次查询中",
"useCriterion": "下次查询不再使用当前查询条件",
"removeCriterion": "清空查询条件",
"group": "分组",
"noGroupBy": "不分组",

44
kernel/model/block.go
View file

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