Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-23 18:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 数据历史文档中支持操作类型过滤 https://github.com/siyuan-note/siyuan/issues/5754

Browse source
This commit is contained in:
Liang Ding 2022-08-30 20:12:26 +08:00
parent a165cac78e
commit 84b0cf7033
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
kernel/model/history.go
View file

@ -606,20 +606,29 @@ func fromSQLHistories(sqlHistories []*sql.History) (ret []*History) {
tmpTime = unixSec
}
if tmpTime == unixSec {
items = append(items, &HistoryItem{
item := &HistoryItem{
Title: sqlHistory.Title,
Path: filepath.Join(util.HistoryDir, sqlHistory.Path),
})
}
if HistoryTypeAsset == sqlHistory.Type {
item.Path = filepath.ToSlash(strings.TrimPrefix(item.Path, util.WorkspaceDir))
}
items = append(items, item)
} else {
ret = append(ret, &History{
HCreated: time.Unix(unixSec, 0).Format("2006-01-02 15:04:05"),
Items: items,
})
items = []*HistoryItem{}
items = append(items, &HistoryItem{
item := &HistoryItem{
Title: sqlHistory.Title,
Path: filepath.Join(util.HistoryDir, sqlHistory.Path),
})
}
if HistoryTypeAsset == sqlHistory.Type {
item.Path = filepath.ToSlash(strings.TrimPrefix(item.Path, util.WorkspaceDir))
}
items = []*HistoryItem{}
items = append(items, item)
}
}
if 0 < len(items) {