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

🎨 https://github.com/siyuan-note/siyuan/issues/10650

Browse source
This commit is contained in:
Vanessa 2024-03-20 11:10:51 +08:00
parent 835a4eab3f
commit 97e3ff656d
3 changed files with 77 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

50
app/src/menus/commonMenuItem.ts
View file

@ -718,8 +718,40 @@ export const openMenu = (app: App, src: string, onlyMenu: boolean, showAccelerat
openAssetNewWindow(src.trim()); openAssetNewWindow(src.trim());
} }
}); });
submenu.push({
icon: "iconFolder",
label: window.siyuan.languages.showInFolder,
accelerator: showAccelerator ? "⌘Click" : "",
click: () => {
openBy(src, "folder");
}
});
submenu.push({
label: window.siyuan.languages.useDefault,
accelerator: showAccelerator ? "⇧Click" : "",
click() {
openBy(src, "app");
}
});
/// #endif /// #endif
} else { } else {
/// #if !BROWSER
submenu.push({
label: window.siyuan.languages.useDefault,
accelerator: showAccelerator ? "Click" : "",
click() {
openBy(src, "app");
}
});
submenu.push({
icon: "iconFolder",
label: window.siyuan.languages.showInFolder,
accelerator: showAccelerator ? "⌘Click" : "",
click: () => {
openBy(src, "folder");
}
});
/// #else
submenu.push({ submenu.push({
label: window.siyuan.languages.useBrowserView, label: window.siyuan.languages.useBrowserView,
accelerator: showAccelerator ? "Click" : "", accelerator: showAccelerator ? "Click" : "",
@ -727,24 +759,8 @@ export const openMenu = (app: App, src: string, onlyMenu: boolean, showAccelerat
openByMobile(src); openByMobile(src);
} }
}); });
/// #endif
} }
/// #if !BROWSER
submenu.push({
icon: "iconFolder",
label: window.siyuan.languages.showInFolder,
accelerator: showAccelerator ? "⌘Click" : "",
click: () => {
openBy(src, "folder");
}
});
submenu.push({
label: window.siyuan.languages.useDefault,
accelerator: showAccelerator ? "⇧Click" : "",
click() {
openBy(src, "app");
}
});
/// #endif
} else if (src) { } else if (src) {
if (0 > src.indexOf(":")) { if (0 > src.indexOf(":")) {
// 使用 : 判断，不使用 :// 判断 Open external application protocol invalid https://github.com/siyuan-note/siyuan/issues/10075 // 使用 : 判断，不使用 :// 判断 Open external application protocol invalid https://github.com/siyuan-note/siyuan/issues/10075

31
app/src/protyle/render/av/action.ts
View file

@ -66,19 +66,32 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle
if (Constants.SIYUAN_ASSETS_EXTS.includes(suffix)) { if (Constants.SIYUAN_ASSETS_EXTS.includes(suffix)) {
if (event.altKey) { if (event.altKey) {
openAsset(protyle.app, linkAddress.trim(), parseInt(getSearch("page", linkAddress))); openAsset(protyle.app, linkAddress.trim(), parseInt(getSearch("page", linkAddress)));
} else if (!ctrlIsPressed && !event.shiftKey) { } else if (ctrlIsPressed) {
/// #if !BROWSER
openBy(linkAddress, "folder");
/// #else
openByMobile(linkAddress);
/// #endif
} else if (event.shiftKey) {
/// #if !BROWSER
openBy(linkAddress, "app");
/// #else
openByMobile(linkAddress);
/// #endif
} else {
openAsset(protyle.app, linkAddress.trim(), parseInt(getSearch("page", linkAddress)), "right"); openAsset(protyle.app, linkAddress.trim(), parseInt(getSearch("page", linkAddress)), "right");
} }
} else if (!ctrlIsPressed && !event.shiftKey && !event.altKey) { } else {
/// #if !BROWSER
if (ctrlIsPressed) {
openBy(linkAddress, "folder");
} else {
openBy(linkAddress, "app");
}
/// #else
openByMobile(linkAddress); openByMobile(linkAddress);
/// #endif
} }
/// #if !BROWSER
if (ctrlIsPressed) {
openBy(linkAddress, "folder");
} else if (event.shiftKey) {
openBy(linkAddress, "app");
}
/// #endif
/// #else /// #else
openByMobile(linkAddress); openByMobile(linkAddress);
/// #endif /// #endif

31
app/src/protyle/wysiwyg/index.ts
View file

@ -2092,19 +2092,32 @@ export class WYSIWYG {
) { ) {
if (event.altKey) { if (event.altKey) {
openAsset(protyle.app, linkAddress, parseInt(getSearch("page", linkAddress))); openAsset(protyle.app, linkAddress, parseInt(getSearch("page", linkAddress)));
} else if (!ctrlIsPressed && !event.shiftKey) { } else if (ctrlIsPressed) {
/// #if !BROWSER
openBy(linkAddress, "folder");
/// #else
openByMobile(linkAddress);
/// #endif
} else if (event.shiftKey) {
/// #if !BROWSER
openBy(linkAddress, "app");
/// #else
openByMobile(linkAddress);
/// #endif
} else {
openAsset(protyle.app, linkPathname, parseInt(getSearch("page", linkAddress)), "right"); openAsset(protyle.app, linkPathname, parseInt(getSearch("page", linkAddress)), "right");
} }
} else if (!ctrlIsPressed && !event.shiftKey && !event.altKey) { } else {
/// #if !BROWSER
if (ctrlIsPressed) {
openBy(linkAddress, "folder");
} else {
openBy(linkAddress, "app");
}
/// #else
openByMobile(linkAddress); openByMobile(linkAddress);
/// #endif
} }
/// #if !BROWSER
if (ctrlIsPressed) {
openBy(linkAddress, "folder");
} else if (event.shiftKey) {
openBy(linkAddress, "app");
}
/// #endif
} else if (linkAddress) { } else if (linkAddress) {
if (0 > linkAddress.indexOf(":")) { if (0 > linkAddress.indexOf(":")) {
// 使用 : 判断，不使用 :// 判断 Open external application protocol invalid https://github.com/siyuan-note/siyuan/issues/10075 // 使用 : 判断，不使用 :// 判断 Open external application protocol invalid https://github.com/siyuan-note/siyuan/issues/10075