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

This commit is contained in:
Vanessa 2025-09-01 11:12:01 +08:00
commit 22d34c755b
2 changed files with 2 additions and 2 deletions

View file

@ -849,7 +849,7 @@ func setAttributeViewBlockAttr(c *gin.Context) {
if _, ok := arg["itemID"]; ok {
itemID = arg["itemID"].(string)
} else if _, ok := arg["rowID"]; ok {
// TODO 划于 2026 年 6 月 30 日后删除 https://github.com/siyuan-note/siyuan/issues/15308#issuecomment-3077675356
// TODO 划于 2026 年 6 月 30 日后删除 https://github.com/siyuan-note/siyuan/issues/15708#issuecomment-3239694546
itemID = arg["rowID"].(string)
}
value := arg["value"].(interface{})

View file

@ -4438,7 +4438,7 @@ func BatchUpdateAttributeViewCells(tx *Transaction, avID string, values []interf
if _, ok := v["itemID"]; ok {
itemID = v["itemID"].(string)
} else if _, ok := v["rowID"]; ok {
// TODO 划于 2026 年 6 月 30 日后删除 https://github.com/siyuan-note/siyuan/issues/15308#issuecomment-3077675356
// TODO 划于 2026 年 6 月 30 日后删除 https://github.com/siyuan-note/siyuan/issues/15708#issuecomment-3239694546
itemID = v["rowID"].(string)
}
valueData := v["value"]