mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-19 16:10:12 +01:00
🎨 Improve av https://github.com/siyuan-note/siyuan/issues/15524
This commit is contained in:
parent
7ac0491a70
commit
c640bfd91b
1 changed files with 5 additions and 4 deletions
|
|
@ -4140,8 +4140,10 @@ func updateAttributeViewValue(tx *Transaction, attrView *av.AttributeView, keyID
|
||||||
|
|
||||||
now := time.Now().UnixMilli()
|
now := time.Now().UnixMilli()
|
||||||
oldIsDetached := true
|
oldIsDetached := true
|
||||||
|
var oldBoundBlockID string
|
||||||
if nil != blockVal {
|
if nil != blockVal {
|
||||||
oldIsDetached = blockVal.IsDetached
|
oldIsDetached = blockVal.IsDetached
|
||||||
|
oldBoundBlockID = blockVal.Block.ID
|
||||||
}
|
}
|
||||||
for _, keyValues := range attrView.KeyValues {
|
for _, keyValues := range attrView.KeyValues {
|
||||||
if keyID != keyValues.Key.ID {
|
if keyID != keyValues.Key.ID {
|
||||||
|
|
@ -4164,7 +4166,6 @@ func updateAttributeViewValue(tx *Transaction, attrView *av.AttributeView, keyID
|
||||||
}
|
}
|
||||||
|
|
||||||
isUpdatingBlockKey := av.KeyTypeBlock == val.Type
|
isUpdatingBlockKey := av.KeyTypeBlock == val.Type
|
||||||
oldBoundBlockID := val.BlockID
|
|
||||||
var oldRelationBlockIDs []string
|
var oldRelationBlockIDs []string
|
||||||
if av.KeyTypeRelation == val.Type {
|
if av.KeyTypeRelation == val.Type {
|
||||||
if nil != val.Relation {
|
if nil != val.Relation {
|
||||||
|
|
@ -4257,14 +4258,14 @@ func updateAttributeViewValue(tx *Transaction, attrView *av.AttributeView, keyID
|
||||||
} else {
|
} else {
|
||||||
// 现在也绑定了块
|
// 现在也绑定了块
|
||||||
|
|
||||||
if oldBoundBlockID != val.BlockID { // 之前绑定的块和现在绑定的块不一样
|
if oldBoundBlockID != val.Block.ID { // 之前绑定的块和现在绑定的块不一样
|
||||||
// 换绑块
|
// 换绑块
|
||||||
unbindBlockAv(tx, avID, oldBoundBlockID)
|
unbindBlockAv(tx, avID, oldBoundBlockID)
|
||||||
bindBlockAv(tx, avID, val.BlockID)
|
bindBlockAv(tx, avID, val.Block.ID)
|
||||||
val.Block.Content = util.UnescapeHTML(val.Block.Content)
|
val.Block.Content = util.UnescapeHTML(val.Block.Content)
|
||||||
} else { // 之前绑定的块和现在绑定的块一样
|
} else { // 之前绑定的块和现在绑定的块一样
|
||||||
content := strings.TrimSpace(val.Block.Content)
|
content := strings.TrimSpace(val.Block.Content)
|
||||||
node, tree, _ := getNodeByBlockID(tx, val.BlockID)
|
node, tree, _ := getNodeByBlockID(tx, val.Block.ID)
|
||||||
_, blockText := getNodeAvBlockText(node)
|
_, blockText := getNodeAvBlockText(node)
|
||||||
if "" == content {
|
if "" == content {
|
||||||
// 使用动态锚文本
|
// 使用动态锚文本
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue