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-04-28 11:39:09 +08:00
commit ddac5ff625
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/config/keymap.ts
View file

@ -329,7 +329,7 @@ export const keymap = {
keymap.search("", "");
});
keymap.element.querySelector("#keymapResetBtn").addEventListener("click", () => {
confirmDialog(window.siyuan.languages.reset, window.siyuan.languages.confirmReset, () => {
confirmDialog("⚠️ " + window.siyuan.languages.reset, window.siyuan.languages.confirmReset, () => {
fetchPost("/api/setting/setKeymap", {
data: Constants.SIYUAN_KEYMAP,
}, () => {

4
kernel/model/backlink.go
View file

@ -315,7 +315,9 @@ func GetBacklink2(id, keyword, mentionKeyword string, sortMode, mentionSortMode
return backmentions[i].ID > backmentions[j].ID
})
mentionsCount = len(backmentions)
for _, backmention := range backmentions {
mentionsCount += backmention.Count
}
// 添加笔记本名称
var boxIDs []string