mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-09-22 00:20:47 +02:00
This commit is contained in:
parent
b14f057a76
commit
73300c8408
1 changed files with 24 additions and 11 deletions
|
@ -2100,7 +2100,10 @@ func updateAttributeViewColRollup(operation *Operation) (err error) {
|
|||
KeyID: operation.KeyID,
|
||||
}
|
||||
|
||||
if nil != operation.Data {
|
||||
if nil == operation.Data {
|
||||
return
|
||||
}
|
||||
|
||||
data := operation.Data.(map[string]interface{})
|
||||
if nil != data["calc"] {
|
||||
calcData, jsonErr := gulu.JSON.MarshalJSON(data["calc"])
|
||||
|
@ -2113,6 +2116,16 @@ func updateAttributeViewColRollup(operation *Operation) (err error) {
|
|||
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:]...)
|
||||
}
|
||||
}
|
||||
|
||||
err = av.SaveAttributeView(attrView)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue