diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
index b59e9a993..54f9fd2cd 100644
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@@ -1,5 +1,5 @@
{
- "keySearch": "shortcut search",
+ "clear": "Clear",
"autoDownloadUpdatePkg": "Automatically download update installation package",
"autoDownloadUpdatePkgTip": "After enabling, it will automatically check the version update every two hours. If there is an updated version, it will automatically download the installation package and prompt for installation",
"downloaded": "Downloaded",
diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
index f92249860..0b16b6efd 100644
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@@ -1,4 +1,5 @@
{
+ "clear": "claro",
"autoDownloadUpdatePkg": "Descargar automáticamente el paquete de instalación de actualizaciones",
"autoDownloadUpdatePkgTip": "Después de abrir, verificará automáticamente la actualización de la versión cada dos horas. Si hay una versión actualizada, descargará automáticamente el paquete de instalación y solicitará la instalación",
"downloaded": "Descargado",
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
index 984f77ed4..3cfffcdd2 100644
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@@ -1,4 +1,5 @@
{
+ "clear": "Effacer",
"autoDownloadUpdatePkg": "Télécharger automatiquement le package d'installation de la mise à jour",
"autoDownloadUpdatePkgTip": "Après l'ouverture, il vérifiera automatiquement la mise à jour de la version toutes les deux heures. S'il existe une version mise à jour, il téléchargera automatiquement le package d'installation et demandera l'installation",
"downloaded": "Téléchargé",
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
index 2e18b6e2a..841655fb7 100644
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@@ -1,4 +1,5 @@
{
+ "clear": "清空",
"autoDownloadUpdatePkg": "自動下載更新安裝包",
"autoDownloadUpdatePkgTip": "開啟後會每隔兩小時自動檢查版本更新，如果有更新版本則自動下載安裝包並提示安裝",
"downloaded": "已下載",
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
index 32a9b07f1..dae3df212 100644
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@@ -1,5 +1,5 @@
{
- "keySearch": "快捷键搜索",
+ "clear": "清空",
"autoDownloadUpdatePkg": "自动下载更新安装包",
"autoDownloadUpdatePkgTip": "开启后会每隔两小时自动检查版本更新，如果有更新版本则自动下载安装包并提示安装",
"downloaded": "已下载",
diff --git a/app/src/config/keymap.ts b/app/src/config/keymap.ts
index 6f8021fcf..48bc18e39 100644
--- a/app/src/config/keymap.ts
+++ b/app/src/config/keymap.ts
@@ -15,11 +15,9 @@ export const keymap = {
${window.siyuan.languages[key]}
-
@@ -47,10 +45,22 @@ export const keymap = {
-
-
+
+
+
+
+
+
+
+
+
+
@@ -125,78 +135,81 @@ export const keymap = {
/// #endif
});
},
- _hiddenKeylist() {
- /*隐藏没有子项的快捷键项目*/
-
- let level1KeyElements: Element[] = []
-
- level1KeyElements=level1KeyElements.concat(Array.from(keymap.element.querySelectorAll("#keymapList > ul:nth-of-type(1) > li.toggle")))
- level1KeyElements=level1KeyElements.concat(Array.from(keymap.element.querySelectorAll("#keymapList > ul:nth-of-type(2) > li.toggle:nth-of-type(1)")))
- // console.log(level1KeyElements)
-
- let level2KeyElements: Element[] = []
- level2KeyElements=level2KeyElements.concat(Array.from(keymap.element.querySelectorAll("#keymapList > ul:nth-of-type(2) > ul:nth-of-type(1) > li.toggle")))
- // console.log(level2KeyElements)
-
- let allLevelKeyElements=[]
- allLevelKeyElements.push(level1KeyElements)
- allLevelKeyElements.push(level2KeyElements)
-
- let currentLevelElements: Element[] = []
-
- for (let level = 2; level >0; level--) {
- currentLevelElements=allLevelKeyElements[level-1]
- currentLevelElements.forEach(item => {
- //item是li.toggle
-
- let element = item.querySelector(".b3-list-item__text");
- //检查子项是否全部隐藏
- if (item.nextElementSibling && item.nextElementSibling.tagName === "UL") {
- //没有被隐藏的子项
- let res = item.nextElementSibling.querySelectorAll("li:not(.fn__none)")
- if (res.length == 0) {
- //隐藏父项
- item.classList.add("fn__none")
- item.nextElementSibling.classList.add("fn__none");
- item.firstElementChild.firstElementChild.classList.remove("b3-list-item__arrow--open");
- // console.log(level + " 当前元素 " + element.innerHTML + " 隐藏")
+ _search(value: string, keymapString: string) {
+ keymap.element.querySelectorAll("#keymapList .b3-list-item--hide-action > .b3-list-item__text").forEach(item => {
+ const liElement = item.parentElement
+ let matchedKeymap = false;
+ if (keymapString === "" || keymapString === (item.nextElementSibling.nextElementSibling as HTMLInputElement).value) {
+ matchedKeymap = true
+ }
+ if ((item.textContent.toLowerCase().indexOf(value.toLowerCase()) > -1 || value === "") && matchedKeymap) {
+ liElement.classList.remove("fn__none");
+ liElement.parentElement.classList.remove("fn__none");
+ liElement.parentElement.parentElement.classList.remove("fn__none");
+ } else {
+ liElement.classList.add("fn__none");
+ }
+ if (!liElement.nextElementSibling) {
+ const toggleElement = liElement.parentElement.previousElementSibling
+ const toggleIconElement = toggleElement.querySelector(".b3-list-item__arrow")
+ if (value === "" && keymapString === "") {
+ // 复原折叠状态
+ if (toggleIconElement.classList.contains("b3-list-item__arrow--open")) {
+ liElement.parentElement.classList.remove("fn__none")
} else {
- //显示
- item.classList.remove("fn__none")
- item.nextElementSibling.classList.remove("fn__none");
- item.firstElementChild.firstElementChild.classList.add("b3-list-item__arrow--open");
- // console.log(level+" 当前元素 " + element.innerHTML + " 显示")
+ liElement.parentElement.classList.add("fn__none")
}
}
-
- });
-
- }
- },
- _search(value: string) {
- keymap.element.querySelectorAll("#keymapList .b3-list-item--hide-action > .b3-list-item__text").forEach(item => {
- if (item.textContent.toLowerCase().indexOf(value.toLowerCase()) > -1 || value === "") {
- item.parentElement.classList.remove("fn__none");
- item.parentElement.parentElement.classList.remove("fn__none");
- } else {
- item.parentElement.classList.add("fn__none");
+ // 隐藏没有子项的快捷键项目
+ if (liElement.parentElement.childElementCount === liElement.parentElement.querySelectorAll(".fn__none").length) {
+ toggleElement.classList.add("fn__none");
+ } else {
+ toggleElement.classList.remove("fn__none");
+ }
}
});
- keymap._hiddenKeylist()
+ // 编辑器中三级菜单单独处理
+ const editorKeymapElement = keymap.element.querySelector("#keymapList").lastElementChild
+ if (value === "" && keymapString === "") {
+ // 复原折叠状态
+ if (editorKeymapElement.querySelector(".b3-list-item__arrow").classList.contains("b3-list-item__arrow--open")) {
+ editorKeymapElement.lastElementChild.classList.remove("fn__none")
+ } else {
+ editorKeymapElement.lastElementChild.classList.add("fn__none")
+ }
+ }
+ // 隐藏没有子项的快捷键项目
+ if (editorKeymapElement.querySelectorAll(".b3-list-item--hide-action.fn__none").length === editorKeymapElement.querySelectorAll(".b3-list-item--hide-action").length) {
+ editorKeymapElement.firstElementChild.classList.add("fn__none");
+ } else {
+ editorKeymapElement.firstElementChild.classList.remove("fn__none");
+ }
},
bindEvent() {
keymap.element.querySelector("#keymapRefreshBtn").addEventListener("click", () => {
exportLayout(true);
});
const searchElement = keymap.element.querySelector("#keymapInput") as HTMLInputElement;
- this.element.addEventListener("compositionend", () => {
- keymap._search(searchElement.value);
+ const searchKeymapElement = keymap.element.querySelector("#searchByKey") as HTMLInputElement;
+ searchElement.addEventListener("compositionend", () => {
+ keymap._search(searchElement.value, searchKeymapElement.value);
});
searchElement.addEventListener("input", (event: InputEvent) => {
if (event.isComposing) {
return;
}
- keymap._search(searchElement.value);
+ keymap._search(searchElement.value, searchKeymapElement.value);
+ });
+ searchKeymapElement.addEventListener("keydown", function (event: KeyboardEvent) {
+ event.stopPropagation();
+ event.preventDefault();
+ const keymapStr = keymap._getKeymapString(event, this);
+ keymap._search(searchElement.value, keymapStr);
+ });
+ keymap.element.querySelector("#clearSearchBtn").addEventListener("click", () => {
+ searchElement.value = ""
+ searchKeymapElement.value = "";
+ keymap._search("", "");
});
keymap.element.querySelector("#keymapResetBtn").addEventListener("click", () => {
window.siyuan.config.keymap = Constants.SIYUAN_KEYMAP;
@@ -242,185 +255,12 @@ export const keymap = {
target = target.parentElement;
}
});
- let searchByKeyTimeout: number;
- const searchByKeyElement = keymap.element.querySelector("#searchByKey") as HTMLInputElement;
- searchByKeyElement.addEventListener("keydown", function (event: KeyboardEvent) {
- event.stopPropagation();
- event.preventDefault();
-
- let keymapStr = "";
- if (event.ctrlKey && !event.metaKey && isMac()) {
- keymapStr += "⌃";
- }
- if (event.altKey) {
- keymapStr += "⌥";
- }
- if (event.shiftKey) {
- keymapStr += "⇧";
- }
- if (isCtrl(event)) {
- keymapStr += "⌘";
- }
- if (event.key !== "Shift" && event.key !== "Alt" && event.key !== "Meta" && event.key !== "Control") {
- if (event.key === "ArrowUp") {
- keymapStr += "↑";
- } else if (event.key === "ArrowDown") {
- keymapStr += "↓";
- } else if (event.key === "ArrowLeft") {
- keymapStr += "←";
- } else if (event.key === "ArrowRight") {
- keymapStr += "→";
- } else if (event.key === "Tab") {
- keymapStr += "⇥";
- } else if (event.code === "BracketLeft") {
- keymapStr += "[";
- } else if (event.code === "BracketRight") {
- keymapStr += "]";
- } else if (event.key === "Backspace") {
- keymapStr += "⌫";
- } else if (event.key === "Delete") {
- keymapStr += "⌦";
- } else if (event.key === "Enter") {
- keymapStr += "↩";
- } else if (event.altKey) {
- const codeKey = event.code.substr(event.code.length - 1, 1).toUpperCase();
- if (event.key === "Enter") {
- keymapStr += "↩";
- } else if (event.key.startsWith("F") && event.key.length > 1) {
- keymapStr += event.key;
- } else if (event.code === "Period") {
- keymapStr += ".";
- } else if (codeKey !== "I" && codeKey !== "E" && codeKey !== "N" && codeKey !== "U") {
- keymapStr += codeKey;
- } else if (event.which === 229) {
- setTimeout(() => {
- this.value = "";
- });
- }
- } else if (event.key === "》") {
- keymapStr += ">";
- } else if (event.key === "《") {
- keymapStr += "<";
- } else if (event.key === "—") {
- keymapStr += "-";
- } else {
- keymapStr += event.key.length > 1 ? event.key : event.key.toUpperCase();
- }
- }
-
- this.setAttribute("data-value", keymapStr);
- if (event.key === "—") {
- // Mac 中文下会添加"——"
- setTimeout(() => {
- this.value = updateHotkeyTip(keymapStr);
- });
- } else {
- this.value = updateHotkeyTip(keymapStr);
- }
- //空格退格清空
- if(this.value.trim()==="" || this.value.trim()==="Backspace"){
- this.value=""
- keymapStr=""
- }
- clearTimeout(searchByKeyTimeout);
- searchByKeyTimeout = window.setTimeout(() => {
-
- //无效快捷键,要么是单个修饰键,要么是系统保留快捷键
- // if (["⌘", "⇧", "⌥", "⌃"].includes(keymapStr.substr(keymapStr.length - 1, 1)) ||
- // ["⌘A", "⌘X", "⌘C", "⌘V", "⌘/", "⇧↑", "⇧↓", "⇧→", "⇧←", "⇧⇥", "⇧⌘⇥", "⌃⇥", "⌃⌘⇥", "⇧⌘→", "⇧⌘←", "⌘Home", "⌘End", "⇧↩", "↩", "PageUp", "PageDown", "⌫", "⌦"].includes(keymapStr)) {
- // showMessage(this.value + " " + window.siyuan.languages.invalid);
- // return;
- // }
-
- keymap.element.querySelectorAll("#keymapList .b3-list-item--hide-action > input[data-key]").forEach(item => {
- let data_value=item.getAttribute("data-value")
- if (keymapStr.trim() === "" || data_value === keymapStr ) {
- item.parentElement.classList.remove("fn__none");
- item.parentElement.parentElement.classList.remove("fn__none");
- } else {
- item.parentElement.classList.add("fn__none");
- }
- });
-
- keymap._hiddenKeylist()
-
- }, 0)
- });
-
let timeout: number;
keymapListElement.querySelectorAll("ul input").forEach(item => {
item.addEventListener("keydown", function (event: KeyboardEvent) {
event.stopPropagation();
event.preventDefault();
- let keymapStr = "";
- if (event.ctrlKey && !event.metaKey && isMac()) {
- keymapStr += "⌃";
- }
- if (event.altKey) {
- keymapStr += "⌥";
- }
- if (event.shiftKey) {
- keymapStr += "⇧";
- }
- if (isCtrl(event)) {
- keymapStr += "⌘";
- }
- if (event.key !== "Shift" && event.key !== "Alt" && event.key !== "Meta" && event.key !== "Control") {
- if (event.key === "ArrowUp") {
- keymapStr += "↑";
- } else if (event.key === "ArrowDown") {
- keymapStr += "↓";
- } else if (event.key === "ArrowLeft") {
- keymapStr += "←";
- } else if (event.key === "ArrowRight") {
- keymapStr += "→";
- } else if (event.key === "Tab") {
- keymapStr += "⇥";
- } else if (event.code === "BracketLeft") {
- keymapStr += "[";
- } else if (event.code === "BracketRight") {
- keymapStr += "]";
- } else if (event.key === "Backspace") {
- keymapStr += "⌫";
- } else if (event.key === "Delete") {
- keymapStr += "⌦";
- } else if (event.key === "Enter") {
- keymapStr += "↩";
- } else if (event.altKey) {
- const codeKey = event.code.substr(event.code.length - 1, 1).toUpperCase();
- if (event.key === "Enter") {
- keymapStr += "↩";
- } else if (event.key.startsWith("F") && event.key.length > 1) {
- keymapStr += event.key;
- } else if (event.code === "Period") {
- keymapStr += ".";
- } else if (codeKey !== "I" && codeKey !== "E" && codeKey !== "N" && codeKey !== "U") {
- keymapStr += codeKey;
- } else if (event.which === 229) {
- setTimeout(() => {
- this.value = "";
- });
- }
- } else if (event.key === "》") {
- keymapStr += ">";
- } else if (event.key === "《") {
- keymapStr += "<";
- } else if (event.key === "—") {
- keymapStr += "-";
- } else {
- keymapStr += event.key.length > 1 ? event.key : event.key.toUpperCase();
- }
- }
-
- this.setAttribute("data-value", keymapStr);
- if (event.key === "—") {
- // Mac 中文下会添加"——"
- setTimeout(() => {
- this.value = updateHotkeyTip(keymapStr);
- });
- } else {
- this.value = updateHotkeyTip(keymapStr);
- }
+ const keymapStr = keymap._getKeymapString(event, this);
clearTimeout(timeout);
timeout = window.setTimeout(() => {
const keys = this.getAttribute("data-key").split(Constants.ZWSP);
@@ -465,4 +305,72 @@ export const keymap = {
});
});
},
+ _getKeymapString(event: KeyboardEvent, it: HTMLInputElement) {
+ let keymapStr = "";
+ if (event.ctrlKey && !event.metaKey && isMac()) {
+ keymapStr += "⌃";
+ }
+ if (event.altKey) {
+ keymapStr += "⌥";
+ }
+ if (event.shiftKey) {
+ keymapStr += "⇧";
+ }
+ if (isCtrl(event)) {
+ keymapStr += "⌘";
+ }
+ if (event.key !== "Shift" && event.key !== "Alt" && event.key !== "Meta" && event.key !== "Control") {
+ if (event.key === "ArrowUp") {
+ keymapStr += "↑";
+ } else if (event.key === "ArrowDown") {
+ keymapStr += "↓";
+ } else if (event.key === "ArrowLeft") {
+ keymapStr += "←";
+ } else if (event.key === "ArrowRight") {
+ keymapStr += "→";
+ } else if (event.key === "Tab") {
+ keymapStr += "⇥";
+ } else if (event.code === "BracketLeft") {
+ keymapStr += "[";
+ } else if (event.code === "BracketRight") {
+ keymapStr += "]";
+ } else if (event.key === "Backspace") {
+ keymapStr += "⌫";
+ } else if (event.key === "Delete") {
+ keymapStr += "⌦";
+ } else if (event.key === "Enter") {
+ keymapStr += "↩";
+ } else if (event.altKey) {
+ const codeKey = event.code.substr(event.code.length - 1, 1).toUpperCase();
+ if (event.key === "Enter") {
+ keymapStr += "↩";
+ } else if (event.key.startsWith("F") && event.key.length > 1) {
+ keymapStr += event.key;
+ } else if (event.code === "Period") {
+ keymapStr += ".";
+ } else if (codeKey !== "I" && codeKey !== "E" && codeKey !== "N" && codeKey !== "U") {
+ keymapStr += codeKey;
+ } else if (event.which === 229) {
+ setTimeout(() => {
+ it.value = "";
+ });
+ }
+ } else if (event.key === "》") {
+ keymapStr += ">";
+ } else if (event.key === "《") {
+ keymapStr += "<";
+ } else if (event.key === "—") {
+ keymapStr += "-";
+ } else {
+ keymapStr += event.key.length > 1 ? event.key : event.key.toUpperCase();
+ }
+ }
+
+ it.setAttribute("data-value", keymapStr);
+ // Mac 中文下会直接输入
+ setTimeout(() => {
+ it.value = updateHotkeyTip(keymapStr);
+ });
+ return keymapStr;
+ }
};