mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-17 07:00:12 +01:00
🎨 Improve av https://github.com/siyuan-note/siyuan/issues/15644
This commit is contained in:
parent
e1fca0674d
commit
2899e3851d
2 changed files with 28 additions and 1 deletions
|
|
@ -978,6 +978,8 @@ func GetAttributeViewDefaultValue(valueID, keyID, blockID string, typ KeyType) (
|
||||||
}
|
}
|
||||||
|
|
||||||
switch typ {
|
switch typ {
|
||||||
|
case KeyTypeBlock:
|
||||||
|
ret.Block = &ValueBlock{Created: ret.CreatedAt, Updated: ret.UpdatedAt}
|
||||||
case KeyTypeText:
|
case KeyTypeText:
|
||||||
ret.Text = &ValueText{}
|
ret.Text = &ValueText{}
|
||||||
case KeyTypeNumber:
|
case KeyTypeNumber:
|
||||||
|
|
|
||||||
|
|
@ -215,7 +215,32 @@ func getAttrViewAddingBlockDefaultValues(attrView *av.AttributeView, view, group
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if nil != newValue && !filterKeyIDs[groupKey.ID] /* 命中了过滤条件的话就不重复处理了 */ {
|
if nil == nearItem && !filterKeyIDs[groupKey.ID] {
|
||||||
|
// 没有临近项并且分组字段和过滤字段不同时,使用分组值
|
||||||
|
newValue = av.GetAttributeViewDefaultValue(ast.NewNodeID(), groupKey.ID, addingItemID, groupKey.Type)
|
||||||
|
if av.KeyTypeText == groupView.GroupVal.Type {
|
||||||
|
content := groupView.GroupVal.Text.Content
|
||||||
|
switch newValue.Type {
|
||||||
|
case av.KeyTypeBlock:
|
||||||
|
newValue.Block.Content = content
|
||||||
|
case av.KeyTypeText:
|
||||||
|
newValue.Text.Content = content
|
||||||
|
case av.KeyTypeURL:
|
||||||
|
newValue.URL.Content = content
|
||||||
|
case av.KeyTypeEmail:
|
||||||
|
newValue.Email.Content = content
|
||||||
|
case av.KeyTypePhone:
|
||||||
|
newValue.Phone.Content = content
|
||||||
|
case av.KeyTypeCheckbox:
|
||||||
|
newValue.Checkbox.Checked = "" != content
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ret[groupKey.ID] = newValue
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if nil != newValue && !filterKeyIDs[groupKey.ID] {
|
||||||
ret[groupKey.ID] = newValue
|
ret[groupKey.ID] = newValue
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue