Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-23 10:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "🎨 Add tags to the database when binding blocks to the database https://github.com/siyuan-note/siyuan/issues/15757"

Browse source 
This reverts commit 4d8bc1672c.
This commit is contained in:
Daniel 2025-09-04 18:00:47 +08:00
parent 4d8bc1672c
commit ba10d96a10
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
16 changed files with 36 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

110
kernel/model/attribute_view.go
View file

@ -3152,7 +3152,6 @@ func addAttributeViewBlock(now int64, avID, dbBlockID, viewID, groupID, previous
if !isDetached {
bindBlockAv0(tx, avID, node, tree)
fillTags(attrView, view, addingItemID, node)
}
// 在所有视图上添加项目
@ -3198,68 +3197,6 @@ func addAttributeViewBlock(now int64, avID, dbBlockID, viewID, groupID, previous
return
}
func fillTags(attrView *av.AttributeView, view *av.View, addingItemID string, node *ast.Node) {
// 如果节点上存在标签则将添加标签字段
var tags []string
if ast.NodeDocument == node.Type {
if docTagsVal := node.IALAttr("tags"); 0 < len(docTagsVal) {
docTags := strings.Split(docTagsVal, ",")
for _, t := range docTags {
tags = append(tags, t)
}
}
} else {
nodeTags := node.ChildrenByType(ast.NodeTextMark)
for _, t := range nodeTags {
tags = append(tags, t.TextMarkTextContent)
}
}
keyName := av.GetAttributeViewI18n("tag")
tagKeys := attrView.GetKeyByNameType(keyName, av.KeyTypeMSelect)
tagKeyID := ast.NewNodeID()
if 1 > len(tagKeys) {
blockKey := attrView.GetBlockKey()
addAttributeViewKey(attrView, view, av.KeyTypeMSelect, tagKeyID, keyName, "", blockKey.ID)
} else {
tagKeyID = tagKeys[0].ID
}
if tagKeyValues, _ := attrView.GetKeyValues(tagKeyID); nil != tagKeyValues {
val := tagKeyValues.GetValue(addingItemID)
if nil == val {
val = av.GetAttributeViewDefaultValue(ast.NewNodeID(), tagKeyID, addingItemID, av.KeyTypeMSelect)
for _, tag := range tags {
val.MSelect = append(val.MSelect, &av.ValueSelect{Content: tag, Color: fmt.Sprintf("%d", 1+rand.Intn(14))})
}
tagKeyValues.Values = append(tagKeyValues.Values, val)
} else {
for _, t := range tags {
exist := false
for _, v := range val.MSelect {
if v.Content == t {
exist = true
break
}
}
if !exist {
val.MSelect = append(val.MSelect, &av.ValueSelect{Content: t, Color: fmt.Sprintf("%d", 1+rand.Intn(14))})
}
}
}
for _, valOpt := range val.MSelect {
if opt := tagKeyValues.Key.GetOption(valOpt.Content); nil == opt {
opt = &av.SelectOption{Name: valOpt.Content, Color: valOpt.Color}
tagKeyValues.Key.Options = append(tagKeyValues.Key.Options, opt)
} else {
valOpt.Color = opt.Color
}
}
}
}
func fillDefaultValue(attrView *av.AttributeView, view, groupView *av.View, previousItemID, addingItemID string) {
defaultValues := getAttrViewAddingBlockDefaultValues(attrView, view, groupView, previousItemID, addingItemID)
for keyID, newValue := range defaultValues {
@ -4029,73 +3966,70 @@ func AddAttributeViewKey(avID, keyID, keyName, keyType, keyIcon, previousKeyID s
return
}
addAttributeViewKey(attrView, currentView, av.KeyType(keyType), keyID, keyName, keyIcon, previousKeyID)
err = av.SaveAttributeView(attrView)
return
}
func addAttributeViewKey(attrView *av.AttributeView, view *av.View, keyType av.KeyType, keyID, keyName, keyIcon, previousKeyID string) {
switch keyType {
keyTyp := av.KeyType(keyType)
switch keyTyp {
case av.KeyTypeText, av.KeyTypeNumber, av.KeyTypeDate, av.KeyTypeSelect, av.KeyTypeMSelect, av.KeyTypeURL, av.KeyTypeEmail,
av.KeyTypePhone, av.KeyTypeMAsset, av.KeyTypeTemplate, av.KeyTypeCreated, av.KeyTypeUpdated, av.KeyTypeCheckbox,
av.KeyTypeRelation, av.KeyTypeRollup, av.KeyTypeLineNumber:
key := av.NewKey(keyID, keyName, keyIcon, keyType)
if av.KeyTypeRollup == keyType {
key := av.NewKey(keyID, keyName, keyIcon, keyTyp)
if av.KeyTypeRollup == keyTyp {
key.Rollup = &av.Rollup{Calc: &av.RollupCalc{Operator: av.CalcOperatorNone}}
}
attrView.KeyValues = append(attrView.KeyValues, &av.KeyValues{Key: key})
for _, v := range attrView.Views {
for _, view := range attrView.Views {
newField := &av.BaseField{ID: key.ID}
if nil != v.Table {
newField.Wrap = v.Table.WrapField
if nil != view.Table {
newField.Wrap = view.Table.WrapField
if "" == previousKeyID {
if av.LayoutTypeGallery == view.LayoutType {
if av.LayoutTypeGallery == currentView.LayoutType {
// 如果当前视图是卡片视图则添加到最后
v.Table.Columns = append(v.Table.Columns, &av.ViewTableColumn{BaseField: newField})
view.Table.Columns = append(view.Table.Columns, &av.ViewTableColumn{BaseField: newField})
} else {
v.Table.Columns = append([]*av.ViewTableColumn{{BaseField: newField}}, v.Table.Columns...)
view.Table.Columns = append([]*av.ViewTableColumn{{BaseField: newField}}, view.Table.Columns...)
}
} else {
added := false
for i, column := range v.Table.Columns {
for i, column := range view.Table.Columns {
if column.ID == previousKeyID {
v.Table.Columns = append(v.Table.Columns[:i+1], append([]*av.ViewTableColumn{{BaseField: newField}}, v.Table.Columns[i+1:]...)...)
view.Table.Columns = append(view.Table.Columns[:i+1], append([]*av.ViewTableColumn{{BaseField: newField}}, view.Table.Columns[i+1:]...)...)
added = true
break
}
}
if !added {
v.Table.Columns = append(v.Table.Columns, &av.ViewTableColumn{BaseField: newField})
view.Table.Columns = append(view.Table.Columns, &av.ViewTableColumn{BaseField: newField})
}
}
}
if nil != v.Gallery {
newField.Wrap = v.Gallery.WrapField
if nil != view.Gallery {
newField.Wrap = view.Gallery.WrapField
if "" == previousKeyID {
v.Gallery.CardFields = append(v.Gallery.CardFields, &av.ViewGalleryCardField{BaseField: newField})
view.Gallery.CardFields = append(view.Gallery.CardFields, &av.ViewGalleryCardField{BaseField: newField})
} else {
added := false
for i, field := range v.Gallery.CardFields {
for i, field := range view.Gallery.CardFields {
if field.ID == previousKeyID {
v.Gallery.CardFields = append(v.Gallery.CardFields[:i+1], append([]*av.ViewGalleryCardField{{BaseField: newField}}, v.Gallery.CardFields[i+1:]...)...)
view.Gallery.CardFields = append(view.Gallery.CardFields[:i+1], append([]*av.ViewGalleryCardField{{BaseField: newField}}, view.Gallery.CardFields[i+1:]...)...)
added = true
break
}
}
if !added {
v.Gallery.CardFields = append(v.Gallery.CardFields, &av.ViewGalleryCardField{BaseField: newField})
view.Gallery.CardFields = append(view.Gallery.CardFields, &av.ViewGalleryCardField{BaseField: newField})
}
}
}
}
}
err = av.SaveAttributeView(attrView)
return
}
func (tx *Transaction) doUpdateAttrViewColTemplate(operation *Operation) (ret *TxErr) {