Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 00:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2022-12-11 00:21:01 +08:00
commit 9d9e0c07e8
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/file.go
View file

@ -660,7 +660,7 @@ func GetDoc(startID, endID, id string, index int, keyword string, mode int, size
luteEngine.RenderOptions.NodeIndexStart = index
dom = luteEngine.Tree2BlockDOM(subTree, luteEngine.RenderOptions)
SetRecentDocByTree(tree)
SetRecentDocByTree(id, tree)
return
}

22
kernel/model/storage.go
View file

@ -29,12 +29,12 @@ import (
)
type RecentDoc struct {
RootID string `json:"rootID"`
Icon string `json:"icon"`
Title string `json:"title"`
ScrollAttr string `json:"scrollAttr"`
Mode string `json:"mode"`
Action string `json:"action"`
RootID string `json:"rootID"`
ID string `json:"id"`
Icon string `json:"icon"`
Title string `json:"title"`
Mode string `json:"mode"`
Action string `json:"action"`
}
var recentDocLock = sync.Mutex{}
@ -63,12 +63,12 @@ func RemoveRecentDoc(ids []string) {
return
}
func SetRecentDocByTree(tree *parse.Tree) {
func SetRecentDocByTree(id string, tree *parse.Tree) {
recentDoc := &RecentDoc{
RootID: tree.Root.ID,
Icon: tree.Root.IALAttr("icon"),
Title: tree.Root.IALAttr("title"),
ScrollAttr: tree.Root.IALAttr("scroll"),
RootID: tree.Root.ID,
ID: id,
Icon: tree.Root.IALAttr("icon"),
Title: tree.Root.IALAttr("title"),
}
SetRecentDoc(recentDoc)