mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-22 17:40:13 +01:00
🎨 Support adding database blocks to a database Fix https://github.com/siyuan-note/siyuan/issues/10876
This commit is contained in:
parent
41d03c92b9
commit
8e9a8ec6d4
1 changed files with 2 additions and 7 deletions
|
|
@ -2022,11 +2022,6 @@ func addAttributeViewBlock(avID, blockID, previousBlockID, addingBlockID string,
|
||||||
err = ErrBlockNotFound
|
err = ErrBlockNotFound
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if ast.NodeAttributeView == node.Type {
|
|
||||||
// 不能将一个属性视图拖拽到另一个属性视图中
|
|
||||||
return
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
if "" == addingBlockID {
|
if "" == addingBlockID {
|
||||||
addingBlockID = ast.NewNodeID()
|
addingBlockID = ast.NewNodeID()
|
||||||
|
|
@ -2948,12 +2943,12 @@ func UpdateAttributeViewCell(tx *Transaction, avID, keyID, rowID, cellID string,
|
||||||
// 将游离行绑定到新建的块上
|
// 将游离行绑定到新建的块上
|
||||||
bindBlockAv(tx, avID, rowID)
|
bindBlockAv(tx, avID, rowID)
|
||||||
}
|
}
|
||||||
} else { // 之前绑定了块
|
} else { // 之前绑定了块
|
||||||
if isUpdatingBlockKey { // 正在更新主键
|
if isUpdatingBlockKey { // 正在更新主键
|
||||||
if val.IsDetached { // 现在是游离行
|
if val.IsDetached { // 现在是游离行
|
||||||
// 将绑定的块从属性视图中移除
|
// 将绑定的块从属性视图中移除
|
||||||
unbindBlockAv(tx, avID, rowID)
|
unbindBlockAv(tx, avID, rowID)
|
||||||
} else { // 现在绑定了块
|
} else { // 现在绑定了块
|
||||||
if oldBoundBlockID != val.BlockID { // 之前绑定的块和现在绑定的块不一样
|
if oldBoundBlockID != val.BlockID { // 之前绑定的块和现在绑定的块不一样
|
||||||
// 换绑块
|
// 换绑块
|
||||||
unbindBlockAv(tx, avID, oldBoundBlockID)
|
unbindBlockAv(tx, avID, oldBoundBlockID)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue