Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Vanessa 2025-01-12 17:53:25 +08:00
commit 87e24c56d7

View file

@ -3136,6 +3136,7 @@ func UpdateAttributeViewCell(tx *Transaction, avID, keyID, rowID string, valueDa
// 换绑块
unbindBlockAv(tx, avID, oldBoundBlockID)
bindBlockAv(tx, avID, val.BlockID)
val.Block.Content = util.UnescapeHTML(val.Block.Content)
} else { // 之前绑定的块和现在绑定的块一样
content := strings.TrimSpace(val.Block.Content)
node, tree, _ := getNodeByBlockID(tx, val.BlockID)
@ -3143,6 +3144,7 @@ func UpdateAttributeViewCell(tx *Transaction, avID, keyID, rowID string, valueDa
_, blockText := getNodeAvBlockText(node)
if "" == content {
val.Block.Content = blockText
val.Block.Content = util.UnescapeHTML(val.Block.Content)
} else {
if blockText == content {
updateStaticText = false