Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-17 04:28:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🐛 Fix render template with database table view https://github.com/siyuan-note/insider/issues/1132

Browse source
This commit is contained in:
Daniel 2024-01-08 12:04:03 +08:00
parent cfc3fd11e9
commit 9ede4c7361
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 58 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

30
kernel/av/av.go
View file

@ -429,14 +429,9 @@ func (av *AttributeView) ShallowClone() (ret *AttributeView) {
}
ret.ID = ast.NewNodeID()
view, err := ret.GetCurrentView()
if nil == err {
view.ID = ast.NewNodeID()
ret.ViewID = view.ID
} else {
view, _ = NewTableViewWithBlockKey(ast.NewNodeID())
ret.ViewID = view.ID
ret.Views = append(ret.Views, view)
if 1 > len(ret.Views) {
logging.LogErrorf("attribute view [%s] has no views", av.ID)
return nil
}
keyIDMap := map[string]string{}
@ -447,11 +442,22 @@ func (av *AttributeView) ShallowClone() (ret *AttributeView) {
kv.Values = []*Value{}
}
view.Table.ID = ast.NewNodeID()
for _, column := range view.Table.Columns {
column.ID = keyIDMap[column.ID]
for _, view := range ret.Views {
view.ID = ast.NewNodeID()
view.Table.ID = ast.NewNodeID()
for _, column := range view.Table.Columns {
column.ID = keyIDMap[column.ID]
}
view.Table.RowIDs = []string{}
for _, f := range view.Table.Filters {
f.Column = keyIDMap[f.Column]
}
for _, s := range view.Table.Sorts {
s.Column = keyIDMap[s.Column]
}
}
view.Table.RowIDs = []string{}
ret.ViewID = ret.Views[0].ID
return
}