0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2024-09-04 23:27:00 +08:00
commit 0e723bc78b
3 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kernel/model/file.go
View file

@ -1671,8 +1671,7 @@ func removeDoc(box *Box, p string, luteEngine *lute.Lute) {
continue
}
syncDelete2AttributeView(removeTree.Root)
syncDelete2Block(removeTree.Root)
syncDelete2AvBlock(removeTree.Root)
}
if existChildren {

9
kernel/model/history.go
View file

@ -248,6 +248,7 @@ func RollbackDocHistory(boxID, historyPath string) (err error) {
return
}
var avIDs []string
tree, _ := loadTree(srcPath, util.NewLute())
if nil != tree {
historyDir := strings.TrimPrefix(historyPath, util.HistoryDir+string(os.PathSeparator))
@ -266,8 +267,11 @@ func RollbackDocHistory(boxID, historyPath string) (err error) {
logging.LogErrorf("copy av [%s] failed: %s", srcAvPath, copyErr)
}
}
avIDs = append(avIDs, avNode.AttributeViewID)
}
}
avIDs = gulu.Str.RemoveDuplicatedElem(avIDs)
tree.Box = boxID
tree.Path = filepath.ToSlash(strings.TrimPrefix(destPath, util.DataDir+string(os.PathSeparator)+boxID))
@ -305,6 +309,11 @@ func RollbackDocHistory(boxID, historyPath string) (err error) {
"refText": refText,
}
util.PushEvent(evt)
// 刷新属性视图
for _, avID := range avIDs {
util.PushReloadAttrView(avID)
}
}()
return nil
}

35
kernel/model/transaction.go
View file

@ -799,14 +799,26 @@ func (tx *Transaction) doDelete(operation *Operation) (ret *TxErr) {
}
if needSyncDel2AvBlock {
syncDelete2AttributeView(node)
syncDelete2Block(node)
syncDelete2AvBlock(node)
}
return
}
func syncDelete2Block(node *ast.Node) {
var changedAvIDs []string
func syncDelete2AvBlock(node *ast.Node) {
changedAvIDs := syncDelete2AttributeView(node)
avIDs := syncDelete2Block(node)
changedAvIDs = append(changedAvIDs, avIDs...)
changedAvIDs = gulu.Str.RemoveDuplicatedElem(changedAvIDs)
go func() {
time.Sleep(256 * time.Millisecond)
for _, avID := range changedAvIDs {
util.PushReloadAttrView(avID)
}
}()
}
func syncDelete2Block(node *ast.Node) (changedAvIDs []string) {
ast.Walk(node, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering || ast.NodeAttributeView != n.Type {
return ast.WalkContinue
@ -850,14 +862,12 @@ func syncDelete2Block(node *ast.Node) {
}
return ast.WalkContinue
})
changedAvIDs = gulu.Str.RemoveDuplicatedElem(changedAvIDs)
for _, avID := range changedAvIDs {
util.PushReloadAttrView(avID)
}
return
}
func syncDelete2AttributeView(node *ast.Node) {
changedAvIDs := hashset.New()
func syncDelete2AttributeView(node *ast.Node) (changedAvIDs []string) {
ast.Walk(node, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering || !n.IsBlock() {
return ast.WalkContinue
@ -891,15 +901,14 @@ func syncDelete2AttributeView(node *ast.Node) {
if changedAv {
av.SaveAttributeView(attrView)
changedAvIDs.Add(avID)
changedAvIDs = append(changedAvIDs, avID)
}
}
return ast.WalkContinue
})
for _, avID := range changedAvIDs.Values() {
util.PushReloadAttrView(avID.(string))
}
changedAvIDs = gulu.Str.RemoveDuplicatedElem(changedAvIDs)
return
}
func (tx *Transaction) doInsert(operation *Operation) (ret *TxErr) {