From 32b448836133759c619f1cd1849b98c3c49320c5 Mon Sep 17 00:00:00 2001 From: reenphygeorge Date: Fri, 15 Sep 2023 16:53:00 +0530 Subject: [PATCH 1/2] fix(nc-gui): long text expand in shared view --- packages/nc-gui/components/cell/TextArea.vue | 4 ++++ packages/nc-gui/components/smartsheet/Cell.vue | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue index bec6ea61e4..d6077cbc78 100644 --- a/packages/nc-gui/components/cell/TextArea.vue +++ b/packages/nc-gui/components/cell/TextArea.vue @@ -10,6 +10,7 @@ import { iconMap, inject, useVModel, + ReadonlyInj } from '#imports' const props = defineProps<{ @@ -47,6 +48,8 @@ const inputRef = ref(null) const active = inject(ActiveCellInj, ref(false)) +const readOnly = inject(ReadonlyInj) + watch(isVisible, () => { if (isVisible.value) { setTimeout(() => { @@ -138,6 +141,7 @@ onClickOutside(inputWrapperRef, (e) => { :auto-size="{ minRows: 20, maxRows: 20 }" @keydown.stop @keydown.escape="isVisible = false" + :disabled="readOnly" /> diff --git a/packages/nc-gui/components/smartsheet/Cell.vue b/packages/nc-gui/components/smartsheet/Cell.vue index 7006c573f4..9a71313a8a 100644 --- a/packages/nc-gui/components/smartsheet/Cell.vue +++ b/packages/nc-gui/components/smartsheet/Cell.vue @@ -249,7 +249,7 @@ onUnmounted(() => {
From 4ff01b0720c14b466a31d86206aabde8e0eb53df Mon Sep 17 00:00:00 2001 From: reenphygeorge Date: Fri, 15 Sep 2023 22:10:44 +0530 Subject: [PATCH 2/2] fix(nc-gui): text black --- packages/nc-gui/components/cell/TextArea.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue index d6077cbc78..4d56b2c2a4 100644 --- a/packages/nc-gui/components/cell/TextArea.vue +++ b/packages/nc-gui/components/cell/TextArea.vue @@ -136,7 +136,7 @@ onClickOutside(inputWrapperRef, (e) => { ref="inputRef" v-model:value="vModel" placeholder="Enter text" - class="p-1 !pt-1 !pr-3 !border-0 !border-r-0 !focus:outline-transparent nc-scrollbar-md" + class="p-1 !pt-1 !pr-3 !border-0 !border-r-0 !focus:outline-transparent nc-scrollbar-md !text-black" :bordered="false" :auto-size="{ minRows: 20, maxRows: 20 }" @keydown.stop