mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-09-22 00:20:47 +02:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
9e46eec911
2 changed files with 6 additions and 1 deletions
|
@ -853,6 +853,11 @@ func (filter *ViewFilter) GetAffectValue(key *Key, addingBlockID string) (ret *V
|
|||
}
|
||||
}
|
||||
|
||||
if FilterOperatorIsNotEmpty == filter.Operator {
|
||||
// 在过滤非空值的情况下,不设置默认值 https://github.com/siyuan-note/siyuan/issues/15540
|
||||
return nil
|
||||
}
|
||||
|
||||
ret = filter.Value.Clone()
|
||||
ret.ID = ast.NewNodeID()
|
||||
ret.KeyID = key.ID
|
||||
|
|
|
@ -3043,7 +3043,7 @@ func removeAttributeViewBlock(srcIDs []string, avID string, tx *Transaction) (er
|
|||
|
||||
if nil != tree {
|
||||
trees[bt.RootID] = tree
|
||||
if node := treenode.GetNodeInTree(tree, val.BlockID); nil != node {
|
||||
if node := treenode.GetNodeInTree(tree, val.Block.ID); nil != node {
|
||||
if err = removeNodeAvID(node, avID, tx, tree); err != nil {
|
||||
return
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue