From 8e3a666348e23cd5b4e81cbb952c8b8864cce62f Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Tue, 29 Nov 2022 13:45:59 +0800 Subject: [PATCH] fix(nc-gui): auto focus on json cells only --- packages/nc-gui/components/monaco/Editor.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/nc-gui/components/monaco/Editor.vue b/packages/nc-gui/components/monaco/Editor.vue index b1a4f8cca9..06a2b952d0 100644 --- a/packages/nc-gui/components/monaco/Editor.vue +++ b/packages/nc-gui/components/monaco/Editor.vue @@ -3,7 +3,7 @@ import JsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker' import EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker' import TypescriptWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker' import type { editor as MonacoEditor } from 'monaco-editor' -import { deepCompare, onMounted, ref, watch } from '#imports' +import { deepCompare, onMounted, ref, watch, isDrawerOrModalExist } from '#imports' interface Props { modelValue: string | Record @@ -118,7 +118,10 @@ onMounted(async () => { } }) - editor.focus() + if (!isDrawerOrModalExist()) { + // auto focus on json cells only + editor.focus() + } } })