Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-16 22:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 支持数据快照对比 https://github.com/siyuan-note/siyuan/issues/6858

Browse source
This commit is contained in:
Liang Ding 2022-12-17 17:33:32 +08:00
parent 26c3ce610e
commit db5d0962ba
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/electron/main.js
View file

@ -441,6 +441,24 @@ const boot = () => {
resetTrayMenu()
}
const setWndTopMenu = {
label: trayMenu.cancelWindowTop,
click: () => {
setCancelWndTop()
},
}
const setCancelWndTop = () => {
if (!mainWindow.isAlwaysOnTop()) {
mainWindow.setAlwaysOnTop(true)
setWndTopMenu.label = trayMenu.cancelWindowTop
} else {
mainWindow.setAlwaysOnTop(false)
setWndTopMenu.label = trayMenu.setWindowTop
}
resetTrayMenu()
}
const buildTrayMenuTemplate = () => {
let ret = [
@ -477,13 +495,7 @@ const boot = () => {
let changeWndTop = {
label: trayMenu.setWindowTop,
click: () => {
if (!mainWindow.isAlwaysOnTop()) {
mainWindow.setAlwaysOnTop(true)
changeWndTop.label = trayMenu.cancelWindowTop
} else {
mainWindow.setAlwaysOnTop(false)
changeWndTop.label = trayMenu.setWindowTop
}
},
};
ret.splice(1, 0, changeWndTop)

12
kernel/model/repository.go
View file

@ -169,6 +169,9 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
Title: title,
})
}
if 1 > len(ret.AddsLeft) {
ret.AddsLeft = []*DiffFile{}
}
for _, updateLeft := range diff.UpdatesLeft {
title, err := parseTitleInSnapshot(updateLeft.ID, repo, luteEngine)
@ -182,6 +185,9 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
Title: title,
})
}
if 1 > len(ret.UpdatesLeft) {
ret.UpdatesLeft = []*DiffFile{}
}
for _, updateRight := range diff.UpdatesRight {
title, err := parseTitleInSnapshot(updateRight.ID, repo, luteEngine)
@ -195,6 +201,9 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
Title: title,
})
}
if 1 > len(ret.UpdatesRight) {
ret.UpdatesRight = []*DiffFile{}
}
for _, removeRight := range diff.RemovesRight {
title, err := parseTitleInSnapshot(removeRight.ID, repo, luteEngine)
@ -208,6 +217,9 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
Title: title,
})
}
if 1 > len(ret.RemovesRight) {
ret.RemovesRight = []*DiffFile{}
}
return
}