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

🎨 Improve av

Browse source
This commit is contained in:
Daniel 2025-07-12 16:27:56 +08:00
parent c1fd1cebef
commit 68a7a45542
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

36
kernel/model/attribute_view_fix.go
View file

@ -17,10 +17,14 @@
package model
import (
"time"
"github.com/88250/gulu"
"github.com/88250/lute/ast"
"github.com/siyuan-note/siyuan/kernel/av"
"github.com/siyuan-note/siyuan/kernel/filesys"
"github.com/siyuan-note/siyuan/kernel/treenode"
"github.com/siyuan-note/siyuan/kernel/util"
)
func checkAttrView(attrView *av.AttributeView, view *av.View) {
@ -45,7 +49,7 @@ func checkAttrView(attrView *av.AttributeView, view *av.View) {
}
view.Sorts = tmpSorts
// 视图类型不匹配时需要订正
// 订正视图类型
for i, v := range attrView.Views {
if av.LayoutTypeGallery == v.LayoutType && nil == v.Gallery {
// 切换为卡片视图时可能没有初始化卡片实例 https://github.com/siyuan-note/siyuan/issues/15122
@ -59,6 +63,36 @@ func checkAttrView(attrView *av.AttributeView, view *av.View) {
}
}
now := util.CurrentTimeMillis()
// 订正字段类型
for _, kv := range attrView.KeyValues {
for _, v := range kv.Values {
if v.Type != kv.Key.Type {
v.Type = kv.Key.Type
if av.KeyTypeBlock == v.Type && nil == v.Block {
v.Block = &av.ValueBlock{ID: v.BlockID}
if nil != v.Text {
v.Block.Content = v.Text.Content
}
if "" == v.Block.ID {
v.Block.ID = ast.NewNodeID()
v.BlockID = v.Block.ID
}
createdStr := v.Block.ID[:len("20060102150405")]
created, parseErr := time.ParseInLocation("20060102150405", createdStr, time.Local)
if nil == parseErr {
v.Block.Created = created.UnixMilli()
} else {
v.Block.Created = now
}
v.Block.Updated = v.Block.Created
}
changed = true
}
}
}
if changed {
av.SaveAttributeView(attrView)
}