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-05-17 08:46:33 +08:00
commit 48f8eff523
4 changed files with 2129 additions and 857 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

799
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy
View file

File diff suppressed because it is too large Load diff

822
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy
View file

File diff suppressed because it is too large Load diff

1361
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy
View file

File diff suppressed because it is too large Load diff

4
app/src/search/util.ts
View file

@ -23,7 +23,7 @@ import {addLoading} from "../protyle/ui/initUI";
import {getIconByType} from "../editor/getIcon";
import {unicode2Emoji} from "../emoji";
import {hasClosestByClassName} from "../protyle/util/hasClosest";
import {isNotCtrl, setStorageVal, updateHotkeyTip} from "../protyle/util/compatibility";
import {isNotCtrl, isMac, setStorageVal, updateHotkeyTip} from "../protyle/util/compatibility";
import {newFileByName} from "../util/newFile";
import {
filterMenu,
@ -359,7 +359,7 @@ export const genSearch = (app: App, config: Config.IUILayoutTabSearchConfig, ele
<kbd>${updateHotkeyTip(window.siyuan.config.keymap.general.newFile.custom)}</kbd> ${window.siyuan.languages.new}
<kbd>${window.siyuan.languages.enterKey}/${window.siyuan.languages.doubleClick}</kbd> ${window.siyuan.languages.searchTip2}
<kbd>${window.siyuan.languages.click}</kbd> ${window.siyuan.languages.searchTip3}
<kbd>${updateHotkeyTip(window.siyuan.config.keymap.editor.general.insertRight.custom)}/${updateHotkeyTip("⌥")}+${window.siyuan.languages.click}</kbd> ${window.siyuan.languages.searchTip4}
<kbd>${updateHotkeyTip(window.siyuan.config.keymap.editor.general.insertRight.custom)}/${isMac() ? "⌥" : "Alt+"}${window.siyuan.languages.click}</kbd> ${window.siyuan.languages.searchTip4}
<kbd>Esc</kbd> ${window.siyuan.languages.searchTip5}
</div>
</div>