From 7641101b92f93adc81810cd45a886f9fd64d7905 Mon Sep 17 00:00:00 2001 From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com> Date: Fri, 23 Feb 2024 07:46:05 +0000 Subject: [PATCH 1/3] fix(nc-gui): make cell editable on double clicking in url cell --- packages/nc-gui/components/cell/Url.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nc-gui/components/cell/Url.vue b/packages/nc-gui/components/cell/Url.vue index 02c687a298..24c78558b0 100644 --- a/packages/nc-gui/components/cell/Url.vue +++ b/packages/nc-gui/components/cell/Url.vue @@ -77,7 +77,7 @@ const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))! const isForm = inject(IsFormInj)! const focus: VNodeRef = (el) => - !isExpandedFormOpen.value && !isEditColumn.value && isForm.value && (el as HTMLInputElement)?.focus() + !isExpandedFormOpen.value && !isEditColumn.value && !isForm.value && (el as HTMLInputElement)?.focus() watch( () => editEnabled.value, From 0d2dcec6bf119d09edda130efc4fd4ae21e3480c Mon Sep 17 00:00:00 2001 From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com> Date: Fri, 23 Feb 2024 07:46:08 +0000 Subject: [PATCH 2/3] fix(nc-gui): disable open modal on double clicking longtext cell --- packages/nc-gui/components/cell/RichText.vue | 2 +- packages/nc-gui/components/cell/TextArea.vue | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/packages/nc-gui/components/cell/RichText.vue b/packages/nc-gui/components/cell/RichText.vue index 955d9296dc..b263004f00 100644 --- a/packages/nc-gui/components/cell/RichText.vue +++ b/packages/nc-gui/components/cell/RichText.vue @@ -187,7 +187,7 @@ watch(editorDom, () => { 'max-w-[calc(100%_-_198px)] flex justify-end rounded-tr-2xl overflow-hidden': fullMode, }" > -
+
diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue index 42ee3a4a33..2c5e0139a7 100644 --- a/packages/nc-gui/components/cell/TextArea.vue +++ b/packages/nc-gui/components/cell/TextArea.vue @@ -173,7 +173,7 @@ const dragStart = (e: MouseEvent) => { } watch(editEnabled, () => { - if (editEnabled.value) { + if (editEnabled.value && isRichMode.value) { isVisible.value = true } }) @@ -227,7 +227,7 @@ watch(inputWrapperRef, () => { :ref="focus" v-model="vModel" :rows="isForm ? 5 : 4" - class="h-full w-full outline-none border-none nc-scrollbar-lg" + class="h-full w-full outline-none border-none nc-longtext-scrollbar" :class="{ 'p-2': editEnabled, 'py-1 h-full': isForm, @@ -270,8 +270,8 @@ watch(inputWrapperRef, () => {