0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🚨

Browse source
This commit is contained in:
Vanessa 2024-05-13 17:06:28 +08:00
parent f15b2f8666
commit b2b1089e3d
7 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/boot/globalEvent/command/global.ts
View file

@ -129,18 +129,18 @@ export const globalCommand = (command: string, app: App) => {
let newItem: Tab;
if (command === "goToEditTabPrev") {
if (index === 0) {
newItem = tabs[tabs.length - 1]
newItem = tabs[tabs.length - 1];
} else {
newItem = tabs[index - 1]
newItem = tabs[index - 1];
}
} else {
if (index === tabs.length - 1) {
newItem = tabs[0]
newItem = tabs[0];
} else {
newItem = tabs[index + 1]
newItem = tabs[index + 1];
}
}
const tab = getInstanceById(newItem.id) as Tab
const tab = getInstanceById(newItem.id) as Tab;
tab.parent.switchTab(newItem.headElement);
tab.parent.showHeading();
}
@ -229,9 +229,9 @@ export const globalCommand = (command: string, app: App) => {
openHistory(app);
return true;
case "editReadonly":
setReadOnly(!window.siyuan.config.editor.readOnly)
setReadOnly(!window.siyuan.config.editor.readOnly);
return true;
}
return false
}
return false;
};

2
app/src/boot/globalEvent/command/protyle.ts
View file

@ -25,4 +25,4 @@ export const onluProtyleCommand = (options: {
return true;
}
return false;
}
};

3
app/src/boot/globalEvent/keydown.ts
View file

@ -43,7 +43,6 @@ import {escapeHtml} from "../../util/escape";
import {syncGuide} from "../../sync/syncGuide";
import {getStartEndElement, goEnd, goHome} from "../../protyle/wysiwyg/commonHotkey";
import {getNextFileLi, getPreviousFileLi} from "../../protyle/wysiwyg/getBlock";
import {editor} from "../../config/editor";
import {hintMoveBlock} from "../../protyle/hint/extend";
import {Backlink} from "../../layout/dock/Backlink";
/// #if !BROWSER
@ -1267,7 +1266,7 @@ export const windowKeyDown = (app: App, event: KeyboardEvent) => {
}
if (matchHotKey(window.siyuan.config.keymap.general.editReadonly.custom, event)) {
event.preventDefault();
setReadOnly(!window.siyuan.config.editor.readOnly)
setReadOnly(!window.siyuan.config.editor.readOnly);
return;
}
if (matchHotKey(window.siyuan.config.keymap.general.lockScreen.custom, event)) {

6
app/src/config/util/setReadOnly.ts Normal file
View file

@ -0,0 +1,6 @@
import {fetchPost} from "../../util/fetch";
export const setReadOnly = (readOnly: boolean) => {
window.siyuan.config.editor.readOnly = readOnly;
fetchPost("/api/setting/setEditor", window.siyuan.config.editor);
};

10
app/src/menus/text.ts
View file

@ -11,7 +11,7 @@ export const textMenu = (target: Element) => {
click() {
document.execCommand("copy");
}
})
});
menu.addItem({
label: window.siyuan.languages.selectAll,
icon: "iconSelect",
@ -19,8 +19,8 @@ export const textMenu = (target: Element) => {
if (getSelection().rangeCount === 0) {
return;
}
getSelection().getRangeAt(0).selectNode(target)
getSelection().getRangeAt(0).selectNode(target);
}
})
return menu
}
});
return menu;
};

6
app/src/protyle/wysiwyg/keydown.ts
View file

@ -49,7 +49,7 @@ import {
getStartEndElement,
upSelect
} from "./commonHotkey";
import {fileAnnotationRefMenu, linkMenu, refMenu, setFold, tagMenu, zoomOut} from "../../menus/protyle";
import {fileAnnotationRefMenu, linkMenu, refMenu, setFold, tagMenu} from "../../menus/protyle";
import {openAttr} from "../../menus/commonMenuItem";
import {Constants} from "../../constants";
import {fetchPost} from "../../util/fetch";
@ -473,7 +473,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
protyle,
command: "enter",
previousRange: range,
})
});
event.preventDefault();
event.stopPropagation();
return;
@ -484,7 +484,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
protyle,
command: "enterBack",
previousRange: range,
})
});
event.preventDefault();
event.stopPropagation();
return;

6
app/src/util/newFile.ts
View file

@ -98,7 +98,7 @@ export const newFile = (optios: {
}
if ((data.data.path.indexOf("/") > -1 && optios.useSavePath) || optios.name) {
if (data.data.path.startsWith("/") || optios.currentPath === "/") {
const createPath = pathPosix().join(data.data.path, optios.name || (data.data.path.endsWith("/") ? window.siyuan.languages.untitled : ""))
const createPath = pathPosix().join(data.data.path, optios.name || (data.data.path.endsWith("/") ? window.siyuan.languages.untitled : ""));
fetchPost("/api/filetree/createDocWithMd", {
notebook: data.data.box,
path: createPath,
@ -123,7 +123,7 @@ export const newFile = (optios: {
notebook: data.data.box,
path: optios.notebookId === data.data.box ? (optios.currentPath.endsWith(".sy") ? optios.currentPath : optios.currentPath + ".sy") : (data.data.path || "/")
}, (responseHPath) => {
const createPath = pathPosix().join(responseHPath.data, data.data.path, optios.name || (data.data.path.endsWith("/") ? window.siyuan.languages.untitled : ""))
const createPath = pathPosix().join(responseHPath.data, data.data.path, optios.name || (data.data.path.endsWith("/") ? window.siyuan.languages.untitled : ""));
fetchPost("/api/filetree/createDocWithMd", {
notebook: data.data.box,
path: createPath,
@ -151,7 +151,7 @@ export const newFile = (optios: {
return;
}
if (optios.notebookId !== data.data.box) {
const createPath = pathPosix().join(data.data.path || "/", optios.name || (data.data.path.endsWith("/") ? window.siyuan.languages.untitled : ""))
const createPath = pathPosix().join(data.data.path || "/", optios.name || (data.data.path.endsWith("/") ? window.siyuan.languages.untitled : ""));
fetchPost("/api/filetree/createDocWithMd", {
notebook: data.data.box,
path: createPath,