From a3af25263b3171731f023900802360a2308a0904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=9B=E4=BA=BD?= <83791825+Soltus@users.noreply.github.com> Date: Tue, 30 Apr 2024 19:35:43 +0800 Subject: [PATCH] Update onGetConfig.ts (#11195) --- app/src/boot/onGetConfig.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/src/boot/onGetConfig.ts b/app/src/boot/onGetConfig.ts index fbb3a1f82..0ea940eac 100644 --- a/app/src/boot/onGetConfig.ts +++ b/app/src/boot/onGetConfig.ts @@ -32,27 +32,33 @@ import {checkFold} from "../util/noRelyPCFunction"; const matchKeymap = (keymap: Config.IKeys, key1: "general" | "editor", key2?: "general" | "insert" | "heading" | "list" | "table") => { if (key1 === "general") { if (!window.siyuan.config.keymap[key1]) { + /// #if !BROWSER ipcRenderer.send(Constants.SIYUAN_CMD, { cmd: "writeLog", msg: "window.siyuan.config.keymap.general is not found" }); + /// #endif window.siyuan.config.keymap[key1] = keymap as Config.IKeymapGeneral; return false; } } else { if (!window.siyuan.config.keymap[key1]) { + /// #if !BROWSER ipcRenderer.send(Constants.SIYUAN_CMD, { cmd: "writeLog", msg: "window.siyuan.config.keymap.editor is not found" }); + /// #endif window.siyuan.config.keymap[key1] = JSON.parse(JSON.stringify(Constants.SIYUAN_KEYMAP.editor)); return false; } if (!window.siyuan.config.keymap[key1][key2]) { + /// #if !BROWSER ipcRenderer.send(Constants.SIYUAN_CMD, { cmd: "writeLog", msg: `window.siyuan.config.keymap.editor.${key2} is not found` }); + /// #endif (window.siyuan.config.keymap[key1][key2] as Config.IKeymapEditor[typeof key2]) = keymap as Config.IKeymapEditor[typeof key2]; return false; } @@ -61,19 +67,23 @@ const matchKeymap = (keymap: Config.IKeys, key1: "general" | "editor", key2?: "g Object.keys(keymap).forEach(key => { if (key1 === "general") { if (!window.siyuan.config.keymap[key1][key] || window.siyuan.config.keymap[key1][key].default !== keymap[key].default) { + /// #if !BROWSER ipcRenderer.send(Constants.SIYUAN_CMD, { cmd: "writeLog", msg: `window.siyuan.config.keymap.${key1}.${key} is not found or match: ${window.siyuan.config.keymap[key1][key]?.default}` }); + /// #endif match = false; window.siyuan.config.keymap[key1][key] = keymap[key]; } } else { if (!window.siyuan.config.keymap[key1][key2][key] || window.siyuan.config.keymap[key1][key2][key].default !== keymap[key].default) { + /// #if !BROWSER ipcRenderer.send(Constants.SIYUAN_CMD, { cmd: "writeLog", msg: `window.siyuan.config.keymap.${key1}.${key2}.${key} is not found or match: ${window.siyuan.config.keymap[key1][key2][key]?.default}` }); + /// #endif match = false; window.siyuan.config.keymap[key1][key2][key] = keymap[key]; } @@ -123,10 +133,12 @@ export const onGetConfig = (isStart: boolean, app: App) => { if (!window.siyuan.config.readonly && (!matchKeymap1 || !matchKeymap2 || !matchKeymap3 || !matchKeymap4 || !matchKeymap5 || !matchKeymap6 || !hasKeymap1 || !hasKeymap2 || !hasKeymap3 || !hasKeymap4 || !hasKeymap5 || !hasKeymap6)) { + /// #if !BROWSER ipcRenderer.send(Constants.SIYUAN_CMD, { cmd: "writeLog", msg: "update keymap" }); + /// #endif fetchPost("/api/setting/setKeymap", { data: window.siyuan.config.keymap }, () => {