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-03-22 09:51:51 +08:00
commit 599e4ade21
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/menus/workspace.ts
View file

@ -98,7 +98,7 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
if (response.data.isWorkspace) {
openWorkspace(localPath.filePaths[0]);
} else {
confirmDialog(window.siyuan.languages.createWorkspace, window.siyuan.languages.createWorkspaceTip + `<br><br><code class="fn__code">${localPath.filePaths[0]}</code>`, () => {
confirmDialog('🏗️ ' + window.siyuan.languages.createWorkspace, window.siyuan.languages.createWorkspaceTip + `<br><br><code class="fn__code">${localPath.filePaths[0]}</code>`, () => {
openWorkspace(localPath.filePaths[0]);
});
}

2
app/src/plugin/loader.ts
View file

@ -225,7 +225,7 @@ export const afterLoadPlugin = (plugin: Plugin) => {
});
Object.keys(plugin.docks).forEach(key => {
const dock = plugin.docks[key];
const hotkey = window.siyuan.config.keymap.plugin[plugin.name][key].custom;
const hotkey = window.siyuan.config.keymap.plugin[plugin.name] ? window.siyuan.config.keymap.plugin[plugin.name][key]?.custom : undefined;
if (dock.config.position.startsWith("Left")) {
window.siyuan.layout.leftDock.genButton([{
type: key,