Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-09-22 00:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 https://github.com/siyuan-note/siyuan/issues/15660

Browse source
This commit is contained in:
Daniel 2025-08-22 19:25:12 +08:00
parent b14f057a76
commit 73300c8408
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

35
kernel/model/attribute_view.go
View file

@ -2100,18 +2100,31 @@ func updateAttributeViewColRollup(operation *Operation) (err error) {
KeyID: operation.KeyID,
}
if nil != operation.Data {
data := operation.Data.(map[string]interface{})
if nil != data["calc"] {
calcData, jsonErr := gulu.JSON.MarshalJSON(data["calc"])
if nil != jsonErr {
err = jsonErr
return
}
if jsonErr = gulu.JSON.UnmarshalJSON(calcData, &rollUpKey.Rollup.Calc); nil != jsonErr {
err = jsonErr
return
if nil == operation.Data {
return
}
data := operation.Data.(map[string]interface{})
if nil != data["calc"] {
calcData, jsonErr := gulu.JSON.MarshalJSON(data["calc"])
if nil != jsonErr {
err = jsonErr
return
}
if jsonErr = gulu.JSON.UnmarshalJSON(calcData, &rollUpKey.Rollup.Calc); nil != jsonErr {
err = jsonErr
return
}
}
// 如果存在该汇总字段的过滤条件，则移除该过滤条件 https://github.com/siyuan-note/siyuan/issues/15660
for _, view := range attrView.Views {
for i, filter := range view.Filters {
if filter.Column != rollUpKey.ID {
continue
}
view.Filters = append(view.Filters[:i], view.Filters[i+1:]...)
}
}